diff --git a/Modules/Classification/DataCollection/CMakeLists.txt b/Modules/Classification/DataCollection/CMakeLists.txt index 709794098d..4af11480be 100644 --- a/Modules/Classification/DataCollection/CMakeLists.txt +++ b/Modules/Classification/DataCollection/CMakeLists.txt @@ -1,11 +1,10 @@ MITK_CREATE_MODULE(DataCollection #<-- module name - SUBPROJECTS INCLUDE_DIRS DataHolder ReaderWriter Iterators Utilities#<-- sub-folders of module INTERNAL_INCLUDE_DIRS ${INCLUDE_DIRS_INTERNAL} DEPENDS MitkCore # MitkLegacyIO #<-- modules on which your module depends on PACKAGE_DEPENDS Qt5|Core Eigen ) if(BUILD_TESTING) ADD_SUBDIRECTORY(Testing) endif() diff --git a/Modules/OpenIGTLinkUI/CMakeLists.txt b/Modules/OpenIGTLinkUI/CMakeLists.txt index b693ea20ab..883675a68d 100644 --- a/Modules/OpenIGTLinkUI/CMakeLists.txt +++ b/Modules/OpenIGTLinkUI/CMakeLists.txt @@ -1,9 +1,8 @@ MITK_CREATE_MODULE( - #SUBPROJECTS MITKOpenIGTLink INCLUDE_DIRS Qmitk DEPENDS MitkOpenIGTLink MitkQtWidgetsExt MitkPersistence #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/PhotoacousticsAlgorithms/CMakeLists.txt b/Modules/PhotoacousticsAlgorithms/CMakeLists.txt index 5e001afcf0..16ebe278d0 100644 --- a/Modules/PhotoacousticsAlgorithms/CMakeLists.txt +++ b/Modules/PhotoacousticsAlgorithms/CMakeLists.txt @@ -1,20 +1,19 @@ set(dependencies_list MitkCore MitkAlgorithmsExt MitkOpenCVVideoSupport) IF(MITK_USE_OpenCL) add_definitions(-DPHOTOACOUSTICS_USE_GPU) set(dependencies_list ${dependencies_list} MitkOpenCL) message("Using OpenCL in PhotoacousticAlgorithms") ENDIF(MITK_USE_OpenCL) MITK_CREATE_MODULE( - SUBPROJECTS DEPENDS ${dependencies_list} #AUTOLOAD_WITH MitkCore INCLUDE_DIRS PUBLIC include INTERNAL_INCLUDE_DIRS ${INCLUDE_DIRS_INTERNAL} PACKAGE_DEPENDS ITK|ITKFFT+ITKImageCompose+ITKImageIntensity OpenCV tinyxml ) add_subdirectory(test) add_subdirectory(MitkPABeamformingTool) add_subdirectory(MitkPAResampleCropTool) diff --git a/Modules/PhotoacousticsHardware/CMakeLists.txt b/Modules/PhotoacousticsHardware/CMakeLists.txt index 06bde63943..12ff4f08ad 100644 --- a/Modules/PhotoacousticsHardware/CMakeLists.txt +++ b/Modules/PhotoacousticsHardware/CMakeLists.txt @@ -1,21 +1,20 @@ if(WIN32) option(MITK_USE_GALIL_HARDWARE "Enable support for OPOTEK Lasers" OFF) option(MITK_USE_OPHIR_PYRO_HARDWARE "Enable support for Ophir Pyroelectrical Sensors" OFF) if(MITK_USE_OPHIR_PYRO_HARDWARE) set(MITK_OPHIR_API_PATH "" CACHE PATH "Path to Ophir API lib.") endif() if(MITK_USE_GALIL_HARDWARE) set(MITK_GALIL_API_PATH "" CACHE PATH "Path to Galil API header files.") MITK_CREATE_MODULE( - SUBPROJECTS DEPENDS MitkIGT INCLUDE_DIRS PUBLIC "${MITK_GALIL_API_PATH}/include" "${MITK_OPHIR_API_PATH}" INTERNAL_INCLUDE_DIRS ${INCLUDE_DIRS_INTERNAL} ADDITIONAL_LIBS "${MITK_GALIL_API_PATH}/lib/dynamic/x64/gclib.lib" "${MITK_GALIL_API_PATH}/lib/dynamic/x64/gclibo.lib" tinyxml "${MITK_OPHIR_API_PATH}/OphirPyroWrapper.lib" PACKAGE_DEPENDS tinyxml ) endif() endif() diff --git a/Modules/US/CMakeLists.txt b/Modules/US/CMakeLists.txt index d45cfcac5f..97b6d418c7 100644 --- a/Modules/US/CMakeLists.txt +++ b/Modules/US/CMakeLists.txt @@ -1,16 +1,15 @@ MITK_CREATE_MODULE( - SUBPROJECTS INCLUDE_DIRS USControlInterfaces USFilters USModel INTERNAL_INCLUDE_DIRS ${INCLUDE_DIRS_INTERNAL} PACKAGE_DEPENDS Poco PRIVATE tinyxml DEPENDS MitkOpenCVVideoSupport MitkQtWidgetsExt MitkIGTBase MitkOpenIGTLink ) ## create US config #CONFIGURE_FILE(mitkUSConfig.h.in ${PROJECT_BINARY_DIR}/mitkUSConfig.h @ONLY) ADD_SUBDIRECTORY(USHardwareTelemed) ADD_SUBDIRECTORY(USHardwareDiPhAS) ADD_SUBDIRECTORY(USNavigation) ADD_SUBDIRECTORY(Testing) diff --git a/Modules/US/USHardwareDiPhAS/CMakeLists.txt b/Modules/US/USHardwareDiPhAS/CMakeLists.txt index f0d0d27156..c72b11fa83 100644 --- a/Modules/US/USHardwareDiPhAS/CMakeLists.txt +++ b/Modules/US/USHardwareDiPhAS/CMakeLists.txt @@ -1,20 +1,19 @@ if(WIN32) OPTION(MITK_USE_US_DiPhAS_SDK "Enable support for DiPhAS API devices" OFF) if(MITK_USE_US_DiPhAS_SDK) SET(MITK_US_DiPhAS_SDK_PATH "" CACHE PATH "Path to DiPhAS SDK header files.") MITK_CREATE_MODULE( - SUBPROJECTS DEPENDS MitkUS MitkPhotoacousticsHardware INCLUDE_DIRS PUBLIC "${MITK_US_DiPhAS_SDK_PATH}/Debug" "${MITK_US_DiPhAS_SDK_PATH}/Release" INTERNAL_INCLUDE_DIRS ${INCLUDE_DIRS_INTERNAL} ADDITIONAL_LIBS "${MITK_US_DiPhAS_SDK_PATH}/Debug/Framework.IBMT.US.CWrapper.lib" "${MITK_US_DiPhAS_SDK_PATH}/Release/Framework.IBMT.US.CWrapper.lib" AUTOLOAD_WITH MitkUS ) endif() endif() diff --git a/Modules/US/USHardwareTelemed/CMakeLists.txt b/Modules/US/USHardwareTelemed/CMakeLists.txt index a37c14c96f..d97e99aaab 100644 --- a/Modules/US/USHardwareTelemed/CMakeLists.txt +++ b/Modules/US/USHardwareTelemed/CMakeLists.txt @@ -1,23 +1,22 @@ IF(WIN32) OPTION(MITK_USE_US_TELEMED_SDK "Enable support for Telemed api devices" OFF) IF(MITK_USE_US_TELEMED_SDK) IF(CMAKE_CL_64) message( FATAL_ERROR "The Telemed API cannot be used in 64 bit builds. Please configure a 32 bit build instead or deactivate MITK_USE_US_TELEMED_SDK." ) ENDIF(CMAKE_CL_64) SET(MITK_US_TELEMED_SDK_PATH "" CACHE PATH "Path to Telemed SDK header files.") MITK_CREATE_MODULE( - SUBPROJECTS DEPENDS MitkUS INCLUDE_DIRS "${MITK_US_TELEMED_SDK_PATH}" INTERNAL_INCLUDE_DIRS ${INCLUDE_DIRS_INTERNAL} AUTOLOAD_WITH MitkUS ) ENDIF(MITK_USE_US_TELEMED_SDK) ENDIF(WIN32) diff --git a/Modules/US/USNavigation/CMakeLists.txt b/Modules/US/USNavigation/CMakeLists.txt index ada0962b54..2a62c0165f 100644 --- a/Modules/US/USNavigation/CMakeLists.txt +++ b/Modules/US/USNavigation/CMakeLists.txt @@ -1,8 +1,7 @@ MITK_CREATE_MODULE( - SUBPROJECTS INCLUDE_DIRS Filter DEPENDS MitkUS MitkIGT INTERNAL_INCLUDE_DIRS ${INCLUDE_DIRS_INTERNAL} ) add_subdirectory(Testing)