1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
|
## All lines beginning with `## DP:' are a description of the patch.
## DP: removes cyclic dependeny, adds soname generation
diff -urNad igstk-4.2.0~/Source/CMakeLists.txt igstk-4.2.0/Source/CMakeLists.txt
--- igstk-4.2.0~/Source/CMakeLists.txt 2009-08-24 23:29:28.000000000 -0400
+++ igstk-4.2.0/Source/CMakeLists.txt 2009-08-24 23:29:28.000000000 -0400
@@ -409,13 +409,12 @@
${EXTRA_LIBS}
)
-SET_TARGET_PROPERTIES(IGSTK PROPERTIES
-# BUILD_WITH_INSTALL_RPATH OFF
-# INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-# INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib
- VERSION ${IGSTK_VERSION_MAJOR}.${IGSTK_VERSION_MINOR}.${IGSTK_VERSION_PATCH}
- SOVERSION ${IGSTK_VERSION_MAJOR}
-)
+# Apply user-defined properties to the library target.
+IF(IGSTK_LIBRARY_PROPERTIES)
+ SET_TARGET_PROPERTIES(IGSTK PROPERTIES
+ ${IGSTK_LIBRARY_PROPERTIES}
+ )
+ENDIF(IGSTK_LIBRARY_PROPERTIES)
IF(IGSTK_USE_FLTK)
TARGET_LINK_LIBRARIES( IGSTK ${FLTK_LIBRARIES} )
diff -urNad igstk-4.2.0~/Utilities/SceneGraphVisualization/CMakeLists.txt igstk-4.2.0/Utilities/SceneGraphVisualization/CMakeLists.txt
--- igstk-4.2.0~/Utilities/SceneGraphVisualization/CMakeLists.txt 2009-08-24 23:21:09.000000000 -0400
+++ igstk-4.2.0/Utilities/SceneGraphVisualization/CMakeLists.txt 2009-08-24 23:30:03.000000000 -0400
@@ -22,4 +22,12 @@
)
ADD_LIBRARY(SceneGraphVisualization ${SceneGraphVisualization_SRC} )
-TARGET_LINK_LIBRARIES(SceneGraphVisualization IGSTK)
+TARGET_LINK_LIBRARIES(SceneGraphVisualization)
+
+# Apply user-defined properties to the library target.
+IF(IGSTK_LIBRARY_PROPERTIES)
+ SET_TARGET_PROPERTIES(SceneGraphVisualization PROPERTIES
+ ${IGSTK_LIBRARY_PROPERTIES}
+ )
+ENDIF(IGSTK_LIBRARY_PROPERTIES)
+
|