Browse Source

ENH: Update macro ctkCtkMacroBuildQtApp.cmake, target libraries associated with an application should be explicitly listed in the target_libraries.cmake file.

Jean-Christophe Fillion-Robin 15 years ago
parent
commit
d9f2f6acc5

+ 3 - 3
Applications/ctkDICOM/CMakeLists.txt

@@ -21,9 +21,9 @@ SET(KIT_UI_FORMS
 SET(KIT_resources
 )
 
-# Additional target libraries - Note that CTK_BASE_LIBRARIES is already included
-SET(KIT_target_libraries
-  )
+# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# The following macro will read the target libraries from the file 'target_libraries.cmake'
+ctkMacroGetTargetLibraries(KIT_target_libraries)
 
 # Additional directories to include - Not that CTK_INCLUDE_LIBRARIES is already included
 SET(KIT_include_directories

+ 10 - 0
Applications/ctkDICOM/target_libraries.cmake

@@ -0,0 +1,10 @@
+#
+# See CMake/ctkMacroGetTargetLibraries.cmake
+# 
+# This file should list the libraries required to build the current CTK application.
+# 
+
+SET(target_libraries
+  ${QT_LIBRARIES}
+  CTKDICOMWidgets
+  )

+ 1 - 2
CMake/ctkMacroBuildQtApp.cmake

@@ -84,9 +84,8 @@ MACRO(CtkMacroBuildQtApp)
       LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Runtime
       ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Development)
   ENDIF()
-  
+
   SET(my_libs
-    ${CTK_BASE_LIBRARIES}
     ${MY_TARGET_LIBRARIES}
     )
   TARGET_LINK_LIBRARIES(${proj_name} ${my_libs})