Incorporate a SONAME into all SDK libraries.
This is a backport from the main branch.
1.1 --- a/CMakeLists.txt Sat Jun 26 11:23:33 2010 -0600
1.2 +++ b/CMakeLists.txt Mon Jun 28 19:37:56 2010 -0600
1.3 @@ -17,13 +17,13 @@
1.4 SET(K3D_MINOR_VERSION 8)
1.5 SET(K3D_RELEASE_VERSION 0)
1.6 SET(K3D_BUILD_VERSION 2)
1.7 +SET(K3D_SO_VERSION 1)
1.8
1.9 SET(K3D_PACKAGE k3d)
1.10 SET(K3D_VERSION ${K3D_MAJOR_VERSION}.${K3D_MINOR_VERSION}.${K3D_RELEASE_VERSION}.${K3D_BUILD_VERSION})
1.11 SET(K3D_HOST ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR})
1.12 SET(K3D_COPYRIGHT "Copyright (c) 1995-2010, Timothy M. Shead. All Rights Reserved.")
1.13 SET(K3D_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
1.14 -SET(K3D_LIBDIR lib${LIB_SUFFIX})
1.15
1.16 # Setup high-level build options
1.17 IF(WIN32 AND MSVC)
1.18 @@ -326,6 +326,7 @@
1.19 # Setup output directories ...
1.20 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${k3d_BINARY_DIR}/bin)
1.21
1.22 +SET(K3D_LIBDIR lib) # Allows us to handle 64-bit libs if/when it becomes necessary.
1.23 IF(WIN32)
1.24 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${k3d_BINARY_DIR}/bin)
1.25 ELSE(WIN32)
2.1 --- a/cmake/modules/K3DDependencies.cmake Sat Jun 26 11:23:33 2010 -0600
2.2 +++ b/cmake/modules/K3DDependencies.cmake Mon Jun 28 19:37:56 2010 -0600
2.3 @@ -42,3 +42,8 @@
2.4 ENDIF(${BUILD_OPTION})
2.5 ENDMACRO(K3D_CONDITIONAL_BUILD)
2.6
2.7 +MACRO(K3D_ADD_LIBRARY LIBRARY_NAME)
2.8 + ADD_LIBRARY(${LIBRARY_NAME} ${ARGN})
2.9 + SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES VERSION "${K3D_SO_VERSION}")
2.10 +ENDMACRO()
2.11 +
3.1 --- a/k3dsdk/CMakeLists.txt Sat Jun 26 11:23:33 2010 -0600
3.2 +++ b/k3dsdk/CMakeLists.txt Mon Jun 28 19:37:56 2010 -0600
3.3 @@ -49,7 +49,7 @@
3.4 LINK_DIRECTORIES(${K3D_UUID_LIB_DIRS})
3.5 ENDIF(NOT WIN32)
3.6
3.7 -ADD_LIBRARY(k3dsdk SHARED ${HEADERS} ${SOURCES})
3.8 +K3D_ADD_LIBRARY(k3dsdk SHARED ${HEADERS} ${SOURCES})
3.9 K3D_GENERATE_DEF_FILE(k3dsdk)
3.10
3.11 TARGET_LINK_LIBRARIES(k3dsdk
4.1 --- a/k3dsdk/Half/CMakeLists.txt Sat Jun 26 11:23:33 2010 -0600
4.2 +++ b/k3dsdk/Half/CMakeLists.txt Mon Jun 28 19:37:56 2010 -0600
4.3 @@ -30,7 +30,7 @@
4.4 INCLUDE_DIRECTORIES(${k3dsdk-half_SOURCE_DIR})
4.5 INCLUDE_DIRECTORIES(${k3dsdk-half_BINARY_DIR})
4.6
4.7 -ADD_LIBRARY(k3dsdk-half SHARED ${SOURCES})
4.8 +K3D_ADD_LIBRARY(k3dsdk-half SHARED ${SOURCES})
4.9 K3D_GENERATE_DEF_FILE(k3dsdk-half)
4.10
4.11 INSTALL(TARGETS k3dsdk-half
5.1 --- a/k3dsdk/expression/CMakeLists.txt Sat Jun 26 11:23:33 2010 -0600
5.2 +++ b/k3dsdk/expression/CMakeLists.txt Mon Jun 28 19:37:56 2010 -0600
5.3 @@ -8,7 +8,7 @@
5.4
5.5 INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
5.6
5.7 -ADD_LIBRARY(k3dsdk-expression SHARED ${HEADERS} ${SOURCES})
5.8 +K3D_ADD_LIBRARY(k3dsdk-expression SHARED ${HEADERS} ${SOURCES})
5.9 K3D_GENERATE_DEF_FILE(k3dsdk-expression)
5.10
5.11 TARGET_LINK_LIBRARIES(k3dsdk-expression k3dsdk)
6.1 --- a/k3dsdk/ftgl/src/CMakeLists.txt Sat Jun 26 11:23:33 2010 -0600
6.2 +++ b/k3dsdk/ftgl/src/CMakeLists.txt Mon Jun 28 19:37:56 2010 -0600
6.3 @@ -35,7 +35,7 @@
6.4 INCLUDE_DIRECTORIES(${K3D_FREETYPE2_INCLUDE_DIRS})
6.5 LINK_DIRECTORIES(${K3D_FREETYPE2_LIB_DIRS})
6.6
6.7 -ADD_LIBRARY(k3dsdk-ftgl SHARED ${HEADERS} ${SOURCES} ${FTFONT_HEADERS} ${FTFONT_SOURCES} ${FTGLYPH_HEADERS} ${FTGLYPH_SOURCES} ${FTLAYOUT_HEADERS} ${FTLAYOUT_SOURCES})
6.8 +K3D_ADD_LIBRARY(k3dsdk-ftgl SHARED ${HEADERS} ${SOURCES} ${FTFONT_HEADERS} ${FTFONT_SOURCES} ${FTGLYPH_HEADERS} ${FTGLYPH_SOURCES} ${FTLAYOUT_HEADERS} ${FTLAYOUT_SOURCES})
6.9
6.10 TARGET_LINK_LIBRARIES(k3dsdk-ftgl ${K3D_FREETYPE2_LIBS})
6.11 TARGET_LINK_LIBRARIES(k3dsdk-ftgl ${K3D_OPENGL_GL_LIBRARY})
7.1 --- a/k3dsdk/glew/CMakeLists.txt Sat Jun 26 11:23:33 2010 -0600
7.2 +++ b/k3dsdk/glew/CMakeLists.txt Mon Jun 28 19:37:56 2010 -0600
7.3 @@ -7,7 +7,7 @@
7.4 FILE(GLOB HEADERS *.h)
7.5 FILE(GLOB SOURCES *.c)
7.6
7.7 -ADD_LIBRARY(k3dsdk-glew SHARED ${HEADERS} ${SOURCES})
7.8 +K3D_ADD_LIBRARY(k3dsdk-glew SHARED ${HEADERS} ${SOURCES})
7.9 K3D_GENERATE_DEF_FILE(k3dsdk-glew)
7.10 TARGET_LINK_LIBRARIES(k3dsdk-glew ${K3D_OPENGL_GL_LIBRARY})
7.11 TARGET_LINK_LIBRARIES(k3dsdk-glew ${K3D_OPENGL_GLU_LIBRARY})
8.1 --- a/k3dsdk/ngui/CMakeLists.txt Sat Jun 26 11:23:33 2010 -0600
8.2 +++ b/k3dsdk/ngui/CMakeLists.txt Mon Jun 28 19:37:56 2010 -0600
8.3 @@ -21,7 +21,7 @@
8.4 LINK_DIRECTORIES(${K3D_GTKMM_LIB_DIRS})
8.5 LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
8.6
8.7 -ADD_LIBRARY(k3dsdk-ngui SHARED ${HEADERS} ${SOURCES})
8.8 +K3D_ADD_LIBRARY(k3dsdk-ngui SHARED ${HEADERS} ${SOURCES})
8.9 K3D_GENERATE_DEF_FILE(k3dsdk-ngui)
8.10
8.11 TARGET_LINK_LIBRARIES(k3dsdk-ngui k3dsdk)
9.1 --- a/k3dsdk/parallel/CMakeLists.txt Sat Jun 26 11:23:33 2010 -0600
9.2 +++ b/k3dsdk/parallel/CMakeLists.txt Mon Jun 28 19:37:56 2010 -0600
9.3 @@ -6,7 +6,7 @@
9.4 LIST(SORT HEADERS)
9.5 LIST(SORT SOURCES)
9.6
9.7 -ADD_LIBRARY(k3dsdk-parallel SHARED ${HEADERS} ${SOURCES})
9.8 +K3D_ADD_LIBRARY(k3dsdk-parallel SHARED ${HEADERS} ${SOURCES})
9.9 K3D_GENERATE_DEF_FILE(k3dsdk-parallel)
9.10
9.11 IF(K3D_ENABLE_PARALLEL)
10.1 --- a/k3dsdk/python/CMakeLists.txt Sat Jun 26 11:23:33 2010 -0600
10.2 +++ b/k3dsdk/python/CMakeLists.txt Mon Jun 28 19:37:56 2010 -0600
10.3 @@ -14,7 +14,7 @@
10.4 LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
10.5 LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
10.6
10.7 -ADD_LIBRARY(k3dsdk-python-arrays SHARED
10.8 +K3D_ADD_LIBRARY(k3dsdk-python-arrays SHARED
10.9 typed_array_python.cpp
10.10 typed_array_python.h
10.11 )
10.12 @@ -23,7 +23,7 @@
10.13 TARGET_LINK_LIBRARIES(k3dsdk-python-arrays ${K3D_BOOST_PYTHON_LIBS})
10.14 TARGET_LINK_LIBRARIES(k3dsdk-python-arrays ${K3D_PYTHON_LIBS})
10.15
10.16 -ADD_LIBRARY(k3dsdk-python-const-arrays SHARED
10.17 +K3D_ADD_LIBRARY(k3dsdk-python-const-arrays SHARED
10.18 const_typed_array_python.cpp
10.19 const_typed_array_python.h
10.20 )
10.21 @@ -32,7 +32,7 @@
10.22 TARGET_LINK_LIBRARIES(k3dsdk-python-const-arrays ${K3D_BOOST_PYTHON_LIBS})
10.23 TARGET_LINK_LIBRARIES(k3dsdk-python-const-arrays ${K3D_PYTHON_LIBS})
10.24
10.25 -ADD_LIBRARY(k3dsdk-python-values SHARED
10.26 +K3D_ADD_LIBRARY(k3dsdk-python-values SHARED
10.27 angle_axis_python.cpp
10.28 angle_axis_python.h
10.29 bitmap_python.cpp
10.30 @@ -73,7 +73,7 @@
10.31 TARGET_LINK_LIBRARIES(k3dsdk-python-values ${K3D_BOOST_PYTHON_LIBS})
10.32 TARGET_LINK_LIBRARIES(k3dsdk-python-values ${K3D_PYTHON_LIBS})
10.33
10.34 -ADD_LIBRARY(k3dsdk-python-mesh SHARED
10.35 +K3D_ADD_LIBRARY(k3dsdk-python-mesh SHARED
10.36 mesh_python.cpp
10.37 mesh_python.h
10.38 )
10.39 @@ -81,7 +81,7 @@
10.40 TARGET_LINK_LIBRARIES(k3dsdk-python-mesh k3dsdk-python-arrays)
10.41 TARGET_LINK_LIBRARIES(k3dsdk-python-mesh k3dsdk-python-const-arrays)
10.42
10.43 -ADD_LIBRARY(k3dsdk-python-interfaces SHARED
10.44 +K3D_ADD_LIBRARY(k3dsdk-python-interfaces SHARED
10.45 any_python.cpp
10.46 any_python.h
10.47 icommand_node_python.cpp
10.48 @@ -125,7 +125,7 @@
10.49 TARGET_LINK_LIBRARIES(k3dsdk-python-interfaces k3dsdk-python-mesh)
10.50 TARGET_LINK_LIBRARIES(k3dsdk-python-interfaces k3dsdk-python-values)
10.51
10.52 -ADD_LIBRARY(k3dsdk-python-b SHARED
10.53 +K3D_ADD_LIBRARY(k3dsdk-python-b SHARED
10.54 table_python.cpp
10.55 table_python.h
10.56 const_table_python.cpp
10.57 @@ -166,7 +166,7 @@
10.58 TARGET_LINK_LIBRARIES(k3dsdk-python-b k3dsdk-python-interfaces)
10.59 TARGET_LINK_LIBRARIES(k3dsdk-python-b k3dsdk-resource)
10.60
10.61 -ADD_LIBRARY(k3dsdk-python-primitives SHARED
10.62 +K3D_ADD_LIBRARY(k3dsdk-python-primitives SHARED
10.63 bezier_triangle_patch_python.cpp
10.64 bezier_triangle_patch_python.h
10.65 bicubic_patch_python.cpp
10.66 @@ -207,7 +207,7 @@
10.67 K3D_GENERATE_DEF_FILE(k3dsdk-python-primitives)
10.68 TARGET_LINK_LIBRARIES(k3dsdk-python-primitives k3dsdk-python-b)
10.69
10.70 -ADD_LIBRARY(k3dsdk-python SHARED
10.71 +K3D_ADD_LIBRARY(k3dsdk-python SHARED
10.72 difference_python.cpp
10.73 difference_python.h
10.74 instance_wrapper_python.h
10.75 @@ -264,7 +264,7 @@
10.76 IF(K3D_BUILD_NGUI_MODULE)
10.77 INCLUDE_DIRECTORIES(${K3D_GTKMM_INCLUDE_DIRS})
10.78
10.79 - ADD_LIBRARY(k3dsdk-python-atk SHARED
10.80 + K3D_ADD_LIBRARY(k3dsdk-python-atk SHARED
10.81 atk_python.cpp
10.82 atk_python.h
10.83 )
11.1 --- a/k3dsdk/resource/CMakeLists.txt Sat Jun 26 11:23:33 2010 -0600
11.2 +++ b/k3dsdk/resource/CMakeLists.txt Mon Jun 28 19:37:56 2010 -0600
11.3 @@ -6,7 +6,7 @@
11.4 LIST(SORT HEADERS)
11.5 LIST(SORT SOURCES)
11.6
11.7 -ADD_LIBRARY(k3dsdk-resource SHARED ${HEADERS} ${SOURCES})
11.8 +K3D_ADD_LIBRARY(k3dsdk-resource SHARED ${HEADERS} ${SOURCES})
11.9 K3D_GENERATE_DEF_FILE(k3dsdk-resource)
11.10
11.11 TARGET_LINK_LIBRARIES(k3dsdk-resource k3dsdk)
12.1 --- a/k3dsdk/sgi_tesselator/CMakeLists.txt Sat Jun 26 11:23:33 2010 -0600
12.2 +++ b/k3dsdk/sgi_tesselator/CMakeLists.txt Mon Jun 28 19:37:56 2010 -0600
12.3 @@ -37,7 +37,7 @@
12.4 PROPERTIES COMPILE_FLAGS -w
12.5 )
12.6
12.7 -ADD_LIBRARY(k3dsdk-sgi-tesselator SHARED ${SOURCES})
12.8 +K3D_ADD_LIBRARY(k3dsdk-sgi-tesselator SHARED ${SOURCES})
12.9 K3D_GENERATE_DEF_FILE(k3dsdk-sgi-tesselator)
12.10
12.11 INSTALL(TARGETS k3dsdk-sgi-tesselator
13.1 --- a/k3dsdk/subdivision_surface/CMakeLists.txt Sat Jun 26 11:23:33 2010 -0600
13.2 +++ b/k3dsdk/subdivision_surface/CMakeLists.txt Mon Jun 28 19:37:56 2010 -0600
13.3 @@ -12,7 +12,7 @@
13.4 LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
13.5 LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
13.6
13.7 -ADD_LIBRARY(k3dsdk-subdivision-surface SHARED ${HEADERS} ${SOURCES})
13.8 +K3D_ADD_LIBRARY(k3dsdk-subdivision-surface SHARED ${HEADERS} ${SOURCES})
13.9 K3D_GENERATE_DEF_FILE(k3dsdk-subdivision-surface)
13.10 TARGET_LINK_LIBRARIES(k3dsdk-subdivision-surface k3dsdk)
13.11
14.1 --- a/modules/solar/solpos/CMakeLists.txt Sat Jun 26 11:23:33 2010 -0600
14.2 +++ b/modules/solar/solpos/CMakeLists.txt Mon Jun 28 19:37:56 2010 -0600
14.3 @@ -3,7 +3,7 @@
14.4
14.5 PROJECT(solpos)
14.6
14.7 -ADD_LIBRARY(k3d-solar-solpos SHARED solpos.cpp solpos.h)
14.8 +K3D_ADD_LIBRARY(k3d-solar-solpos SHARED solpos.cpp solpos.h)
14.9
14.10 INSTALL(TARGETS k3d-solar-solpos
14.11 RUNTIME DESTINATION bin