소스 검색

BUG: Since the DCMTK compiled issue should be solved, the application ctkDICOMIndexer should now be compiled properly.

Tested on Linux. Let's wait the dashboard output to make sure everything is
fine on windows plateform.
Jean-Christophe Fillion-Robin 15 년 전
부모
커밋
5b3f6c96b2
4개의 변경된 파일16개의 추가작업 그리고 6개의 파일을 삭제
  1. 3 3
      Applications/ctkDICOMIndexer/CMakeLists.txt
  2. 10 0
      Applications/ctkDICOMIndexer/target_libraries.cmake
  3. 1 1
      CMakeLists.txt
  4. 2 2
      Libs/DICOM/Core/CMakeLists.txt

+ 3 - 3
Applications/ctkDICOMIndexer/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/ctkDICOMIndexer/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}
+  CTKDICOMCore
+  )

+ 1 - 1
CMakeLists.txt

@@ -125,7 +125,7 @@ SET(ctk_plugins
 #
 SET(ctk_applications
   ctkDICOM
-  #ctkDICOMIndexer
+  ctkDICOMIndexer
   )
   
 #-----------------------------------------------------------------------------

+ 2 - 2
Libs/DICOM/Core/CMakeLists.txt

@@ -24,8 +24,8 @@ SET(KIT_include_directories
 SET(KIT_SRCS
   qCTKDCMTK.cxx
   qCTKDCMTK.h
-  #qCTKDCMTKIndexer.cxx
-  #qCTKDCMTKIndexer.h
+  qCTKDCMTKIndexer.cxx
+  qCTKDCMTKIndexer.h
   qCTKDCMTKModel.cxx
   qCTKDCMTKModel.h
   )