diff --git a/Modules/CameraCalibration/CMakeLists.txt b/Modules/CameraCalibration/CMakeLists.txt index 660bc72afb..c3ac2c38b7 100644 --- a/Modules/CameraCalibration/CMakeLists.txt +++ b/Modules/CameraCalibration/CMakeLists.txt @@ -1,8 +1,7 @@ MITK_CREATE_MODULE(mitkCameraCalibration DEPENDS MitkIGT PACKAGE_DEPENDS OpenCV - PROVIDES mitkCameraCalibration ) # add testing dir ADD_SUBDIRECTORY(Testing) \ No newline at end of file diff --git a/Modules/DeformableRegistration/CMakeLists.txt b/Modules/DeformableRegistration/CMakeLists.txt index 3bba8ee0c0..1ed6daac9c 100644 --- a/Modules/DeformableRegistration/CMakeLists.txt +++ b/Modules/DeformableRegistration/CMakeLists.txt @@ -1,8 +1,7 @@ MITK_CREATE_MODULE(MitkDeformableRegistration SUBPROJECTS MITK-Registration DEPENDS Mitk MitkRigidRegistration - PROVIDES MitkDeformableRegistration EXPORT_DEFINE MITK_DEFORMABLEREGISTRATION_EXPORT ) ADD_SUBDIRECTORY(Testing) diff --git a/Modules/DeformableRegistrationUI/CMakeLists.txt b/Modules/DeformableRegistrationUI/CMakeLists.txt index f586ab68d0..89c824517c 100644 --- a/Modules/DeformableRegistrationUI/CMakeLists.txt +++ b/Modules/DeformableRegistrationUI/CMakeLists.txt @@ -1,7 +1,6 @@ MITK_CREATE_MODULE(MitkDeformableRegistrationUI SUBPROJECTS MITK-Registration DEPENDS Qmitk MitkDeformableRegistration QT_MODULE - PROVIDES MitkDeformableRegistrationUI EXPORT_DEFINE MITK_DEFORMABLEREGISTRATION_UI_EXPORT ) diff --git a/Modules/IGT/CMakeLists.txt b/Modules/IGT/CMakeLists.txt index f01dd52f60..978bd113cc 100644 --- a/Modules/IGT/CMakeLists.txt +++ b/Modules/IGT/CMakeLists.txt @@ -1,37 +1,35 @@ INCLUDE(MITKIGTHardware.cmake) IF(MITK_USE_MICRON_TRACKER) SET(INCLUDE_DIRS_INTERNAL ${INCLUDE_DIRS_INTERNAL} ${MITK_MICRON_TRACKER_INCLUDE_DIR}) SET(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ${MITK_MICRON_TRACKER_LIB}) ENDIF(MITK_USE_MICRON_TRACKER) IF(MITK_USE_MICROBIRD_TRACKER) SET(INCLUDE_DIRS_INTERNAL ${INCLUDE_DIRS_INTERNAL} ${MITK_USE_MICROBIRD_TRACKER_INCLUDE_DIR}) SET(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ${MITK_USE_MICROBIRD_TRACKER_LIB}) ENDIF(MITK_USE_MICROBIRD_TRACKER) MITK_CREATE_MODULE(MitkIGT SUBPROJECTS MITK-IGT INCLUDE_DIRS IGTFilters IGTTrackingDevices IGTToolManagement INTERNAL_INCLUDE_DIRS ${INCLUDE_DIRS_INTERNAL} DEPENDS Mitk tinyxml SceneSerialization - PROVIDES mitkIGT ADDITIONAL_LIBS "${ADDITIONAL_LIBS}" ) MITK_CHECK_MODULE(_RESULT MitkIGT) IF(_RESULT) MESSAGE(STATUS "IGTTutorialStep1 won't be built. Missing: ${_RESULT}") ELSE(_RESULT) ## create IGT config CONFIGURE_FILE(mitkIGTConfig.h.in ${PROJECT_BINARY_DIR}/mitkIGTConfig.h @ONLY) # add test programm for serial communication classADD_EXECUTABLE(SerialCommunicationTest IGTTrackingDevices/mitkSerialCommunicationTest.cpp)TARGET_LINK_LIBRARIES(SerialCommunicationTest mitkIGT mitkCore tinyxml PocoXML) -ADD_EXECUTABLE (IGTTutorialStep1 IGTTutorial/IGTTutorialStep1.cpp) -TARGET_LINK_LIBRARIES(IGTTutorialStep1 mitkIGT mitkCore tinyxml PocoXML) +ADD_SUBDIRECTORY(IGTTutorial) ADD_SUBDIRECTORY(Testing) ENDIF(_RESULT) diff --git a/Modules/IGT/IGTTutorial/CMakeLists.txt b/Modules/IGT/IGTTutorial/CMakeLists.txt index 8b13789179..60dde48726 100644 --- a/Modules/IGT/IGTTutorial/CMakeLists.txt +++ b/Modules/IGT/IGTTutorial/CMakeLists.txt @@ -1 +1,4 @@ +MITK_USE_MODULE(MitkIGT) +ADD_EXECUTABLE(IGTTutorialStep1 IGTTutorialStep1.cpp) +TARGET_LINK_LIBRARIES(IGTTutorialStep1 ${ALL_LIBRARIES}) diff --git a/Modules/IGTUI/CMakeLists.txt b/Modules/IGTUI/CMakeLists.txt index a748a81d18..276cb54902 100644 --- a/Modules/IGTUI/CMakeLists.txt +++ b/Modules/IGTUI/CMakeLists.txt @@ -1,13 +1,12 @@ MITK_CREATE_MODULE(MitkIGTUI SUBPROJECTS MITK-IGT INCLUDE_DIRS Qmitk DEPENDS MitkIGT Qmitk QmitkExt - PROVIDES mitkIGTUI QT_MODULE GENERATED_CPP ${TOOL_GUI_CPPS} ${TOOL_CPPS} ) ## create IGTUI config CONFIGURE_FILE(mitkIGTUIConfig.h.in ${PROJECT_BINARY_DIR}/mitkIGTUIConfig.h @ONLY) diff --git a/Modules/ImageExtraction/CMakeLists.txt b/Modules/ImageExtraction/CMakeLists.txt index 0658e11e7b..c34d8d087e 100644 --- a/Modules/ImageExtraction/CMakeLists.txt +++ b/Modules/ImageExtraction/CMakeLists.txt @@ -1,11 +1,10 @@ MITK_CREATE_MODULE( ImageExtraction DEPENDS Mitk PlanarFigure DEPENDS_INTERNAL pic2vtk - PROVIDES ImageExtraction ) IF(BUILD_TESTING) ADD_SUBDIRECTORY(Testing) ENDIF(BUILD_TESTING) diff --git a/Modules/ImageStatistics/CMakeLists.txt b/Modules/ImageStatistics/CMakeLists.txt index 905447b0d9..e45492ad8b 100644 --- a/Modules/ImageStatistics/CMakeLists.txt +++ b/Modules/ImageStatistics/CMakeLists.txt @@ -1,10 +1,9 @@ MITK_CREATE_MODULE( ImageStatistics DEPENDS Mitk ImageExtraction PlanarFigure - PROVIDES ImageStatistics ) IF(BUILD_TESTING) ADD_SUBDIRECTORY(Testing) ENDIF(BUILD_TESTING) diff --git a/Modules/MitkExt/CMakeLists.txt b/Modules/MitkExt/CMakeLists.txt index 3a9e50c4ea..0183ebae65 100644 --- a/Modules/MitkExt/CMakeLists.txt +++ b/Modules/MitkExt/CMakeLists.txt @@ -1,29 +1,28 @@ #IF(WIN32) # OPTION(MITK_USE_TD_MOUSE "Enable support for 3D Connexion SpaceNavigator" OFF) #ENDIF(WIN32) CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/CMake/ToolExtensionITKFactory.cpp.in ${PROJECT_BINARY_DIR}/ToolExtensionITKFactory.cpp.in COPYONLY) CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/CMake/ToolExtensionITKFactoryLoader.cpp.in ${PROJECT_BINARY_DIR}/ToolExtensionITKFactoryLoader.cpp.in COPYONLY) CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/CMake/ToolGUIExtensionITKFactory.cpp.in ${PROJECT_BINARY_DIR}/ToolGUIExtensionITKFactory.cpp.in COPYONLY) MITK_CREATE_MODULE( MitkExt INCLUDE_DIRS Algorithms Controllers DataManagement Interactions IO Rendering DEPENDS Mitk ipSegmentation PlanarFigure ImageStatistics DEPENDS_INTERNAL pic2vtk IIL4MITK - PROVIDES mitkCoreExt ) # this is needed for libraries which link to mitkCoreExt and need # symbols from explicitly instantiated templates like # mitk::UnstructuredGridVtkWriter which is referenced in # mitk::UnstructuredGridVtkWriterTest in the MitkExtTestDriver executable. IF(MINGW) GET_TARGET_PROPERTY(_mitkCoreExt_MINGW_linkflags mitkCoreExt LINK_FLAGS) IF(NOT _mitkCoreExt_MINGW_linkflags) SET(_mitkCoreExt_MINGW_linkflags "") ENDIF(NOT _mitkCoreExt_MINGW_linkflags) SET_TARGET_PROPERTIES(mitkCoreExt PROPERTIES LINK_FLAGS "${_mitkCoreExt_MINGW_linkflags} -Wl,--export-all-symbols") ENDIF(MINGW) ADD_SUBDIRECTORY(Testing) diff --git a/Modules/OpenCVVideoSupport/CMakeLists.txt b/Modules/OpenCVVideoSupport/CMakeLists.txt index 73acfadb1d..3c134e5a21 100644 --- a/Modules/OpenCVVideoSupport/CMakeLists.txt +++ b/Modules/OpenCVVideoSupport/CMakeLists.txt @@ -1,26 +1,25 @@ IF(MITK_USE_OpenCV) SET(dependencies OpenCV) IF(MITK_USE_videoInput) SET(dependencies ${dependencies} videoInput) ENDIF(MITK_USE_videoInput) MITK_CREATE_MODULE(mitkOpenCVVideoSupport DEPENDS Mitk MitkExt PACKAGE_DEPENDS ${dependencies} - PROVIDES mitkOpenCVVideoSupport ADDITIONAL_LIBS ${OPENCVVIDEOSUPPORT_ADDITIONAL_LIBS} EXPORT_DEFINE MITK_OPENCVVIDEOSUPPORT_EXPORT ) IF(MITK_USE_QT) ADD_SUBDIRECTORY(UI) ENDIF(MITK_USE_QT) IF(BUILD_TESTING) ADD_SUBDIRECTORY(Testing) ENDIF(BUILD_TESTING) ENDIF(MITK_USE_OpenCV) diff --git a/Modules/OpenCVVideoSupport/UI/CMakeLists.txt b/Modules/OpenCVVideoSupport/UI/CMakeLists.txt index 64347d9f04..7e195e3ab2 100644 --- a/Modules/OpenCVVideoSupport/UI/CMakeLists.txt +++ b/Modules/OpenCVVideoSupport/UI/CMakeLists.txt @@ -1,12 +1,11 @@ MITK_CREATE_MODULE(mitkOpenCVVideoSupportUI DEPENDS MitkExt QmitkExt mitkOpenCVVideoSupport PACKAGE_DEPENDS QT QT_MODULE - PROVIDES mitkOpenCVVideoSupportUI EXPORT_DEFINE MITK_OPENCVVIDEOSUPPORTUI_EXPORT ) # no tests yet #IF(BUILD_TESTING) #ADD_SUBDIRECTORY(Testing) #ENDIF(BUILD_TESTING) \ No newline at end of file diff --git a/Modules/RigidRegistration/CMakeLists.txt b/Modules/RigidRegistration/CMakeLists.txt index 1618ef4b52..592908debc 100644 --- a/Modules/RigidRegistration/CMakeLists.txt +++ b/Modules/RigidRegistration/CMakeLists.txt @@ -1,8 +1,7 @@ MITK_CREATE_MODULE(MitkRigidRegistration SUBPROJECTS MITK-Registration DEPENDS Mitk - PROVIDES MitkRigidRegistration EXPORT_DEFINE MITK_RIGIDREGISTRATION_EXPORT ) ADD_SUBDIRECTORY(Testing) diff --git a/Modules/RigidRegistrationUI/CMakeLists.txt b/Modules/RigidRegistrationUI/CMakeLists.txt index 8eb8586bc6..7edd59da5c 100644 --- a/Modules/RigidRegistrationUI/CMakeLists.txt +++ b/Modules/RigidRegistrationUI/CMakeLists.txt @@ -1,8 +1,7 @@ MITK_CREATE_MODULE(MitkRigidRegistrationUI SUBPROJECTS MITK-Registration INCLUDE_DIRS RigidRegistrationMetrics RigidRegistrationOptimizer RigidRegistrationTransforms DEPENDS Qmitk MitkRigidRegistration QT_MODULE - PROVIDES MitkRigidRegistrationUI EXPORT_DEFINE MITK_RIGIDREGISTRATION_UI_EXPORT ) diff --git a/Modules/ToFHardware/CMakeLists.txt b/Modules/ToFHardware/CMakeLists.txt index f7e4fcf55a..89c55c41c3 100644 --- a/Modules/ToFHardware/CMakeLists.txt +++ b/Modules/ToFHardware/CMakeLists.txt @@ -1,35 +1,34 @@ INCLUDE(mitkToFHardware.cmake) IF(MITK_USE_TOF_PMDCAMCUBE) SET(INCLUDE_DIRS_INTERNAL ${INCLUDE_DIRS_INTERNAL} ${MITK_PMD_SDK_DIR}/include) SET(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ${MITK_PMD_LIB}) ENDIF(MITK_USE_TOF_PMDCAMCUBE) IF(MITK_USE_TOF_O3) SET(INCLUDE_DIRS_INTERNAL ${INCLUDE_DIRS_INTERNAL} ${MITK_PMD_SDK_DIR}/include) SET(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ${MITK_PMD_LIB}) ENDIF(MITK_USE_TOF_O3) IF(MITK_USE_TOF_PMDCAMBOARD) SET(INCLUDE_DIRS_INTERNAL ${INCLUDE_DIRS_INTERNAL} ${MITK_PMD_SDK_DIR}/include) SET(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ${MITK_PMD_LIB}) ENDIF(MITK_USE_TOF_PMDCAMBOARD) IF(MITK_USE_TOF_MESASR4000) SET(INCLUDE_DIRS_INTERNAL ${INCLUDE_DIRS_INTERNAL} ${MITK_MESA_SDK_DIR}/include) SET(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ${MITK_MESA_LIB}) ENDIF(MITK_USE_TOF_MESASR4000) MITK_CREATE_MODULE(mitkToFHardware SUBPROJECTS MITK-ToF INCLUDE_DIRS ${MITK_BIN_DIR} INTERNAL_INCLUDE_DIRS ${INCLUDE_DIRS_INTERNAL} DEPENDS Mitk MitkExt mitkOpenCVVideoSupport MitkIGT - PROVIDES mitkToFHardware EXPORT_DEFINE MITK_TOFHARDWARE_EXPORT ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ) ADD_SUBDIRECTORY(Testing) diff --git a/Modules/ToFProcessing/CMakeLists.txt b/Modules/ToFProcessing/CMakeLists.txt index d1df90e238..b33d161d55 100644 --- a/Modules/ToFProcessing/CMakeLists.txt +++ b/Modules/ToFProcessing/CMakeLists.txt @@ -1,13 +1,12 @@ MITK_CREATE_MODULE(mitkToFProcessing SUBPROJECTS MITK-ToF DEPENDS Mitk MitkExt mitkCameraCalibration PACKAGE_DEPENDS OpenCV - PROVIDES mitkToFProcessing ) IF(BUILD_TESTING) ADD_SUBDIRECTORY(Testing) ENDIF(BUILD_TESTING) diff --git a/Modules/ToFUI/CMakeLists.txt b/Modules/ToFUI/CMakeLists.txt index 1587a7c5a8..9f165e73c1 100644 --- a/Modules/ToFUI/CMakeLists.txt +++ b/Modules/ToFUI/CMakeLists.txt @@ -1,9 +1,8 @@ MITK_CREATE_MODULE(mitkTOFUI SUBPROJECTS MITK-ToF INCLUDE_DIRS Qmitk DEPENDS mitkToFHardware mitkToFProcessing Qmitk QmitkExt - PROVIDES mitkTOFUI QT_MODULE GENERATED_CPP ${TOOL_GUI_CPPS} ${TOOL_CPPS} ) diff --git a/Utilities/glew/CMakeLists.txt b/Utilities/glew/CMakeLists.txt index a90d8714d8..92772ef4d8 100644 --- a/Utilities/glew/CMakeLists.txt +++ b/Utilities/glew/CMakeLists.txt @@ -1,6 +1,5 @@ MITK_CREATE_MODULE(glew - PROVIDES glew INCLUDE_DIRS external/include INTERNAL_INCLUDE_DIRS external/include PACKAGE_DEPENDS VTK )