diff --git a/Applications/CMakeLists.txt b/Applications/CMakeLists.txt index 0f56dcd731..5f79c2973f 100644 --- a/Applications/CMakeLists.txt +++ b/Applications/CMakeLists.txt @@ -1,23 +1,23 @@ -SET(MITK_CPACK_PACKAGE_EXECUTABLES "" CACHE INTERNAL "Collecting windows shortcuts to executables" FORCE) -SET(MITK_DIR ${PROJECT_BINARY_DIR}) -SET(MITK_EXPORTS_FILE_INCLUDED 1) +set(MITK_CPACK_PACKAGE_EXECUTABLES "" CACHE INTERNAL "Collecting windows shortcuts to executables" FORCE) +set(MITK_DIR ${PROJECT_BINARY_DIR}) +set(MITK_EXPORTS_FILE_INCLUDED 1) -IF(MITK_USE_QT AND QT4_FOUND) +if(MITK_USE_QT AND QT4_FOUND) - IF(MITK_USE_CTK) - ADD_SUBDIRECTORY(PluginGenerator) - ENDIF() + if(MITK_USE_CTK) + add_subdirectory(PluginGenerator) + endif() - IF(MITK_BUILD_APP_CoreApp OR MITK_BUILD_ALL_APPS) - ADD_SUBDIRECTORY(CoreApp) - ENDIF() + if(MITK_BUILD_APP_CoreApp OR MITK_BUILD_ALL_APPS) + add_subdirectory(CoreApp) + endif() - IF(MITK_BUILD_APP_ExtApp OR MITK_BUILD_ALL_APPS) - ADD_SUBDIRECTORY(ExtApp) - ENDIF() + if(MITK_BUILD_APP_ExtApp OR MITK_BUILD_ALL_APPS) + add_subdirectory(ExtApp) + endif() - IF(MITK_BUILD_TUTORIAL) - ADD_SUBDIRECTORY(Tutorial) - ENDIF() + if(MITK_BUILD_TUTORIAL) + add_subdirectory(Tutorial) + endif() -ENDIF() +endif() diff --git a/Applications/CoreApp/CMakeLists.txt b/Applications/CoreApp/CMakeLists.txt index 2706e0dab3..8f67ea57cb 100644 --- a/Applications/CoreApp/CMakeLists.txt +++ b/Applications/CoreApp/CMakeLists.txt @@ -1,37 +1,37 @@ project(CoreApp) set(_app_options) if(MITK_SHOW_CONSOLE_WINDOW) list(APPEND _app_options SHOW_CONSOLE) endif() # Create a cache entry for the provisioning file which is used to export # the file name in the MITKConfig.cmake file. This will keep external projects # which rely on this file happy. set(MITK_COREAPP_PROVISIONING_FILE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/CoreApp.provisioning" CACHE INTERNAL "CoreApp provisioning file" FORCE) set(_plugins org.blueberry.compat org.mitk.gui.qt.coreapplication org.mitk.gui.qt.stdmultiwidgeteditor ) # Plug-ins listed below will not be # - added as a build-time dependency to the executable # - listed in the provisioning file for the executable # - installed if they are external plug-ins set(_exclude_plugins ) FunctionCreateBlueBerryApplication( NAME CoreApp DESCRIPTION "MITK - CoreApp Application" PLUGINS ${_plugins} ${_app_options} ) # subproject support -ADD_DEPENDENCIES(MITK-CoreUI CoreApp) -IF(MITK_ENABLE_GUI_TESTING) - ADD_DEPENDENCIES(MITK-CoreUI solstice) -ENDIF() +add_dependencies(MITK-CoreUI CoreApp) +if(MITK_ENABLE_GUI_TESTING) + add_dependencies(MITK-CoreUI solstice) +endif() diff --git a/Applications/Tests/MbiLog/CMakeLists.txt b/Applications/Tests/MbiLog/CMakeLists.txt index df17a4873c..9ebe1b9c22 100644 --- a/Applications/Tests/MbiLog/CMakeLists.txt +++ b/Applications/Tests/MbiLog/CMakeLists.txt @@ -1,7 +1,7 @@ -PROJECT(MbiLogExample) -FIND_PACKAGE(MITK) -INCLUDE_DIRECTORIES(${MITK_INCLUDE_DIRS}) -LINK_DIRECTORIES(${MITK_LINK_DIRECTORIES}) -ADD_EXECUTABLE(MitkLogExample MitkLogExample.cpp) -TARGET_LINK_LIBRARIES(MitkLogExample ${MITK_LIBRARIES}) +project(MbiLogExample) +find_package(MITK) +include_directories(${MITK_INCLUDE_DIRS}) +link_directories(${MITK_LINK_DIRECTORIES}) +add_executable(MitkLogExample MitkLogExample.cpp) +target_link_libraries(MitkLogExample ${MITK_LIBRARIES}) diff --git a/Applications/Tests/QtFreeRender/CMakeLists.txt b/Applications/Tests/QtFreeRender/CMakeLists.txt index b3799836f9..e8c29ce643 100644 --- a/Applications/Tests/QtFreeRender/CMakeLists.txt +++ b/Applications/Tests/QtFreeRender/CMakeLists.txt @@ -1,7 +1,7 @@ -PROJECT(QtFreeRender) -FIND_PACKAGE(MITK) -INCLUDE_DIRECTORIES(${MITK_INCLUDE_DIRS}) -LINK_DIRECTORIES(${MITK_LINK_DIRECTORIES}) -ADD_EXECUTABLE(QtFreeRender QtFreeRender.cpp) -TARGET_LINK_LIBRARIES(QtFreeRender ${MITK_LIBRARIES} ITKCommon.lib) +project(QtFreeRender) +find_package(MITK) +include_directories(${MITK_INCLUDE_DIRS}) +link_directories(${MITK_LINK_DIRECTORIES}) +add_executable(QtFreeRender QtFreeRender.cpp) +target_link_libraries(QtFreeRender ${MITK_LIBRARIES} ITKCommon.lib) diff --git a/Applications/Tutorial/CMakeLists.txt b/Applications/Tutorial/CMakeLists.txt index d0e45c9f8d..99088056d7 100644 --- a/Applications/Tutorial/CMakeLists.txt +++ b/Applications/Tutorial/CMakeLists.txt @@ -1,51 +1,51 @@ MITK_CHECK_MODULE(MISSING QmitkExt) -IF (MISSING) -MESSAGE("Tutorial won't be built because QmitkExt is missing.") -ELSE(MISSING) +if(MISSING) +message("Tutorial won't be built because QmitkExt is missing.") +else(MISSING) MITK_USE_MODULE(QmitkExt) MITK_USE_MODULE(MitkExt) -INCLUDE_DIRECTORIES(${ALL_INCLUDE_DIRECTORIES}) +include_directories(${ALL_INCLUDE_DIRECTORIES}) # initialize only the source lists which need additional files # Step6 is reused in Step7 and Step8. Step6.cpp has to be added # explicitly since it is not a member of ${STEP6_CPP} at this point -SET(STEP6_CPP Step6RegionGrowing1.cpp Step6RegionGrowing2.cpp Step6main.cpp) -SET(STEP7_CPP Step6RegionGrowing1.cpp Step6RegionGrowing2.cpp Step6.cpp Step7main.cpp) -SET(STEP8_CPP Step6RegionGrowing1.cpp Step6RegionGrowing2.cpp Step6.cpp Step7.cpp Step8main.cpp) +set(STEP6_CPP Step6RegionGrowing1.cpp Step6RegionGrowing2.cpp Step6main.cpp) +set(STEP7_CPP Step6RegionGrowing1.cpp Step6RegionGrowing2.cpp Step6.cpp Step7main.cpp) +set(STEP8_CPP Step6RegionGrowing1.cpp Step6RegionGrowing2.cpp Step6.cpp Step7.cpp Step8main.cpp) # some files need Qt wrapping QT4_WRAP_CPP(STEP6_MOC_CPP Step6.h) QT4_WRAP_CPP(STEP7_MOC_CPP Step7.h) QT4_WRAP_CPP(STEP8_MOC_CPP Step8.h) # set additional moc files to build -SET(STEP6_CPP ${STEP6_CPP} ${STEP6_MOC_CPP}) -SET(STEP7_CPP ${STEP7_CPP} ${STEP7_MOC_CPP} ${STEP6_MOC_CPP}) -SET(STEP8_CPP ${STEP8_CPP} ${STEP8_MOC_CPP} ${STEP7_MOC_CPP} ${STEP6_MOC_CPP}) +set(STEP6_CPP ${STEP6_CPP} ${STEP6_MOC_CPP}) +set(STEP7_CPP ${STEP7_CPP} ${STEP7_MOC_CPP} ${STEP6_MOC_CPP}) +set(STEP8_CPP ${STEP8_CPP} ${STEP8_MOC_CPP} ${STEP7_MOC_CPP} ${STEP6_MOC_CPP}) # for the others it's all the same -FOREACH(stepNo RANGE 1 8) - SET(STEP${stepNo}_CPP ${STEP${stepNo}_CPP} Step${stepNo}.cpp QtTesting.cpp) - ADD_EXECUTABLE(Step${stepNo} ${STEP${stepNo}_CPP}) - TARGET_LINK_LIBRARIES(Step${stepNo} ${ALL_LIBRARIES}) +foreach(stepNo RANGE 1 8) + set(STEP${stepNo}_CPP ${STEP${stepNo}_CPP} Step${stepNo}.cpp QtTesting.cpp) + add_executable(Step${stepNo} ${STEP${stepNo}_CPP}) + target_link_libraries(Step${stepNo} ${ALL_LIBRARIES}) -ENDFOREACH(stepNo) +endforeach(stepNo) #step 10 equals 1-8 -SET(STEP10_CPP ${STEP10_CPP} Step10.cpp QtTesting.cpp) -ADD_EXECUTABLE(Step10 ${STEP10_CPP}) -TARGET_LINK_LIBRARIES(Step10 ${ALL_LIBRARIES}) +set(STEP10_CPP ${STEP10_CPP} Step10.cpp QtTesting.cpp) +add_executable(Step10 ${STEP10_CPP}) +target_link_libraries(Step10 ${ALL_LIBRARIES}) -ADD_DEPENDENCIES(Step7 Step6) -ADD_DEPENDENCIES(Step8 Step7 Step6) +add_dependencies(Step7 Step6) +add_dependencies(Step8 Step7 Step6) # adding additional example for mitk itk and vtk interaction -ADD_EXECUTABLE(mitkWithITKAndVTK mitkWithITKAndVTK.cpp) -TARGET_LINK_LIBRARIES(mitkWithITKAndVTK ${ALL_LIBRARIES}) +add_executable(mitkWithITKAndVTK mitkWithITKAndVTK.cpp) +target_link_libraries(mitkWithITKAndVTK ${ALL_LIBRARIES}) -ENDIF(MISSING) +endif(MISSING) diff --git a/BlueBerry/BlueBerryConfig.cmake.in b/BlueBerry/BlueBerryConfig.cmake.in index 31f61bceab..78ebbcace5 100644 --- a/BlueBerry/BlueBerryConfig.cmake.in +++ b/BlueBerry/BlueBerryConfig.cmake.in @@ -1,85 +1,85 @@ # ------------------------------------------------------------------------- # Package requirements # ------------------------------------------------------------------------- -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "@BLUEBERRY_SOURCE_DIR@/CMake") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "@BLUEBERRY_SOURCE_DIR@/CMake") -SET(CTK_DIR "@CTK_DIR@") -FIND_PACKAGE(CTK REQUIRED) +set(CTK_DIR "@CTK_DIR@") +find_package(CTK REQUIRED) -SET(mbilog_DIR "@mbilog_DIR@") -FIND_PACKAGE(mbilog REQUIRED) +set(mbilog_DIR "@mbilog_DIR@") +find_package(mbilog REQUIRED) -FIND_PACKAGE(Poco REQUIRED) +find_package(Poco REQUIRED) -SET(DOXYGEN_EXECUTABLE "@DOXYGEN_EXECUTABLE@") -SET(DOXYGEN_DOT_EXECUTABLE "@DOXYGEN_DOT_EXECUTABLE@") +set(DOXYGEN_EXECUTABLE "@DOXYGEN_EXECUTABLE@") +set(DOXYGEN_DOT_EXECUTABLE "@DOXYGEN_DOT_EXECUTABLE@") -FIND_PACKAGE(Doxygen) +find_package(Doxygen) # ------------------------------------------------------------------------- # BlueBerry directory vars # ------------------------------------------------------------------------- -SET(BLUEBERRY_PLUGINS_SOURCE_DIR "@BLUEBERRY_PLUGINS_SOURCE_DIR@") -SET(BLUEBERRY_PLUGINS_BINARY_DIR "@BLUEBERRY_PLUGINS_BINARY_DIR@") +set(BLUEBERRY_PLUGINS_SOURCE_DIR "@BLUEBERRY_PLUGINS_SOURCE_DIR@") +set(BLUEBERRY_PLUGINS_BINARY_DIR "@BLUEBERRY_PLUGINS_BINARY_DIR@") -SET(BLUEBERRY_PLUGIN_SOURCE_DIRS "@BLUEBERRY_PLUGINS_SOURCE_DIR@") +set(BLUEBERRY_PLUGIN_SOURCE_DIRS "@BLUEBERRY_PLUGINS_SOURCE_DIR@") -SET(BLUEBERRY_SOURCE_DIR "@BLUEBERRY_SOURCE_DIR@") -SET(BlueBerry_SOURCE_DIR "@BLUEBERRY_SOURCE_DIR@") -SET(BLUEBERRY_BINARY_DIR "@BLUEBERRY_BINARY_DIR@") +set(BLUEBERRY_SOURCE_DIR "@BLUEBERRY_SOURCE_DIR@") +set(BlueBerry_SOURCE_DIR "@BLUEBERRY_SOURCE_DIR@") +set(BLUEBERRY_BINARY_DIR "@BLUEBERRY_BINARY_DIR@") # ------------------------------------------------------------------------- # BlueBerry CMake file includes # ------------------------------------------------------------------------- -SET(BLUEBERRY_PLUGIN_USE_FILE @BB_PLUGIN_USE_FILE@) -IF(BLUEBERRY_PLUGIN_USE_FILE) - IF(EXISTS ${BLUEBERRY_PLUGIN_USE_FILE}) - INCLUDE(${BLUEBERRY_PLUGIN_USE_FILE}) - ENDIF() -ENDIF() +set(BLUEBERRY_PLUGIN_USE_FILE @BB_PLUGIN_USE_FILE@) +if(BLUEBERRY_PLUGIN_USE_FILE) + if(EXISTS ${BLUEBERRY_PLUGIN_USE_FILE}) + include(${BLUEBERRY_PLUGIN_USE_FILE}) + endif() +endif() -IF(NOT BB_PLUGIN_EXPORTS_FILE_INCLUDED AND NOT CMAKE_PROJECT_NAME STREQUAL "MITK") - INCLUDE("@BB_PLUGIN_EXPORTS_FILE@") - SET(BB_PLUGIN_EXPORTS_FILE_INCLUDED 1) -ENDIF() +if(NOT BB_PLUGIN_EXPORTS_FILE_INCLUDED AND NOT CMAKE_PROJECT_NAME STREQUAL "MITK") + include("@BB_PLUGIN_EXPORTS_FILE@") + set(BB_PLUGIN_EXPORTS_FILE_INCLUDED 1) +endif() # ------------------------------------------------------------------------- # BlueBerry CMake variables # ------------------------------------------------------------------------- -SET(BLUEBERRY_DEBUG_POSTFIX @BLUEBERRY_DEBUG_POSTFIX@) +set(BLUEBERRY_DEBUG_POSTFIX @BLUEBERRY_DEBUG_POSTFIX@) -SET(BLUEBERRY_USE_QT_HELP @BLUEBERRY_USE_QT_HELP@) +set(BLUEBERRY_USE_QT_HELP @BLUEBERRY_USE_QT_HELP@) -SET(QT_HELPGENERATOR_EXECUTABLE "@QT_HELPGENERATOR_EXECUTABLE@") -SET(QT_COLLECTIONGENERATOR_EXECUTABLE "@QT_COLLECTIONGENERATOR_EXECUTABLE@") -SET(QT_ASSISTANT_EXECUTABLE "@QT_ASSISTANT_EXECUTABLE@") -SET(QT_XMLPATTERNS_EXECUTABLE "@QT_XMLPATTERNS_EXECUTABLE@") +set(QT_HELPGENERATOR_EXECUTABLE "@QT_HELPGENERATOR_EXECUTABLE@") +set(QT_COLLECTIONGENERATOR_EXECUTABLE "@QT_COLLECTIONGENERATOR_EXECUTABLE@") +set(QT_ASSISTANT_EXECUTABLE "@QT_ASSISTANT_EXECUTABLE@") +set(QT_XMLPATTERNS_EXECUTABLE "@QT_XMLPATTERNS_EXECUTABLE@") -SET(BLUEBERRY_PLUGIN_TARGETS @my_plugin_targets@) +set(BLUEBERRY_PLUGIN_TARGETS @my_plugin_targets@) -SET(BLUEBERRY_PLUGIN_PROVISIONING_FILE "@BLUEBERRY_PROVISIONING_FILE@") +set(BLUEBERRY_PLUGIN_PROVISIONING_FILE "@BLUEBERRY_PROVISIONING_FILE@") -SET(BLUEBERRY_DOXYGEN_TAGFILE_NAME @BLUEBERRY_DOXYGEN_TAGFILE_NAME@) +set(BLUEBERRY_DOXYGEN_TAGFILE_NAME @BLUEBERRY_DOXYGEN_TAGFILE_NAME@) # ------------------------------------------------------------------------- # BlueBerry CMake macros # ------------------------------------------------------------------------- -INCLUDE(MacroParseArguments) -INCLUDE(MacroConvertSchema) -INCLUDE(MacroOrganizeSources) -INCLUDE(MacroCreateCTKPlugin) -INCLUDE(MacroCreateQtHelp) -INCLUDE(MacroInstallCTKPlugin) -INCLUDE(FunctionInstallThirdPartyCTKPlugins) -INCLUDE(FunctionCreateProvisioningFile) -INCLUDE(FunctionCreateBlueBerryApplication) +include(MacroParseArguments) +include(MacroConvertSchema) +include(MacroOrganizeSources) +include(MacroCreateCTKPlugin) +include(MacroCreateQtHelp) +include(MacroInstallCTKPlugin) +include(FunctionInstallThirdPartyCTKPlugins) +include(FunctionCreateProvisioningFile) +include(FunctionCreateBlueBerryApplication) diff --git a/BlueBerry/Bundles/org.blueberry.compat/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.compat/CMakeLists.txt index efc1680685..3841619bc3 100644 --- a/BlueBerry/Bundles/org.blueberry.compat/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.compat/CMakeLists.txt @@ -1,3 +1,3 @@ -PROJECT(org_blueberry_compat) +project(org_blueberry_compat) MACRO_CREATE_CTK_PLUGIN(EXPORT_DIRECTIVE org_blueberry_compat_EXPORT) diff --git a/BlueBerry/Bundles/org.blueberry.compat/files.cmake b/BlueBerry/Bundles/org.blueberry.compat/files.cmake index 28e4d4be9d..6f84ee21cb 100644 --- a/BlueBerry/Bundles/org.blueberry.compat/files.cmake +++ b/BlueBerry/Bundles/org.blueberry.compat/files.cmake @@ -1,9 +1,9 @@ -SET(MOC_H_FILES +set(MOC_H_FILES berryPluginActivator_p.h berryCTKPluginListener_p.h ) -SET(CPP_FILES +set(CPP_FILES berryPluginActivator.cpp berryCTKPluginListener.cpp ) diff --git a/BlueBerry/Bundles/org.blueberry.compat/manifest_headers.cmake b/BlueBerry/Bundles/org.blueberry.compat/manifest_headers.cmake index 402cbaf718..821c9d5240 100644 --- a/BlueBerry/Bundles/org.blueberry.compat/manifest_headers.cmake +++ b/BlueBerry/Bundles/org.blueberry.compat/manifest_headers.cmake @@ -1,6 +1,6 @@ set(Plugin-Name "BlueBerry Legacy Compatibility Plugin") set(Plugin-Version "1.0.0") set(Plugin-Vendor "DKFZ, Medical and Biological Informatics") set(Plugin-ContactAddress "http://www.mitk.org") -SET(Require-Plugin "org.blueberry.osgi") -SET(Plugin-ActivationPolicy "eager") +set(Require-Plugin "org.blueberry.osgi") +set(Plugin-ActivationPolicy "eager") diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.core.commands/CMakeLists.txt index cd0a81bc25..73b53dda71 100644 --- a/BlueBerry/Bundles/org.blueberry.core.commands/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.core.commands/CMakeLists.txt @@ -1,4 +1,4 @@ -PROJECT(org_blueberry_core_commands) +project(org_blueberry_core_commands) MACRO_CREATE_CTK_PLUGIN(EXPORT_DIRECTIVE BERRY_COMMANDS EXPORTED_INCLUDE_SUFFIXES src src/common src/util) diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/files.cmake b/BlueBerry/Bundles/org.blueberry.core.commands/files.cmake index e5dbbb2654..205ec9f80c 100644 --- a/BlueBerry/Bundles/org.blueberry.core.commands/files.cmake +++ b/BlueBerry/Bundles/org.blueberry.core.commands/files.cmake @@ -1,59 +1,59 @@ -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/berryPluginActivator.h ) -SET(SRC_CPP_FILES +set(SRC_CPP_FILES berryAbstractHandler.cpp berryCommand.cpp berryCommandCategory.cpp berryCommandCategoryEvent.cpp berryCommandEvent.cpp berryCommandManager.cpp berryCommandManagerEvent.cpp berryExecutionEvent.cpp berryHandlerEvent.cpp berryICommandCategoryListener.cpp berryICommandListener.cpp berryICommandManagerListener.cpp berryIExecutionListener.cpp berryIExecutionListenerWithChecks.cpp berryIHandlerListener.cpp berryINamedHandleStateIds.cpp berryIParameterTypeListener.cpp berryIStateListener.cpp berryNamedHandleObjectWithState.cpp berryParameterization.cpp berryParameterizedCommand.cpp berryParameterType.cpp berryParameterTypeEvent.cpp berryState.cpp util/berryCommandTracing.cpp ) -SET(COMMON_CPP_FILES +set(COMMON_CPP_FILES berryAbstractBitSetEvent.cpp berryAbstractHandleObjectEvent.cpp berryAbstractNamedHandleEvent.cpp berryCommandExceptions.cpp berryHandleObject.cpp berryHandleObjectManager.cpp berryNamedHandleObject.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES berryCommandUtils.cpp berryPluginActivator.cpp ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${COMMON_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/common/${file}) + set(CPP_FILES ${CPP_FILES} src/common/${file}) endforeach(file ${COMMON_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.core.expressions/CMakeLists.txt index 74de52045d..d96a425db9 100644 --- a/BlueBerry/Bundles/org.blueberry.core.expressions/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.core.expressions/CMakeLists.txt @@ -1,4 +1,4 @@ -PROJECT(org_blueberry_core_expressions) +project(org_blueberry_core_expressions) MACRO_CREATE_CTK_PLUGIN(EXPORT_DIRECTIVE BERRY_EXPRESSIONS EXPORTED_INCLUDE_SUFFIXES src src/common) diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/files.cmake b/BlueBerry/Bundles/org.blueberry.core.expressions/files.cmake index 7fb364bff5..2439754773 100644 --- a/BlueBerry/Bundles/org.blueberry.core.expressions/files.cmake +++ b/BlueBerry/Bundles/org.blueberry.core.expressions/files.cmake @@ -1,53 +1,53 @@ -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/berryPluginActivator.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml ) -SET(SRC_CPP_FILES +set(SRC_CPP_FILES berryElementHandler.cpp berryEvaluationContext.cpp berryEvaluationResult.cpp berryExpression.cpp berryExpressionConverter.cpp berryExpressionInfo.cpp berryExpressionTagNames.cpp berryPropertyTester.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES berryAdaptExpression.cpp berryAndExpression.cpp berryCompositeExpression.cpp berryCountExpression.cpp berryDefaultVariable.cpp berryDefinitionRegistry.cpp berryEnablementExpression.cpp berryEqualsExpression.cpp berryExpressions.cpp berryInstanceofExpression.cpp berryIterateExpression.cpp berryNotExpression.cpp berryOrExpression.cpp berryPluginActivator.cpp berryProperty.cpp berryPropertyTesterDescriptor.cpp berryReferenceExpression.cpp berryResolveExpression.cpp berryStandardElementHandler.cpp berrySystemTestExpression.cpp berryTestExpression.cpp berryTypeExtension.cpp berryTypeExtensionManager.cpp berryWithExpression.cpp ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.core.jobs/CMakeLists.txt index 4f5be244be..6d3fac8e06 100644 --- a/BlueBerry/Bundles/org.blueberry.core.jobs/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.core.jobs/CMakeLists.txt @@ -1,5 +1,5 @@ -PROJECT(org_blueberry_core_jobs) +project(org_blueberry_core_jobs) MACRO_CREATE_CTK_PLUGIN(EXPORT_DIRECTIVE BERRY_JOBS EXPORTED_INCLUDE_SUFFIXES src) diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/files.cmake b/BlueBerry/Bundles/org.blueberry.core.jobs/files.cmake index 2f18be947d..a6c1433392 100644 --- a/BlueBerry/Bundles/org.blueberry.core.jobs/files.cmake +++ b/BlueBerry/Bundles/org.blueberry.core.jobs/files.cmake @@ -1,45 +1,45 @@ -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/berryPluginActivator.h ) -SET(SRC_CPP_FILES +set(SRC_CPP_FILES berryIJobChangeListener.cpp berryIJobManager.cpp berryJob.cpp berryJobExceptions.cpp berryJobStatus.cpp berryMultiRule.cpp berryNullProgressMonitor.cpp berryProgressProvider.cpp berryQualifiedName.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES berryInternalJob.cpp berryJobChangeEvent.cpp berryJobListeners.cpp berryJobManager.cpp berryJobQueue.cpp berryPluginActivator.cpp berryWorker.cpp berryWorkerPool.cpp ) -SET(H_FILES +set(H_FILES src/berryJobsDll.h src/berryLockListener.h src/berryISchedulingRule.h src/berryIProgressMonitor.h src/berryISchedulingRule.h src/berryILock.h ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.core.runtime/CMakeLists.txt index 919335d647..429c8c14f2 100644 --- a/BlueBerry/Bundles/org.blueberry.core.runtime/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.core.runtime/CMakeLists.txt @@ -1,5 +1,5 @@ -PROJECT(org_blueberry_core_runtime) +project(org_blueberry_core_runtime) MACRO_CREATE_CTK_PLUGIN(EXPORT_DIRECTIVE BERRY_RUNTIME EXPORTED_INCLUDE_SUFFIXES src) diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/files.cmake b/BlueBerry/Bundles/org.blueberry.core.runtime/files.cmake index 3698e6c548..74b176feee 100644 --- a/BlueBerry/Bundles/org.blueberry.core.runtime/files.cmake +++ b/BlueBerry/Bundles/org.blueberry.core.runtime/files.cmake @@ -1,31 +1,31 @@ -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/berryPluginActivator.h src/internal/berryPreferencesService.h ) -SET(SRC_CPP_FILES +set(SRC_CPP_FILES berryIAdaptable.cpp berryIAdapterManager.cpp berryIPreferencesService.cpp berryPlatformObject.cpp berryRuntime.cpp berryBackingStoreException.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES berryAbstractPreferencesStorage.cpp berryPluginActivator.cpp berryPreferences.cpp berryPreferencesService.cpp berryXMLPreferencesStorage.cpp ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/BlueBerry/Bundles/org.blueberry.osgi/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.osgi/CMakeLists.txt index 3d6783f0e6..cd259682dc 100644 --- a/BlueBerry/Bundles/org.blueberry.osgi/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.osgi/CMakeLists.txt @@ -1,37 +1,37 @@ -PROJECT(org_blueberry_osgi) +project(org_blueberry_osgi) MACRO_CREATE_CTK_PLUGIN( EXPORT_DIRECTIVE BERRY_OSGI EXPORTED_INCLUDE_SUFFIXES src src/application src/event src/service ) -ADD_EXECUTABLE(${OSGI_APP} MACOSX_BUNDLE "src/application/berryMain.cpp") +add_executable(${OSGI_APP} MACOSX_BUNDLE "src/application/berryMain.cpp") -TARGET_LINK_LIBRARIES(${OSGI_APP} ${PROJECT_NAME} mbilog) -IF (_ctk_test_plugins) - ADD_DEPENDENCIES(${OSGI_APP} ${_ctk_test_plugins}) - ADD_DEPENDENCIES(BlueBerry ${OSGI_APP}) - SET_PROPERTY(TARGET ${OSGI_APP} APPEND PROPERTY LABELS BlueBerry) -ENDIF() +target_link_libraries(${OSGI_APP} ${PROJECT_NAME} mbilog) +if(_ctk_test_plugins) + add_dependencies(${OSGI_APP} ${_ctk_test_plugins}) + add_dependencies(BlueBerry ${OSGI_APP}) + set_property(TARGET ${OSGI_APP} APPEND PROPERTY LABELS BlueBerry) +endif() -CONFIGURE_FILE(src/application/solstice.ini +configure_file(src/application/solstice.ini ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_APP}.ini) -ADD_EXECUTABLE(${OSGI_UI_APP} MACOSX_BUNDLE "src/application/berryMainUI.cpp") +add_executable(${OSGI_UI_APP} MACOSX_BUNDLE "src/application/berryMainUI.cpp") -TARGET_LINK_LIBRARIES(${OSGI_UI_APP} ${PROJECT_NAME} mbilog) -IF (_ctk_test_plugins) - ADD_DEPENDENCIES(${OSGI_UI_APP} ${_ctk_test_plugins}) - ADD_DEPENDENCIES(BlueBerry ${OSGI_UI_APP}) - SET_PROPERTY(TARGET ${OSGI_UI_APP} APPEND PROPERTY LABELS BlueBerry) -ENDIF() +target_link_libraries(${OSGI_UI_APP} ${PROJECT_NAME} mbilog) +if(_ctk_test_plugins) + add_dependencies(${OSGI_UI_APP} ${_ctk_test_plugins}) + add_dependencies(BlueBerry ${OSGI_UI_APP}) + set_property(TARGET ${OSGI_UI_APP} APPEND PROPERTY LABELS BlueBerry) +endif() -CONFIGURE_FILE(src/application/solstice.ini +configure_file(src/application/solstice.ini ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_UI_APP}.ini) -SET(BLUEBERRY_PLUGIN_CACHE_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/plugin_cache") +set(BLUEBERRY_PLUGIN_CACHE_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/plugin_cache") -CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/berryConfig.h.in" "${CMAKE_CURRENT_BINARY_DIR}/berryConfig.h" @ONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/berryConfig.h.in" "${CMAKE_CURRENT_BINARY_DIR}/berryConfig.h" @ONLY) diff --git a/BlueBerry/Bundles/org.blueberry.osgi/files.cmake b/BlueBerry/Bundles/org.blueberry.osgi/files.cmake index aac201affe..6ae49d09c9 100644 --- a/BlueBerry/Bundles/org.blueberry.osgi/files.cmake +++ b/BlueBerry/Bundles/org.blueberry.osgi/files.cmake @@ -1,78 +1,78 @@ # Files which should be processed by Qts moc -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/berryCTKPluginActivator.h src/internal/berryExtensionPointService.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml ) -SET(EVENT_CPP_FILES +set(EVENT_CPP_FILES berryBundleEvent.cpp berryPlatformEvent.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES berryBundle.cpp berryBundleContext.cpp berryBundleDirectory.cpp berryBundleManifest.cpp berryCodeCache.cpp berryCTKPluginActivator.cpp berryDefaultActivator.cpp berryConfigurationElement.cpp berryExtension.cpp berryExtensionPoint.cpp berryExtensionPointService.cpp berryInternalPlatform.cpp berryPlatformLogChannel.cpp berryProvisioningInfo.cpp berrySystemBundle.cpp berrySystemBundleActivator.cpp berrySystemBundleManifest.cpp ) -SET(SERVICE_CPP_FILES +set(SERVICE_CPP_FILES berryIExtensionPointService.cpp berryService.cpp berryServiceRegistry.cpp ) -SET(SRC_CPP_FILES +set(SRC_CPP_FILES berryDebugBreakpointManager.cpp berryException.cpp berryExtensionType.cpp berryIBundleManifest.cpp berryIDebugObjectListener.cpp berryBundleLoader.cpp berryDebugUtil.cpp berryObject.cpp berryObjects.cpp berryPlatform.cpp berryPlatformException.cpp berryPlugin.cpp berryStackTrace.cpp # application application/berryIApplication.cpp application/berryStarter.cpp ) -SET(CPP_FILES manifest.cpp) +set(CPP_FILES manifest.cpp) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${EVENT_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/event/${file}) + set(CPP_FILES ${CPP_FILES} src/event/${file}) endforeach(file ${EVENT_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) foreach(file ${SERVICE_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/service/${file}) + set(CPP_FILES ${CPP_FILES} src/service/${file}) endforeach(file ${SERVICE_CPP_FILES}) diff --git a/BlueBerry/Bundles/org.blueberry.osgi/target_libraries.cmake b/BlueBerry/Bundles/org.blueberry.osgi/target_libraries.cmake index a5987ba09b..b24576f07e 100644 --- a/BlueBerry/Bundles/org.blueberry.osgi/target_libraries.cmake +++ b/BlueBerry/Bundles/org.blueberry.osgi/target_libraries.cmake @@ -1,9 +1,9 @@ # See CMake/ctkFunctionGetTargetLibraries.cmake # # This file should list the libraries required to build the current CTK plugin. # For specifying required plugins, see the manifest_headers.cmake file. # -SET(target_libraries +set(target_libraries CTKPluginFramework ) diff --git a/BlueBerry/Bundles/org.blueberry.solstice.common/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.solstice.common/CMakeLists.txt index 137cfc97ae..3e09095c72 100644 --- a/BlueBerry/Bundles/org.blueberry.solstice.common/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.solstice.common/CMakeLists.txt @@ -1,4 +1,4 @@ -PROJECT(org_blueberry_solstice_common) +project(org_blueberry_solstice_common) MACRO_CREATE_CTK_PLUGIN(EXPORT_DIRECTIVE BERRY_COMMON_RUNTIME EXPORTED_INCLUDE_SUFFIXES src) diff --git a/BlueBerry/Bundles/org.blueberry.solstice.common/files.cmake b/BlueBerry/Bundles/org.blueberry.solstice.common/files.cmake index e70cef7384..eb18f975be 100644 --- a/BlueBerry/Bundles/org.blueberry.solstice.common/files.cmake +++ b/BlueBerry/Bundles/org.blueberry.solstice.common/files.cmake @@ -1,25 +1,25 @@ -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/berryPluginActivator.h ) -SET(SRC_CPP_FILES +set(SRC_CPP_FILES berryMultiStatus.cpp berrySafeRunner.cpp berrySolsticeExceptions.cpp berryStatus.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES berryIRuntimeConstants.cpp berryPluginActivator.cpp ) -#SET(CPP_FILES manifest.cpp) +#set(CPP_FILES manifest.cpp) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/BlueBerry/Bundles/org.blueberry.test/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.test/CMakeLists.txt index 06a0e46381..fa2813aea1 100644 --- a/BlueBerry/Bundles/org.blueberry.test/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.test/CMakeLists.txt @@ -1,8 +1,8 @@ -PROJECT(org_blueberry_test) +project(org_blueberry_test) MACRO_CREATE_CTK_PLUGIN( EXPORT_DIRECTIVE BERRY_TEST_EXPORT EXPORTED_INCLUDE_SUFFIXES src src/harness ) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} optimized CppUnit debug CppUnitd) +target_link_libraries(${PROJECT_NAME} optimized CppUnit debug CppUnitd) diff --git a/BlueBerry/Bundles/org.blueberry.test/files.cmake b/BlueBerry/Bundles/org.blueberry.test/files.cmake index d99a9c2825..7b276ba599 100644 --- a/BlueBerry/Bundles/org.blueberry.test/files.cmake +++ b/BlueBerry/Bundles/org.blueberry.test/files.cmake @@ -1,35 +1,35 @@ -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/berryPluginActivator.h src/berryCoreTestApplication.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml ) -SET(SRC_CPP_FILES +set(SRC_CPP_FILES berryCoreTestApplication.cpp berryBlueBerryTestDriver.cpp harness/berryTestCase.cpp util/berryCallHistory.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES berryPluginActivator.cpp berryTestDescriptor.cpp berryTestRegistry.cpp ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.help/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.ui.qt.help/CMakeLists.txt index cc50551d93..c410566d05 100644 --- a/BlueBerry/Bundles/org.blueberry.ui.qt.help/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.ui.qt.help/CMakeLists.txt @@ -1,13 +1,13 @@ -PROJECT(org_blueberry_ui_qt_help) +project(org_blueberry_ui_qt_help) -SET(QT_USE_QTHELP 1) -SET(QT_USE_QTWEBKIT 1) -SET(QT_USE_QTNETWORK 1) +set(QT_USE_QTHELP 1) +set(QT_USE_QTWEBKIT 1) +set(QT_USE_QTNETWORK 1) MACRO_CREATE_CTK_PLUGIN( EXPORT_DIRECTIVE org_blueberry_ui_qt_help_EXPORT EXPORTED_INCLUDE_SUFFIXES src ) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} +target_link_libraries(${PROJECT_NAME} ${QT_QTHELP_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${QT_QTNETWORK_LIBRARY}) diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.help/files.cmake b/BlueBerry/Bundles/org.blueberry.ui.qt.help/files.cmake index 1e5db2792d..33f24e608b 100644 --- a/BlueBerry/Bundles/org.blueberry.ui.qt.help/files.cmake +++ b/BlueBerry/Bundles/org.blueberry.ui.qt.help/files.cmake @@ -1,58 +1,58 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES berryHelpContentView.cpp berryHelpEditor.cpp berryHelpEditorFindWidget.cpp berryHelpEditorInput.cpp berryHelpIndexView.cpp berryHelpPerspective.cpp berryHelpPluginActivator.cpp berryHelpSearchView.cpp berryHelpTopicChooser.cpp berryHelpWebView.cpp berryQHelpEngineConfiguration.cpp berryQHelpEngineWrapper.cpp ) -SET(CPP_FILES ) +set(CPP_FILES ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/berryHelpContentView.h src/internal/berryHelpEditor.h src/internal/berryHelpEditorFindWidget.h src/internal/berryHelpIndexView.h src/internal/berryHelpPerspective.h src/internal/berryHelpPluginActivator.h src/internal/berryHelpSearchView.h src/internal/berryHelpTopicChooser.h src/internal/berryHelpWebView.h src/internal/berryQHelpEngineConfiguration.h src/internal/berryQHelpEngineWrapper.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml resources/help.png ) -SET(QRC_FILES +set(QRC_FILES resources/org_blueberry_ui_qt_help.qrc ) -SET(UI_FILES +set(UI_FILES src/internal/berryHelpTopicChooser.ui ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.help/target_libraries.cmake b/BlueBerry/Bundles/org.blueberry.ui.qt.help/target_libraries.cmake index 9412e38dde..d960ce8173 100644 --- a/BlueBerry/Bundles/org.blueberry.ui.qt.help/target_libraries.cmake +++ b/BlueBerry/Bundles/org.blueberry.ui.qt.help/target_libraries.cmake @@ -1,9 +1,9 @@ # See CMake/ctkFunctionGetTargetLibraries.cmake # # This file should list the libraries required to build the current CTK plugin. # For specifying required plugins, see the manifest_headers.cmake file. # -SET(target_libraries +set(target_libraries CTKWidgets ) diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.log/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.ui.qt.log/CMakeLists.txt index 65a94ecd4d..5abf908b70 100644 --- a/BlueBerry/Bundles/org.blueberry.ui.qt.log/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.ui.qt.log/CMakeLists.txt @@ -1,7 +1,7 @@ -PROJECT(org_blueberry_ui_qt_log) +project(org_blueberry_ui_qt_log) MACRO_CREATE_CTK_PLUGIN( EXPORT_DIRECTIVE org_blueberry_ui_qt_log_EXPORT EXPORTED_INCLUDE_SUFFIXES src ) diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.log/files.cmake b/BlueBerry/Bundles/org.blueberry.ui.qt.log/files.cmake index 37bc381a85..65fdf8c5d6 100644 --- a/BlueBerry/Bundles/org.blueberry.ui.qt.log/files.cmake +++ b/BlueBerry/Bundles/org.blueberry.ui.qt.log/files.cmake @@ -1,41 +1,41 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES berryLogView.cpp berryQtLogPlugin.cpp berryQtLogView.cpp berryQtPlatformLogModel.cpp ) -SET(CPP_FILES ) +set(CPP_FILES ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/berryLogView.h src/internal/berryQtLogPlugin.h src/internal/berryQtLogView.h src/internal/berryQtPlatformLogModel.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml resources/Logging.png ) -SET(QRC_FILES +set(QRC_FILES resources/org_blueberry_ui_qt_log.qrc ) -SET(UI_FILES +set(UI_FILES src/internal/berryQtLogView.ui ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/CMakeLists.txt index 765ae928c6..bed423a090 100644 --- a/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/CMakeLists.txt @@ -1,10 +1,10 @@ -PROJECT(org_blueberry_ui_qt_objectinspector) +project(org_blueberry_ui_qt_objectinspector) MACRO_CREATE_CTK_PLUGIN( EXPORT_DIRECTIVE BERRY_OBJECTINSPECTOR_EXPORT EXPORTED_INCLUDE_SUFFIXES src ) -IF(NOT BLUEBERRY_DEBUG_SMARTPOINTER) - MESSAGE("You should set BLUEBERRY_DEBUG_SMARTPOINTER to ON if you want the plug-in ${Plugin-SymbolicName} to be useful") -ENDIF() +if(NOT BLUEBERRY_DEBUG_SMARTPOINTER) + message("You should set BLUEBERRY_DEBUG_SMARTPOINTER to ON if you want the plug-in ${Plugin-SymbolicName} to be useful") +endif() diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/files.cmake b/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/files.cmake index 3d96b5a3c4..1c63d72a54 100644 --- a/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/files.cmake +++ b/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/files.cmake @@ -1,40 +1,40 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES berryObjectBrowserView.cpp berryObjectItem.cpp berryPluginActivator.cpp berryQtObjectTableModel.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/berryQtObjectBrowserView.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/berryObjectBrowserView.h src/internal/berryPluginActivator.h src/internal/berryQtObjectTableModel.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml resources/ObjectBrowser.png ) -SET(RES_FILES +set(RES_FILES resources/blueberry_ui_qt_objectinspector.qrc ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.ui.qt/CMakeLists.txt index 1fdd586264..dc02c6ff78 100644 --- a/BlueBerry/Bundles/org.blueberry.ui.qt/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.ui.qt/CMakeLists.txt @@ -1,5 +1,5 @@ -PROJECT(org_blueberry_ui_qt) +project(org_blueberry_ui_qt) MACRO_CREATE_CTK_PLUGIN(EXPORT_DIRECTIVE BERRY_UI_QT EXPORTED_INCLUDE_SUFFIXES src src/application) diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/files.cmake b/BlueBerry/Bundles/org.blueberry.ui.qt/files.cmake index 1b3e9007c2..8cfc15cbac 100644 --- a/BlueBerry/Bundles/org.blueberry.ui.qt/files.cmake +++ b/BlueBerry/Bundles/org.blueberry.ui.qt/files.cmake @@ -1,114 +1,114 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES berryIQtPreferencePage.cpp berryIQtStyleManager.cpp berryQCHPluginListener.cpp berryQtAssistantUtil.cpp berryQModelIndexObject.cpp berryQtEditorPart.cpp berryQtItemSelection.cpp berryQtIntroPart.cpp berryQtPreferences.cpp berryQtSelectionProvider.cpp berryQtViewPart.cpp # application application/berryQtWorkbenchAdvisor.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES defaultpresentation/berryEmptyTabFolder.cpp defaultpresentation/berryEmptyTabItem.cpp defaultpresentation/berryNativeTabFolder.cpp defaultpresentation/berryNativeTabItem.cpp defaultpresentation/berryQCTabBar.cpp defaultpresentation/berryQtWorkbenchPresentationFactory.cpp util/berryAbstractTabFolder.cpp util/berryLeftToRightTabOrder.cpp util/berryPartInfo.cpp util/berryPresentablePartFolder.cpp util/berryReplaceDragHandler.cpp util/berryTabbedStackPresentation.cpp util/berryTabFolderEvent.cpp berryQtDisplay.cpp berryQtDnDTweaklet.cpp berryQtFileImageDescriptor.cpp berryQtGlobalEventFilter.cpp berryQtIconImageDescriptor.cpp berryQtImageTweaklet.cpp berryQtMainWindowControl.cpp berryQtMessageDialogTweaklet.cpp berryQtMissingImageDescriptor.cpp berryQtOpenPerspectiveAction.cpp berryQtPerspectiveSwitcher.cpp berryQtPluginActivator.cpp berryQtSafeApplication.cpp berryQtSash.cpp berryQtShell.cpp berryQtShowViewAction.cpp berryQtShowViewDialog.cpp berryQtStyleManager.cpp berryQtStylePreferencePage.cpp berryQtTracker.cpp berryQtWidgetsTweaklet.cpp berryQtWidgetsTweakletImpl.cpp berryQtWorkbenchPageTweaklet.cpp berryQtWorkbenchTweaklet.cpp berryQtWorkbenchWindow.cpp ) -SET(MOC_H_FILES +set(MOC_H_FILES src/berryQCHPluginListener.h src/berryQtSelectionProvider.h src/internal/defaultpresentation/berryNativeTabFolder.h src/internal/defaultpresentation/berryNativeTabItem.h src/internal/defaultpresentation/berryQCTabBar.h src/internal/defaultpresentation/berryQtWorkbenchPresentationFactory.h src/internal/berryQtDisplay.h src/internal/berryQtDnDTweaklet.h src/internal/berryQtGlobalEventFilter.h src/internal/berryQtImageTweaklet.h src/internal/berryQtMainWindowControl.h src/internal/berryQtMessageDialogTweaklet.h src/internal/berryQtOpenPerspectiveAction.h src/internal/berryQtPerspectiveSwitcher.h src/internal/berryQtSash.h src/internal/berryQtShowViewAction.h src/internal/berryQtStyleManager.h src/internal/berryQtStylePreferencePage.h src/internal/berryQtTracker.h src/internal/berryQtWidgetsTweaklet.h src/internal/berryQtWidgetsTweakletImpl.h src/internal/berryQtWorkbenchTweaklet.h src/internal/berryQtWorkbenchPageTweaklet.h src/internal/berryQtPluginActivator.h ) -SET(UI_FILES +set(UI_FILES src/internal/berryQtShowViewDialog.ui src/internal/berryQtStylePreferencePage.ui src/internal/berryQtStatusPart.ui ) -SET(QRC_FILES +set(QRC_FILES resources/org_blueberry_ui_qt.qrc ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/BlueBerry/Bundles/org.blueberry.ui/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.ui/CMakeLists.txt index 86c97def53..99825e877d 100644 --- a/BlueBerry/Bundles/org.blueberry.ui/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.ui/CMakeLists.txt @@ -1,19 +1,19 @@ -PROJECT(org_blueberry_ui) +project(org_blueberry_ui) -SET(PLUGIN_exported_include_suffixes +set(PLUGIN_exported_include_suffixes src src/application src/commands src/dialogs src/guitk src/handlers src/intro src/presentations src/services src/testing src/tweaklets src/util ) MACRO_CREATE_CTK_PLUGIN(EXPORT_DIRECTIVE BERRY_UI EXPORTED_INCLUDE_SUFFIXES ${PLUGIN_exported_include_suffixes}) diff --git a/BlueBerry/Bundles/org.blueberry.ui/files.cmake b/BlueBerry/Bundles/org.blueberry.ui/files.cmake index 756f8586ea..b96e6039e1 100644 --- a/BlueBerry/Bundles/org.blueberry.ui/files.cmake +++ b/BlueBerry/Bundles/org.blueberry.ui/files.cmake @@ -1,235 +1,235 @@ -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/berryWorkbenchPlugin.h src/internal/intro/berryEditorIntroAdapterPart.h src/berryWorkbenchPart.h src/berryEditorPart.h src/berryViewPart.h src/intro/berryIntroPart.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml ) -SET(SRC_CPP_FILES +set(SRC_CPP_FILES berryAbstractSourceProvider.cpp berryAbstractUIPlugin.cpp berryAbstractUICTKPlugin.cpp berryConstants.cpp berryDisplay.cpp berryEditorPart.cpp berryFileEditorInput.cpp berryGeometry.cpp berryIDropTargetListener.cpp berryIEditorRegistry.cpp berryImageDescriptor.cpp berryIMemento.cpp berryIPageLayout.cpp berryIPartListener.cpp berryIPerspectiveListener.cpp berryIPropertyChangeListener.cpp berryISaveablePart.cpp berryISaveablesLifecycleListener.cpp berryISelectionChangedListener.cpp berryISelectionListener.cpp berryIShellListener.cpp berryISizeProvider.cpp berryISourceProviderListener.cpp berryISources.cpp berryIStructuredSelection.cpp berryIWindowListener.cpp berryIWorkbenchListener.cpp berryIWorkbenchPage.cpp berryIWorkbenchPartConstants.cpp berryPlatformUI.cpp berryPoint.cpp berryPropertyChangeEvent.cpp berryRectangle.cpp berrySameShellProvider.cpp berrySaveable.cpp berrySaveablesLifecycleEvent.cpp berrySelectionChangedEvent.cpp berryShell.cpp berryShellEvent.cpp berryUIException.cpp berryViewPart.cpp berryWindow.cpp berryWorkbenchPart.cpp berryWorkbenchPreferenceConstants.cpp berryXMLMemento.cpp #application application/berryActionBarAdvisor.cpp application/berryWorkbenchAdvisor.cpp application/berryWorkbenchWindowAdvisor.cpp #commands #commands/berryAbstractContributionFactory.cpp #commands/berryCommandContributionItem.cpp #commands/berryCommandContributionItemParameter.cpp #commands/berryContributionItem.cpp #commands/berryContributionManager.cpp #commands/berryICommandImageService.cpp #commands/berryICommandService.cpp #commands/berryIContributionManagerOverrides.cpp #commands/berryIMenuItem.cpp #commands/berryIMenuItemListener.cpp #commands/berryIMenuListener.cpp #commands/berryIToolItemListener.cpp #commands/berryIUIElementListener.cpp #commands/berryMenuManager.cpp #commands/berrySubContributionItem.cpp #commands/berryUIElement.cpp #dialogs dialogs/berryIDialog.cpp dialogs/berryMessageDialog.cpp #guitk guitk/berryGuiTkControlEvent.cpp guitk/berryGuiTkEvent.cpp guitk/berryGuiTkIControlListener.cpp guitk/berryGuiTkIMenuListener.cpp guitk/berryGuiTkISelectionListener.cpp guitk/berryGuiTkSelectionEvent.cpp #handlers handlers/berryHandlerUtil.cpp handlers/berryIHandlerActivation.cpp handlers/berryShowViewHandler.cpp #src intro/berryIntroPart.cpp #tweaklets tweaklets/berryDnDTweaklet.cpp tweaklets/berryGuiWidgetsTweaklet.cpp tweaklets/berryImageTweaklet.cpp tweaklets/berryMessageDialogTweaklet.cpp tweaklets/berryWorkbenchPageTweaklet.cpp tweaklets/berryWorkbenchTweaklet.cpp #presentations presentations/berryIPresentablePart.cpp presentations/berryIPresentationFactory.cpp presentations/berryIStackPresentationSite.cpp presentations/berryStackDropResult.cpp presentations/berryStackPresentation.cpp #testing testing/berryTestableObject.cpp #util util/berrySafeRunnable.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES #intro intro/berryEditorIntroAdapterPart.cpp intro/berryIntroConstants.cpp intro/berryIntroDescriptor.cpp intro/berryIntroPartAdapterSite.cpp intro/berryIntroRegistry.cpp intro/berryViewIntroAdapterPart.cpp intro/berryWorkbenchIntroManager.cpp berryAbstractPartSelectionTracker.cpp berryAbstractSelectionService.cpp berryBundleUtility.cpp berryContainerPlaceholder.cpp berryDetachedPlaceHolder.cpp berryDefaultSaveable.cpp berryDefaultStackPresentationSite.cpp berryDetachedWindow.cpp berryDragUtil.cpp berryEditorAreaHelper.cpp berryEditorDescriptor.cpp berryEditorManager.cpp berryEditorReference.cpp berryEditorRegistry.cpp berryEditorRegistryReader.cpp berryEditorSashContainer.cpp berryEditorSite.cpp berryErrorViewPart.cpp berryFileEditorMapping.cpp berryFolderLayout.cpp berryIDragOverListener.cpp berryLayoutHelper.cpp berryLayoutPart.cpp berryLayoutPartSash.cpp berryLayoutTree.cpp berryLayoutTreeNode.cpp berryNullEditorInput.cpp berryPageLayout.cpp berryPagePartSelectionTracker.cpp berryPageSelectionService.cpp berryPartList.cpp berryPartPane.cpp berryPartPlaceholder.cpp berryPartSashContainer.cpp berryPartService.cpp berryPartSite.cpp berryPartStack.cpp berryPartTester.cpp berryPerspective.cpp berryPerspectiveDescriptor.cpp berryPerspectiveExtensionReader.cpp berryPerspectiveHelper.cpp berryPerspectiveRegistry.cpp berryPerspectiveRegistryReader.cpp berryPlaceholderFolderLayout.cpp berryPreferenceConstants.cpp berryPresentablePart.cpp berryPresentationFactoryUtil.cpp berryPresentationSerializer.cpp berryQtControlWidget.cpp berryQtDnDControlWidget.cpp berryQtWidgetController.cpp berryRegistryReader.cpp berrySaveablesList.cpp berryServiceLocator.cpp berryServiceLocatorCreator.cpp berryShellPool.cpp berrySourcePriorityNameMapping.cpp berryStackablePart.cpp berryStickyViewDescriptor.cpp berryStickyViewManager.cpp berryTweaklets.cpp berryViewDescriptor.cpp berryViewFactory.cpp berryViewLayout.cpp berryViewReference.cpp berryViewRegistry.cpp berryViewRegistryReader.cpp berryViewSashContainer.cpp berryViewSite.cpp berryWorkbenchPage.cpp berryWindowManager.cpp berryWindowPartSelectionTracker.cpp berryWindowSelectionService.cpp berryWorkbench.cpp berryWorkbenchConfigurer.cpp berryWorkbenchConstants.cpp berryWorkbenchPagePartList.cpp berryWorkbenchPartReference.cpp berryWorkbenchPlugin.cpp berryWorkbenchRegistryConstants.cpp berryWorkbenchServiceRegistry.cpp berryWorkbenchTestable.cpp berryWorkbenchWindow.cpp berryWorkbenchWindowConfigurer.cpp berryWWinPartService.cpp ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/BlueBerry/Bundles/org.blueberry.uitest/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.uitest/CMakeLists.txt index df82b0aca5..aa85a84802 100644 --- a/BlueBerry/Bundles/org.blueberry.uitest/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.uitest/CMakeLists.txt @@ -1,8 +1,8 @@ -PROJECT(org_blueberry_uitest) +project(org_blueberry_uitest) MACRO_CREATE_CTK_PLUGIN( EXPORT_DIRECTIVE BERRY_UITEST_EXPORT EXPORTED_INCLUDE_SUFFIXES src src/harness src/util ) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} optimized CppUnit debug CppUnitd) +target_link_libraries(${PROJECT_NAME} optimized CppUnit debug CppUnitd) diff --git a/BlueBerry/Bundles/org.blueberry.uitest/files.cmake b/BlueBerry/Bundles/org.blueberry.uitest/files.cmake index 35649c3157..b4a1efc460 100644 --- a/BlueBerry/Bundles/org.blueberry.uitest/files.cmake +++ b/BlueBerry/Bundles/org.blueberry.uitest/files.cmake @@ -1,35 +1,35 @@ -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/berryPluginActivator.h src/util/berryEmptyPerspective.h src/berryUITestApplication.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml ) -SET(SRC_CPP_FILES +set(SRC_CPP_FILES berryUITestApplication.cpp harness/berryUITestCase.cpp util/berryEmptyPerspective.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES berryPluginActivator.cpp berryUITestWorkbenchAdvisor.cpp berryUITestWorkbenchWindowAdvisor.cpp ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/BlueBerry/CMake/FindAnt.cmake b/BlueBerry/CMake/FindAnt.cmake index 6d5ace11af..4371066164 100644 --- a/BlueBerry/CMake/FindAnt.cmake +++ b/BlueBerry/CMake/FindAnt.cmake @@ -1,16 +1,16 @@ # - Find Ant (a java build tool) # This module defines # ANT_VERSION version string of ant if found # ANT_FOUND, If false, do not try to use ant -EXEC_PROGRAM(ant ARGS -version OUTPUT_VARIABLE ANT_VERSION +exec_program(ant ARGS -version OUTPUT_VARIABLE ANT_VERSION RETURN_VALUE ANT_RETURN) -IF (ANT_RETURN STREQUAL "0") - SET(ANT_FOUND TRUE) - IF (NOT ANT_FIND_QUIETLY) - MESSAGE(STATUS "Found Ant: ${ANT_VERSION}") - ENDIF (NOT ANT_FIND_QUIETLY) -ELSE(ANT_RETURN STREQUAL "0") - SET(ANT_FOUND FALSE) -ENDIF (ANT_RETURN STREQUAL "0") \ No newline at end of file +if(ANT_RETURN STREQUAL "0") + set(ANT_FOUND TRUE) + if(NOT ANT_FIND_QUIETLY) + message(STATUS "Found Ant: ${ANT_VERSION}") + endif(NOT ANT_FIND_QUIETLY) +else(ANT_RETURN STREQUAL "0") + set(ANT_FOUND FALSE) +endif(ANT_RETURN STREQUAL "0") \ No newline at end of file diff --git a/BlueBerry/CMake/FindEclipse.cmake b/BlueBerry/CMake/FindEclipse.cmake index b65942a15d..b0cc8ba1cf 100755 --- a/BlueBerry/CMake/FindEclipse.cmake +++ b/BlueBerry/CMake/FindEclipse.cmake @@ -1,28 +1,28 @@ # - Find Eclipse # The following variables are set if Eclipse is found. # # Eclipse_DIR - the path to the Eclipse base directory. -IF(WIN32) - SET(_eclipse_dir_search +if(WIN32) + set(_eclipse_dir_search "C:/Eclipse" "D:/Eclipse" "C:/Program Files/Eclipse" "C:/Programme/Eclipse" "D:/Program Files/Eclipse" "D:/Programme/Eclipse" ) -ENDIF(WIN32) +endif(WIN32) # # Look for an installation. # -FIND_PATH(Eclipse_DIR eclipse PATHS +find_path(Eclipse_DIR eclipse PATHS # Look in other places. ${_eclipse_dir_search} # Help the user find it if we cannot. DOC "The base directory of your Eclipse installation" ) diff --git a/BlueBerry/CMake/FindPoco.cmake b/BlueBerry/CMake/FindPoco.cmake index df9f4a3399..71fd553990 100644 --- a/BlueBerry/CMake/FindPoco.cmake +++ b/BlueBerry/CMake/FindPoco.cmake @@ -1,155 +1,155 @@ # - Find the Poco includes and libraries. # The following variables are set if Poco is found. If Poco is not # found, Poco_FOUND is set to false. # Poco_FOUND - True when the Poco include directory is found. # Poco_INCLUDE_DIRS - the path to where the poco include files are. # Poco_LIBRARY_DIRS - The path to where the poco library files are. # Poco_BINARY_DIRS - The path to where the poco dlls are. # ---------------------------------------------------------------------------- # If you have installed Poco in a non-standard location. # Then you have three options. # In the following comments, it is assumed that # points to the root directory of the include directory of Poco. e.g # If you have put poco in C:\development\Poco then is # "C:/development/Poco" and in this directory there will be two # directories called "include" and "lib". # 1) After CMake runs, set Poco_INCLUDE_DIR to /poco<-version> -# 2) Use CMAKE_INCLUDE_PATH to set a path to /poco<-version>. This will allow FIND_PATH() +# 2) Use CMAKE_INCLUDE_PATH to set a path to /poco<-version>. This will allow find_path() # to locate Poco_INCLUDE_DIR by utilizing the PATH_SUFFIXES option. e.g. -# SET(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "/include") +# set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "/include") # 3) Set an environment variable called ${POCO_ROOT} that points to the root of where you have # installed Poco, e.g. . It is assumed that there is at least a subdirectory called # Foundation/include/Poco in this path. # # Note: # 1) If you are just using the poco headers, then you do not need to use # Poco_LIBRARY_DIR in your CMakeLists.txt file. # 2) If Poco has not been installed, then when setting Poco_LIBRARY_DIR # the script will look for /lib first and, if this fails, then for /stage/lib. # # Usage: # In your CMakeLists.txt file do something like this: # ... # # Poco -# FIND_PACKAGE(Poco) +# find_package(Poco) # ... -# INCLUDE_DIRECTORIES(${Poco_INCLUDE_DIRS}) -# LINK_DIRECTORIES(${Poco_LIBRARY_DIR}) +# include_directories(${Poco_INCLUDE_DIRS}) +# link_directories(${Poco_LIBRARY_DIR}) # # In Windows, we make the assumption that, if the Poco files are installed, the default directory # will be C:\poco or C:\Program Files\Poco or C:\Programme\Poco. -SET(POCO_INCLUDE_PATH_DESCRIPTION "top-level directory containing the poco include directories. E.g /usr/local/include/ or c:\\poco\\include\\poco-1.3.2") -SET(POCO_INCLUDE_DIR_MESSAGE "Set the Poco_INCLUDE_DIR cmake cache entry to the ${POCO_INCLUDE_PATH_DESCRIPTION}") -SET(POCO_LIBRARY_PATH_DESCRIPTION "top-level directory containing the poco libraries.") -SET(POCO_LIBRARY_DIR_MESSAGE "Set the Poco_LIBRARY_DIR cmake cache entry to the ${POCO_LIBRARY_PATH_DESCRIPTION}") +set(POCO_INCLUDE_PATH_DESCRIPTION "top-level directory containing the poco include directories. E.g /usr/local/include/ or c:\\poco\\include\\poco-1.3.2") +set(POCO_INCLUDE_DIR_MESSAGE "Set the Poco_INCLUDE_DIR cmake cache entry to the ${POCO_INCLUDE_PATH_DESCRIPTION}") +set(POCO_LIBRARY_PATH_DESCRIPTION "top-level directory containing the poco libraries.") +set(POCO_LIBRARY_DIR_MESSAGE "Set the Poco_LIBRARY_DIR cmake cache entry to the ${POCO_LIBRARY_PATH_DESCRIPTION}") -SET(POCO_DIR_SEARCH $ENV{POCO_ROOT}) -IF(POCO_DIR_SEARCH) - FILE(TO_CMAKE_PATH ${POCO_DIR_SEARCH} POCO_DIR_SEARCH) -ENDIF(POCO_DIR_SEARCH) +set(POCO_DIR_SEARCH $ENV{POCO_ROOT}) +if(POCO_DIR_SEARCH) + file(TO_CMAKE_PATH ${POCO_DIR_SEARCH} POCO_DIR_SEARCH) +endif(POCO_DIR_SEARCH) -IF(WIN32) - SET(POCO_DIR_SEARCH +if(WIN32) + set(POCO_DIR_SEARCH ${POCO_DIR_SEARCH} C:/poco D:/poco "C:/Program Files/poco" "C:/Programme/poco" "D:/Program Files/poco" "D:/Programme/poco" ) -ENDIF(WIN32) +endif(WIN32) # Add in some path suffixes. These will have to be updated whenever a new Poco version comes out. -SET(SUFFIX_FOR_INCLUDE_PATH +set(SUFFIX_FOR_INCLUDE_PATH poco-1.3.2 ) -SET(SUFFIX_FOR_LIBRARY_PATH +set(SUFFIX_FOR_LIBRARY_PATH poco-1.3.2/lib poco-1.3.2/lib/Linux/i686 poco-1.3.2/lib/Linux/x86_64 lib lib/Linux/i686 lib/Linux/x86_64 ) # # Look for an installation. # -FIND_PATH(Poco_INCLUDE_DIR NAMES Foundation/include/Poco/AbstractCache.h PATH_SUFFIXES ${SUFFIX_FOR_INCLUDE_PATH} PATHS +find_path(Poco_INCLUDE_DIR NAMES Foundation/include/Poco/AbstractCache.h PATH_SUFFIXES ${SUFFIX_FOR_INCLUDE_PATH} PATHS # Look in other places. ${POCO_DIR_SEARCH} # Help the user find it if we cannot. DOC "The ${POCO_INCLUDE_PATH_DESCRIPTION}" ) -IF(NOT Poco_INCLUDE_DIR) +if(NOT Poco_INCLUDE_DIR) # Look for standard unix include paths - FIND_PATH(Poco_INCLUDE_DIR Poco/Poco.h DOC "The ${POCO_INCLUDE_PATH_DESCRIPTION}") + find_path(Poco_INCLUDE_DIR Poco/Poco.h DOC "The ${POCO_INCLUDE_PATH_DESCRIPTION}") -ENDIF(NOT Poco_INCLUDE_DIR) +endif(NOT Poco_INCLUDE_DIR) # Assume we didn't find it. -SET(Poco_FOUND 0) +set(Poco_FOUND 0) # Now try to get the include and library path. -IF(Poco_INCLUDE_DIR) - IF(EXISTS "${Poco_INCLUDE_DIR}/Foundation") - SET(Poco_INCLUDE_DIRS +if(Poco_INCLUDE_DIR) + if(EXISTS "${Poco_INCLUDE_DIR}/Foundation") + set(Poco_INCLUDE_DIRS ${Poco_INCLUDE_DIR}/CppUnit/include ${Poco_INCLUDE_DIR}/Foundation/include ${Poco_INCLUDE_DIR}/Net/include ${Poco_INCLUDE_DIR}/Util/include ${Poco_INCLUDE_DIR}/XML/include ${Poco_INCLUDE_DIR}/Zip/include ) - SET(Poco_FOUND 1) - ELSEIF(EXISTS "${Poco_INCLUDE_DIR}/Poco/Poco.h") - SET(Poco_INCLUDE_DIRS + set(Poco_FOUND 1) + elseif(EXISTS "${Poco_INCLUDE_DIR}/Poco/Poco.h") + set(Poco_INCLUDE_DIRS ${Poco_INCLUDE_DIR} ) - SET(Poco_FOUND 1) - ENDIF(EXISTS "${Poco_INCLUDE_DIR}/Foundation") + set(Poco_FOUND 1) + endif(EXISTS "${Poco_INCLUDE_DIR}/Foundation") - IF(NOT Poco_LIBRARY_DIR) - FIND_LIBRARY(Poco_FOUNDATION_LIB NAMES PocoFoundation PocoFoundationd PATH_SUFFIXES ${SUFFIX_FOR_LIBRARY_PATH} PATHS + if(NOT Poco_LIBRARY_DIR) + find_library(Poco_FOUNDATION_LIB NAMES PocoFoundation PocoFoundationd PATH_SUFFIXES ${SUFFIX_FOR_LIBRARY_PATH} PATHS # Look in other places. ${Poco_INCLUDE_DIR} ${POCO_DIR_SEARCH} # Help the user find it if we cannot. DOC "The ${POCO_LIBRARY_PATH_DESCRIPTION}" ) - SET(Poco_LIBRARY_DIR "" CACHE PATH POCO_LIBARARY_PATH_DESCRIPTION) - GET_FILENAME_COMPONENT(Poco_LIBRARY_DIR ${Poco_FOUNDATION_LIB} PATH) - IF(Poco_LIBRARY_DIR) + set(Poco_LIBRARY_DIR "" CACHE PATH POCO_LIBARARY_PATH_DESCRIPTION) + get_filename_component(Poco_LIBRARY_DIR ${Poco_FOUNDATION_LIB} PATH) + if(Poco_LIBRARY_DIR) # Look for the poco binary path. - SET(Poco_BINARY_DIR ${Poco_INCLUDE_DIR}) - IF(Poco_BINARY_DIR AND EXISTS "${Poco_BINARY_DIR}/bin") - SET(Poco_BINARY_DIRS ${Poco_BINARY_DIR}/bin) - ENDIF(Poco_BINARY_DIR AND EXISTS "${Poco_BINARY_DIR}/bin") - ENDIF(Poco_LIBRARY_DIR) - - ENDIF(NOT Poco_LIBRARY_DIR) - -ENDIF(Poco_INCLUDE_DIR) - -IF(NOT Poco_FOUND) - IF(Poco_FIND_QUIETLY) - MESSAGE(STATUS "Poco was not found. ${POCO_INCLUDE_DIR_MESSAGE}") - ELSE(Poco_FIND_QUIETLY) - IF(Poco_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Poco was not found. ${POCO_INCLUDE_DIR_MESSAGE}") - ENDIF(Poco_FIND_REQUIRED) - ENDIF(Poco_FIND_QUIETLY) -ENDIF(NOT Poco_FOUND) + set(Poco_BINARY_DIR ${Poco_INCLUDE_DIR}) + if(Poco_BINARY_DIR AND EXISTS "${Poco_BINARY_DIR}/bin") + set(Poco_BINARY_DIRS ${Poco_BINARY_DIR}/bin) + endif(Poco_BINARY_DIR AND EXISTS "${Poco_BINARY_DIR}/bin") + endif(Poco_LIBRARY_DIR) + + endif(NOT Poco_LIBRARY_DIR) + +endif(Poco_INCLUDE_DIR) + +if(NOT Poco_FOUND) + if(Poco_FIND_QUIETLY) + message(STATUS "Poco was not found. ${POCO_INCLUDE_DIR_MESSAGE}") + else(Poco_FIND_QUIETLY) + if(Poco_FIND_REQUIRED) + message(FATAL_ERROR "Poco was not found. ${POCO_INCLUDE_DIR_MESSAGE}") + endif(Poco_FIND_REQUIRED) + endif(Poco_FIND_QUIETLY) +endif(NOT Poco_FOUND) diff --git a/BlueBerry/CMake/FunctionCreateBlueBerryApplication.cmake b/BlueBerry/CMake/FunctionCreateBlueBerryApplication.cmake index e66a007a81..8759656417 100644 --- a/BlueBerry/CMake/FunctionCreateBlueBerryApplication.cmake +++ b/BlueBerry/CMake/FunctionCreateBlueBerryApplication.cmake @@ -1,167 +1,167 @@ #! #! Create a BlueBerry application. #! #! \brif This function will create a BlueBerry application together with all #! necessary provisioning and configuration data and install support. #! #! \param NAME (required) The name of the executable. #! \param DESCRIPTION (optional) A human-readable description of your application. #! The usage depends on the CPack generator (on Windows, this is a descriptive #! text for the created shortcuts). #! \param SOURCES (optional) A list of source files to compile into your executable. Defaults #! to .cpp. #! \param PLUGINS (optional) A list of required plug-ins. Defaults to all known plug-ins. #! \param EXCLUDE_PLUGINS (optional) A list of plug-ins which should not be used. Mainly #! useful if PLUGINS was not used. #! \param LINK_LIBRARIES A list of libraries to be linked with the executable. #! \param SHOW_CONSOLE (option) Show the console output window (on Windows). #! \param NO_PROVISIONING (option) Do not create provisioning files. #! #! Assuming that there exists a file called MyApp.cpp, an example call looks like: #! \code #! FunctionCreateBlueBerryApplication( #! NAME MyApp #! DESCRIPTION "MyApp - New ways to explore medical data" #! EXCLUDE_PLUGINS org.mitk.gui.qt.extapplication #! SHOW_CONSOLE #! ) #! \endcode #! function(FunctionCreateBlueBerryApplication) macro_parse_arguments(_APP "NAME;DESCRIPTION;SOURCES;PLUGINS;EXCLUDE_PLUGINS;LINK_LIBRARIES" "SHOW_CONSOLE;NO_PROVISIONING" ${ARGN}) if(NOT _APP_NAME) message(FATAL_ERROR "NAME argument cannot be empty.") endif() if(NOT _APP_SOURCES) set(_APP_SOURCES ${_APP_NAME}.cpp) endif() if(NOT _APP_PLUGINS) ctkFunctionGetAllPluginTargets(_APP_PLUGINS) else() set(_plugins ${_APP_PLUGINS}) set(_APP_PLUGINS) foreach(_plugin ${_plugins}) string(REPLACE "." "_" _plugin_target ${_plugin}) list(APPEND _APP_PLUGINS ${_plugin_target}) endforeach() # get all plug-in dependencies ctkFunctionGetPluginDependencies(_plugin_deps PLUGINS ${_APP_PLUGINS} ALL) # add the dependencies to the list of application plug-ins - list (APPEND _APP_PLUGINS ${_plugin_deps}) + list(APPEND _APP_PLUGINS ${_plugin_deps}) endif() #------------------------------------------------------------------------ # Prerequesites #------------------------------------------------------------------------ find_package(MITK REQUIRED) # ----------------------------------------------------------------------- # Set up include and link dirs for the executable # ----------------------------------------------------------------------- include(${QT_USE_FILE}) include_directories( ${org_blueberry_osgi_INCLUDE_DIRS} ${Poco_INCLUDE_DIRS} ${mbilog_INCLUDE_DIRS} ) link_directories(${MITK_LINK_DIRECTORIES}) # ----------------------------------------------------------------------- # Create the executable and link libraries # ----------------------------------------------------------------------- if(_APP_SHOW_CONSOLE) add_executable(${_APP_NAME} MACOSX_BUNDLE ${_APP_SOURCES}) else() add_executable(${_APP_NAME} MACOSX_BUNDLE WIN32 ${_APP_SOURCES}) endif() target_link_libraries(${_APP_NAME} org_blueberry_osgi ${_APP_LINK_LIBRARIES}) if(WIN32) target_link_libraries(${_APP_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTMAIN_LIBRARY}) endif() # ----------------------------------------------------------------------- # Set build time dependencies # ----------------------------------------------------------------------- # This ensures that all enabled plug-ins are up-to-date when the # executable is build. if(_APP_PLUGINS) ctkMacroGetAllProjectTargetLibraries("${_APP_PLUGINS}" _project_plugins) if(_APP_EXCLUDE_PLUGINS) set(_exclude_targets) foreach(_exclude_plugin ${_APP_EXCLUDE_PLUGINS}) string(REPLACE "." "_" _exclude_target ${_exclude_plugin}) list(APPEND _exclude_targets ${_exclude_target}) endforeach() list(REMOVE_ITEM _project_plugins ${_exclude_targets}) endif() if(_project_plugins) add_dependencies(${_APP_NAME} ${_project_plugins}) endif() endif() # ----------------------------------------------------------------------- # Additional files needed for the executable # ----------------------------------------------------------------------- if(NOT _APP_NO_PROVISIONING) # Create a provisioning file, listing all plug-ins set(_prov_file "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_APP_NAME}.provisioning") FunctionCreateProvisioningFile(FILE ${_prov_file} PLUGINS ${_APP_PLUGINS} EXCLUDE_PLUGINS ${_APP_EXCLUDE_PLUGINS} ) endif() # Create a .ini file for initial parameters if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${_APP_NAME}.ini") configure_file(${_APP_NAME}.ini ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_APP_NAME}.ini) endif() # Create batch files for Windows platforms if(WIN32) foreach(BUILD_TYPE debug release) mitkFunctionCreateWindowsBatchScript(start${_APP_NAME}.bat.in ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/start${_APP_NAME}_${BUILD_TYPE}.bat ${BUILD_TYPE}) endforeach() endif(WIN32) # ----------------------------------------------------------------------- # Install support # ----------------------------------------------------------------------- # This installs all third-party CTK plug-ins FunctionInstallThirdPartyCTKPlugins(${_APP_PLUGINS} EXCLUDE ${_APP_EXCLUDE_PLUGINS}) # Install the executable MITK_INSTALL_TARGETS(EXECUTABLES ${_APP_NAME} GLOB_PLUGINS ) if(NOT _APP_NO_PROVISIONING) # Install the provisioning file mitkFunctionInstallProvisioningFiles(${_prov_file}) endif() # On Linux, create a shell script to start a relocatable application if(UNIX AND NOT APPLE) install(PROGRAMS "${MITK_SOURCE_DIR}/CMake/RunInstalledApp.sh" DESTINATION "." RENAME ${_APP_NAME}.sh) endif() # Tell cpack the executables that you want in the start menu as links set(MITK_CPACK_PACKAGE_EXECUTABLES ${MITK_CPACK_PACKAGE_EXECUTABLES} "${_APP_NAME};${_APP_DESCRIPTION}" CACHE INTERNAL "Collecting windows shortcuts to executables") endfunction() diff --git a/BlueBerry/CMake/MacroConvertSchema.cmake b/BlueBerry/CMake/MacroConvertSchema.cmake index 9bee098909..e23bea67ab 100644 --- a/BlueBerry/CMake/MacroConvertSchema.cmake +++ b/BlueBerry/CMake/MacroConvertSchema.cmake @@ -1,33 +1,33 @@ # MACRO_CONVERT_SCHEMA(INPUT plugin.xml ... # OUTPUT_DIR output_dir # TARGET_NAME target_name # [DEPENDS depends] # [WORKING_DIR working_dir] # ) -MACRO(MACRO_CONVERT_SCHEMA) +macro(MACRO_CONVERT_SCHEMA) MACRO_PARSE_ARGUMENTS(_SCHEMA "INPUT;OUTPUT_DIR;TARGET_NAME;DEPENDS;WORKING_DIR" "" ${ARGN}) -SET(XP_ANT_TASKS) -FOREACH(_file ${_SCHEMA_INPUT}) - SET(XP_ANT_TASKS "${XP_ANT_TASKS} +set(XP_ANT_TASKS) +foreach(_file ${_SCHEMA_INPUT}) + set(XP_ANT_TASKS "${XP_ANT_TASKS} ") -ENDFOREACH(_file ${_SCHEMA_INPUT}) +endforeach(_file ${_SCHEMA_INPUT}) -SET(XP_DOC_DESTINATION "${_SCHEMA_OUTPUT_DIR}") +set(XP_DOC_DESTINATION "${_SCHEMA_OUTPUT_DIR}") -IF(NOT _SCHEMA_WORKING_DIR) - SET(_SCHEMA_WORKING_DIR ${CMAKE_CURRENT_BINARY_DIR}) -ENDIF(NOT _SCHEMA_WORKING_DIR) +if(NOT _SCHEMA_WORKING_DIR) + set(_SCHEMA_WORKING_DIR ${CMAKE_CURRENT_BINARY_DIR}) +endif(NOT _SCHEMA_WORKING_DIR) -CONFIGURE_FILE("${BLUEBERRY_SOURCE_DIR}/Build/ConvertSchemaToHTML/buildExtPointDoc.xml.in" +configure_file("${BLUEBERRY_SOURCE_DIR}/Build/ConvertSchemaToHTML/buildExtPointDoc.xml.in" "${_SCHEMA_WORKING_DIR}/buildExtPointDoc.xml" @ONLY) -ADD_CUSTOM_TARGET(${_SCHEMA_TARGET_NAME} +add_custom_target(${_SCHEMA_TARGET_NAME} ant -f ${_SCHEMA_WORKING_DIR}/buildExtPointDoc.xml DEPENDS ${_SCHEMA_DEPENDS} WORKING_DIRECTORY ${_SCHEMA_WORKING_DIR} VERBATIM) -ENDMACRO(MACRO_CONVERT_SCHEMA) \ No newline at end of file +endmacro(MACRO_CONVERT_SCHEMA) \ No newline at end of file diff --git a/BlueBerry/CMake/MacroCreateCTKPlugin.cmake b/BlueBerry/CMake/MacroCreateCTKPlugin.cmake index 81f09dd1fd..98751acb3f 100644 --- a/BlueBerry/CMake/MacroCreateCTKPlugin.cmake +++ b/BlueBerry/CMake/MacroCreateCTKPlugin.cmake @@ -1,150 +1,150 @@ #! \brief Creates a CTK plugin. #! #! This macro should be called from the plugins CMakeLists.txt file. #! The target name is available after the macro call as ${PLUGIN_TARGET} #! to add additional libraries in your CMakeLists.txt. Include paths and link #! libraries are set depending on the value of the Required-Plugins header #! in your manifest_headers.cmake file. #! #! This macro internally calls ctkMacroBuildPlugin() and adds support #! for Qt Help files and installers. #! #! \param EXPORT_DIRECTIVE (required) The export directive to use in the generated #! _Exports.h file. #! \param EXPORTED_INCLUDE_SUFFIXES (optional) a list of sub-directories which should #! be added to the current source directory. The resulting directories #! will be available in the set of include directories of depending plug-ins. #! \param TEST_PLUGIN (option) Mark this plug-in as a testing plug-in. -MACRO(MACRO_CREATE_CTK_PLUGIN) +macro(MACRO_CREATE_CTK_PLUGIN) MACRO_PARSE_ARGUMENTS(_PLUGIN "EXPORT_DIRECTIVE;EXPORTED_INCLUDE_SUFFIXES" "TEST_PLUGIN;NO_QHP_TRANSFORM" ${ARGN}) - MESSAGE(STATUS "Creating CTK plugin ${PROJECT_NAME}") + message(STATUS "Creating CTK plugin ${PROJECT_NAME}") - SET(PLUGIN_TARGET ${PROJECT_NAME}) + set(PLUGIN_TARGET ${PROJECT_NAME}) - INCLUDE(files.cmake) + include(files.cmake) - SET(_PLUGIN_CPP_FILES ${CPP_FILES}) - SET(_PLUGIN_MOC_H_FILES ${MOC_H_FILES}) - SET(_PLUGIN_UI_FILES ${UI_FILES}) - SET(_PLUGIN_CACHED_RESOURCE_FILES ${CACHED_RESOURCE_FILES}) - SET(_PLUGIN_TRANSLATION_FILES ${TRANSLATION_FILES}) - SET(_PLUGIN_QRC_FILES ${QRC_FILES}) - SET(_PLUGIN_H_FILES ${H_FILES}) - SET(_PLUGIN_TXX_FILES ${TXX_FILES}) - SET(_PLUGIN_DOX_FILES ${DOX_FILES}) - SET(_PLUGIN_CMAKE_FILES ${CMAKE_FILES} files.cmake) - SET(_PLUGIN_FILE_DEPENDENCIES ${FILE_DEPENDENCIES}) + set(_PLUGIN_CPP_FILES ${CPP_FILES}) + set(_PLUGIN_MOC_H_FILES ${MOC_H_FILES}) + set(_PLUGIN_UI_FILES ${UI_FILES}) + set(_PLUGIN_CACHED_RESOURCE_FILES ${CACHED_RESOURCE_FILES}) + set(_PLUGIN_TRANSLATION_FILES ${TRANSLATION_FILES}) + set(_PLUGIN_QRC_FILES ${QRC_FILES}) + set(_PLUGIN_H_FILES ${H_FILES}) + set(_PLUGIN_TXX_FILES ${TXX_FILES}) + set(_PLUGIN_DOX_FILES ${DOX_FILES}) + set(_PLUGIN_CMAKE_FILES ${CMAKE_FILES} files.cmake) + set(_PLUGIN_FILE_DEPENDENCIES ${FILE_DEPENDENCIES}) - IF(CTK_PLUGINS_OUTPUT_DIR) - SET(_output_dir "${CTK_PLUGINS_OUTPUT_DIR}") - ELSE() - SET(_output_dir "") - ENDIF() + if(CTK_PLUGINS_OUTPUT_DIR) + set(_output_dir "${CTK_PLUGINS_OUTPUT_DIR}") + else() + set(_output_dir "") + endif() - IF(_PLUGIN_TEST_PLUGIN) - SET(is_test_plugin "TEST_PLUGIN") - ELSE() - SET(is_test_plugin) - ENDIF() + if(_PLUGIN_TEST_PLUGIN) + set(is_test_plugin "TEST_PLUGIN") + else() + set(is_test_plugin) + endif() #------------------------------------------------------------# #------------------ Qt Help support -------------------------# - SET(PLUGIN_GENERATED_QCH_FILES ) - IF (BLUEBERRY_USE_QT_HELP AND + set(PLUGIN_GENERATED_QCH_FILES ) + if(BLUEBERRY_USE_QT_HELP AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/documentation/UserManual") - SET(PLUGIN_DOXYGEN_INPUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/documentation/UserManual") - SET(PLUGIN_DOXYGEN_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/documentation/UserManual") - IF(_PLUGIN_NO_QHP_TRANSFORM) - SET(_use_qhp_xsl 0) - ELSE() - SET(_use_qhp_xsl 1) - ENDIF() + set(PLUGIN_DOXYGEN_INPUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/documentation/UserManual") + set(PLUGIN_DOXYGEN_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/documentation/UserManual") + if(_PLUGIN_NO_QHP_TRANSFORM) + set(_use_qhp_xsl 0) + else() + set(_use_qhp_xsl 1) + endif() _FUNCTION_CREATE_CTK_QT_COMPRESSED_HELP(PLUGIN_GENERATED_QCH_FILES ${_use_qhp_xsl}) - LIST(APPEND _PLUGIN_CACHED_RESOURCE_FILES ${PLUGIN_GENERATED_QCH_FILES}) - ENDIF() + list(APPEND _PLUGIN_CACHED_RESOURCE_FILES ${PLUGIN_GENERATED_QCH_FILES}) + endif() # Compute the plugin dependencies ctkFunctionGetTargetLibraries(_PLUGIN_target_libraries) ctkMacroBuildPlugin( NAME ${PLUGIN_TARGET} EXPORT_DIRECTIVE ${_PLUGIN_EXPORT_DIRECTIVE} SRCS ${_PLUGIN_CPP_FILES} MOC_SRCS ${_PLUGIN_MOC_H_FILES} UI_FORMS ${_PLUGIN_UI_FILES} EXPORTED_INCLUDE_SUFFIXES ${_PLUGIN_EXPORTED_INCLUDE_SUFFIXES} RESOURCES ${_PLUGIN_QRC_FILES} TARGET_LIBRARIES ${_PLUGIN_target_libraries} CACHED_RESOURCEFILES ${_PLUGIN_CACHED_RESOURCE_FILES} TRANSLATIONS ${_PLUGIN_TRANSLATION_FILES} OUTPUT_DIR ${_output_dir} ${is_test_plugin} ) - IF(mbilog_FOUND) - TARGET_LINK_LIBRARIES(${PLUGIN_TARGET} mbilog) - ENDIF() + if(mbilog_FOUND) + target_link_libraries(${PLUGIN_TARGET} mbilog) + endif() - INCLUDE_DIRECTORIES(${Poco_INCLUDE_DIRS}) + include_directories(${Poco_INCLUDE_DIRS}) - TARGET_LINK_LIBRARIES(${PLUGIN_TARGET} + target_link_libraries(${PLUGIN_TARGET} optimized PocoFoundation debug PocoFoundationd optimized PocoUtil debug PocoUtild optimized PocoXML debug PocoXMLd ) # Set compiler flags - GET_TARGET_PROPERTY(_plugin_compile_flags ${PLUGIN_TARGET} COMPILE_FLAGS) - IF(NOT _plugin_compile_flags) - SET(_plugin_compile_flags "") - ENDIF() - IF(WIN32) - SET(_plugin_compile_flags "${_plugin_compile_flags} -DPOCO_NO_UNWINDOWS -DWIN32_LEAN_AND_MEAN") - ENDIF() - SET_TARGET_PROPERTIES(${PLUGIN_TARGET} PROPERTIES COMPILE_FLAGS "${_plugin_compile_flags}") - - SET(_PLUGIN_META_FILES "${CMAKE_CURRENT_SOURCE_DIR}/manifest_headers.cmake") - IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin.xml") - LIST(APPEND _PLUGIN_META_FILES "${CMAKE_CURRENT_SOURCE_DIR}/plugin.xml") - ENDIF() + get_target_property(_plugin_compile_flags ${PLUGIN_TARGET} COMPILE_FLAGS) + if(NOT _plugin_compile_flags) + set(_plugin_compile_flags "") + endif() + if(WIN32) + set(_plugin_compile_flags "${_plugin_compile_flags} -DPOCO_NO_UNWINDOWS -DWIN32_LEAN_AND_MEAN") + endif() + set_target_properties(${PLUGIN_TARGET} PROPERTIES COMPILE_FLAGS "${_plugin_compile_flags}") + + set(_PLUGIN_META_FILES "${CMAKE_CURRENT_SOURCE_DIR}/manifest_headers.cmake") + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin.xml") + list(APPEND _PLUGIN_META_FILES "${CMAKE_CURRENT_SOURCE_DIR}/plugin.xml") + endif() MACRO_ORGANIZE_SOURCES( SOURCE ${_PLUGIN_CPP_FILES} HEADER ${_PLUGIN_H_FILES} TXX ${_PLUGIN_TXX_FILES} DOC ${_PLUGIN_DOX_FILES} UI ${_PLUGIN_UI_FILES} QRC ${_PLUGIN_QRC_FILES} ${_PLUGIN_CACHED_RESOURCE_FILES} META ${_PLUGIN_META_FILES} MOC ${MY_MOC_CPP} GEN_UI ${MY_UI_CPP} GEN_QRC ${MY_QRC_SRCS} ) #------------------------------------------------------------# #------------------ Installer support -----------------------# - IF(NOT _PLUGIN_TEST_PLUGIN) - SET(install_directories "") - IF(NOT MACOSX_BUNDLE_NAMES) - SET(install_directories bin/plugins) - ELSE(NOT MACOSX_BUNDLE_NAMES) - FOREACH(bundle_name ${MACOSX_BUNDLE_NAMES}) - LIST(APPEND install_directories ${bundle_name}.app/Contents/MacOS/plugins) - ENDFOREACH(bundle_name) - ENDIF(NOT MACOSX_BUNDLE_NAMES) - - FOREACH(install_subdir ${install_directories}) + if(NOT _PLUGIN_TEST_PLUGIN) + set(install_directories "") + if(NOT MACOSX_BUNDLE_NAMES) + set(install_directories bin/plugins) + else(NOT MACOSX_BUNDLE_NAMES) + foreach(bundle_name ${MACOSX_BUNDLE_NAMES}) + list(APPEND install_directories ${bundle_name}.app/Contents/MacOS/plugins) + endforeach(bundle_name) + endif(NOT MACOSX_BUNDLE_NAMES) + + foreach(install_subdir ${install_directories}) MACRO_INSTALL_CTK_PLUGIN(TARGETS ${PLUGIN_TARGET} DESTINATION ${install_subdir}) - ENDFOREACH() - ENDIF() + endforeach() + endif() -ENDMACRO() +endmacro() diff --git a/BlueBerry/CMake/MacroCreateQtHelp.cmake b/BlueBerry/CMake/MacroCreateQtHelp.cmake index 4f0d158de2..ebae13cb0e 100644 --- a/BlueBerry/CMake/MacroCreateQtHelp.cmake +++ b/BlueBerry/CMake/MacroCreateQtHelp.cmake @@ -1,42 +1,42 @@ -FUNCTION(_FUNCTION_CREATE_CTK_QT_COMPRESSED_HELP qch_file use_xsl) +function(_FUNCTION_CREATE_CTK_QT_COMPRESSED_HELP qch_file use_xsl) - SET(_manifest_path "${CMAKE_CURRENT_SOURCE_DIR}/manifest_headers.cmake") - IF(NOT EXISTS ${_manifest_path}) - MESSAGE(FATAL_ERROR "${_manifest_path} not found") - ENDIF() + set(_manifest_path "${CMAKE_CURRENT_SOURCE_DIR}/manifest_headers.cmake") + if(NOT EXISTS ${_manifest_path}) + message(FATAL_ERROR "${_manifest_path} not found") + endif() - INCLUDE(${_manifest_path}) - STRING(REPLACE "_" "." Plugin-SymbolicName "${PLUGIN_TARGET}") + include(${_manifest_path}) + string(REPLACE "_" "." Plugin-SymbolicName "${PLUGIN_TARGET}") - CONFIGURE_FILE(${BlueBerry_SOURCE_DIR}/CMake/berryCTKQtHelpDoxygen.conf.in + configure_file(${BlueBerry_SOURCE_DIR}/CMake/berryCTKQtHelpDoxygen.conf.in ${PLUGIN_DOXYGEN_OUTPUT_DIR}/doxygen.conf ) - SET(_qhp_xsl_file "${BlueBerry_SOURCE_DIR}/CMake/qhp_toc.xsl") - SET(_generated_qhp_file "${PLUGIN_DOXYGEN_OUTPUT_DIR}/html/index.qhp") - SET(_transformed_qhp_file "${PLUGIN_DOXYGEN_OUTPUT_DIR}/html/${PLUGIN_TARGET}.qhp") - SET(${qch_file} "${CMAKE_CURRENT_BINARY_DIR}/resources/${PLUGIN_TARGET}.qch") + set(_qhp_xsl_file "${BlueBerry_SOURCE_DIR}/CMake/qhp_toc.xsl") + set(_generated_qhp_file "${PLUGIN_DOXYGEN_OUTPUT_DIR}/html/index.qhp") + set(_transformed_qhp_file "${PLUGIN_DOXYGEN_OUTPUT_DIR}/html/${PLUGIN_TARGET}.qhp") + set(${qch_file} "${CMAKE_CURRENT_BINARY_DIR}/resources/${PLUGIN_TARGET}.qch") - SET(_xsl_command ) - IF(use_xsl) - SET(_xsl_command COMMAND ${QT_XMLPATTERNS_EXECUTABLE} ${_qhp_xsl_file} ${_generated_qhp_file} -output ${_transformed_qhp_file}) - ENDIF() + set(_xsl_command ) + if(use_xsl) + set(_xsl_command COMMAND ${QT_XMLPATTERNS_EXECUTABLE} ${_qhp_xsl_file} ${_generated_qhp_file} -output ${_transformed_qhp_file}) + endif() - FILE(GLOB _file_dependencies "${PLUGIN_DOXYGEN_INPUT_DIR}/*") + file(GLOB _file_dependencies "${PLUGIN_DOXYGEN_INPUT_DIR}/*") - ADD_CUSTOM_COMMAND(OUTPUT ${${qch_file}} + add_custom_command(OUTPUT ${${qch_file}} # Generate a Qt help project (index.qhp) with doxygen COMMAND ${DOXYGEN_EXECUTABLE} ${PLUGIN_DOXYGEN_OUTPUT_DIR}/doxygen.conf # Use a XSL transformation to get rid of the top-level entry ${_xsl_command} # Generate the final Qt compressed help file (.qch) COMMAND ${QT_HELPGENERATOR_EXECUTABLE} ${_transformed_qhp_file} -o ${${qch_file}} DEPENDS ${PLUGIN_DOXYGEN_OUTPUT_DIR}/doxygen.conf ${_file_dependencies} ) - #SET_SOURCE_FILES_PROPERTIES(${qch_file} PROPERTIES GENERATED 1) + #set_source_files_properties(${qch_file} PROPERTIES GENERATED 1) - SET(${qch_file} ${${qch_file}} PARENT_SCOPE) + set(${qch_file} ${${qch_file}} PARENT_SCOPE) -ENDFUNCTION() +endfunction() diff --git a/BlueBerry/CMake/MacroInstallCTKPlugin.cmake b/BlueBerry/CMake/MacroInstallCTKPlugin.cmake index 4b6adf12d3..bb52251945 100644 --- a/BlueBerry/CMake/MacroInstallCTKPlugin.cmake +++ b/BlueBerry/CMake/MacroInstallCTKPlugin.cmake @@ -1,60 +1,60 @@ #! \brief Install CTK plug-ins. #! #! Installs the given list of CTK plug-in targets in the given #! DESTINATION. If an entry in TARGETS #! is not a known target, a warning will be issued. This macro #! can also install imported plug-in targets. #! #! \note This macro is usually not called directly. It is used in #! MACRO_CREATE_CTK_PLUGIN() and FunctionInstallThirdPartyCTKPlugins(). #! #! \param TARGETS (optional) A list of plug-ins (target names) to install. #! \param DESTINATION (optional) The install destination. Defaults to "bin/". -MACRO(MACRO_INSTALL_CTK_PLUGIN) +macro(MACRO_INSTALL_CTK_PLUGIN) MACRO_PARSE_ARGUMENTS(_INSTALL "TARGETS;DESTINATION" "" ${ARGN}) - IF(NOT _INSTALL_DESTINATION) - SET(_INSTALL_DESTINATION "bin/") - ELSE() - SET(_INSTALL_DESTINATION "${_INSTALL_DESTINATION}/") - ENDIF() + if(NOT _INSTALL_DESTINATION) + set(_INSTALL_DESTINATION "bin/") + else() + set(_INSTALL_DESTINATION "${_INSTALL_DESTINATION}/") + endif() - FOREACH(_install_target ${_INSTALL_TARGETS}) - IF(TARGET ${_install_target}) - GET_TARGET_PROPERTY(_is_imported ${_install_target} IMPORTED) - IF(_is_imported) - GET_TARGET_PROPERTY(_import_loc_debug ${_install_target} IMPORTED_LOCATION_DEBUG) - GET_TARGET_PROPERTY(_import_loc_release ${_install_target} IMPORTED_LOCATION_RELEASE) - GET_FILENAME_COMPONENT(_target_filename_debug "${_import_loc_debug}" NAME) - GET_FILENAME_COMPONENT(_target_filename_release "${_import_loc_release}" NAME) - INSTALL(FILES ${_import_loc_debug} + foreach(_install_target ${_INSTALL_TARGETS}) + if(TARGET ${_install_target}) + get_target_property(_is_imported ${_install_target} IMPORTED) + if(_is_imported) + get_target_property(_import_loc_debug ${_install_target} IMPORTED_LOCATION_DEBUG) + get_target_property(_import_loc_release ${_install_target} IMPORTED_LOCATION_RELEASE) + get_filename_component(_target_filename_debug "${_import_loc_debug}" NAME) + get_filename_component(_target_filename_release "${_import_loc_release}" NAME) + install(FILES ${_import_loc_debug} DESTINATION ${_INSTALL_DESTINATION} CONFIGURATIONS Debug) - INSTALL(FILES ${_import_loc_release} + install(FILES ${_import_loc_release} DESTINATION ${_INSTALL_DESTINATION} CONFIGURATIONS Release) - IF(UNIX AND NOT APPLE) - IF(_target_filename_debug) - INSTALL(CODE "FILE(RPATH_REMOVE + if(UNIX AND NOT APPLE) + if(_target_filename_debug) + install(CODE "file(RPATH_REMOVE FILE \"\${CMAKE_INSTALL_PREFIX}/${_INSTALL_DESTINATION}/${_target_filename_debug}\")") - ENDIF() - IF(_target_filename_release) - INSTALL(CODE "FILE(RPATH_REMOVE + endif() + if(_target_filename_release) + install(CODE "file(RPATH_REMOVE FILE \"\${CMAKE_INSTALL_PREFIX}/${_INSTALL_DESTINATION}/${_target_filename_release}\")") - ENDIF() - ENDIF() - ELSE() - INSTALL(TARGETS ${_install_target} + endif() + endif() + else() + install(TARGETS ${_install_target} RUNTIME DESTINATION ${_INSTALL_DESTINATION} LIBRARY DESTINATION ${_INSTALL_DESTINATION} #ARCHIVE DESTINATION ${_INSTALL_DESTINATION} ) - ENDIF() - ELSE() - MESSAGE(WARNING "Ignoring unknown plug-in target \"${_install_target}\" for installation.") - ENDIF() - ENDFOREACH() + endif() + else() + message(WARNING "Ignoring unknown plug-in target \"${_install_target}\" for installation.") + endif() + endforeach() -ENDMACRO() +endmacro() diff --git a/BlueBerry/CMake/MacroOrganizeSources.cmake b/BlueBerry/CMake/MacroOrganizeSources.cmake index ed4dda9ea3..53037ac08f 100644 --- a/BlueBerry/CMake/MacroOrganizeSources.cmake +++ b/BlueBerry/CMake/MacroOrganizeSources.cmake @@ -1,73 +1,73 @@ # this macro gets a filelist as input and looks # for corresponding h-files to add them to the project. # # additionally files are grouped in source-groups. # # No parameters explicitly declared here, because # we want to allow for variable argument lists, which -# are later access by the keyword FOREACH(_file ${ARGV}) +# are later access by the keyword foreach(_file ${ARGV}) # # output: after calling the macro, files that were found # correspondigly to the given files are stored in the # variable: # ${CORRESPONDING__H_FILES} # # GLOBBED__H_FILES -MACRO(MACRO_ORGANIZE_SOURCES) +macro(MACRO_ORGANIZE_SOURCES) MACRO_PARSE_ARGUMENTS(_ORG "HEADER;SOURCE;TXX;DOC;MOC;GEN_QRC;GEN_UI;META;UI;QRC" "" ${ARGN}) - SET(CORRESPONDING__H_FILES "" ) - SET(GLOBBED__H_FILES "" ) + set(CORRESPONDING__H_FILES "" ) + set(GLOBBED__H_FILES "" ) - IF(_ORG_HEADER) - FOREACH(_file ${_ORG_SOURCE}) - STRING(REGEX REPLACE "(.*)\\.(txx|cpp|c|cxx)$" "\\1.h" H_FILE ${_file}) - IF(EXISTS ${H_FILE}) - LIST(APPEND CORRESPONDING__H_FILES "${H_FILE}") - ENDIF() - ENDFOREACH() - ELSE() - FILE(GLOB_RECURSE GLOBBED__H_FILES *.h) - ENDIF() + if(_ORG_HEADER) + foreach(_file ${_ORG_SOURCE}) + string(REGEX REPLACE "(.*)\\.(txx|cpp|c|cxx)$" "\\1.h" H_FILE ${_file}) + if(EXISTS ${H_FILE}) + list(APPEND CORRESPONDING__H_FILES "${H_FILE}") + endif() + endforeach() + else() + file(GLOB_RECURSE GLOBBED__H_FILES *.h) + endif() - IF(_ORG_GEN_QRC OR _ORG_GEN_UI OR _ORG_MOC) - SOURCE_GROUP("Generated\\Qt QRC Source Files" FILES ${_ORG_GEN_QRC}) - SOURCE_GROUP("Generated\\Qt UI Header Files" FILES ${_ORG_GEN_UI}) - SOURCE_GROUP("Generated\\Qt MOC Source Files" FILES ${_ORG_MOC}) - ENDIF() + if(_ORG_GEN_QRC OR _ORG_GEN_UI OR _ORG_MOC) + source_group("Generated\\Qt QRC Source Files" FILES ${_ORG_GEN_QRC}) + source_group("Generated\\Qt UI Header Files" FILES ${_ORG_GEN_UI}) + source_group("Generated\\Qt MOC Source Files" FILES ${_ORG_MOC}) + endif() #_MACRO_APPEND_TO_LIST(_ORG_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/") - SOURCE_GROUP("== Source Files ==" FILES ${_ORG_SOURCE}) + source_group("== Source Files ==" FILES ${_ORG_SOURCE}) #_MACRO_APPEND_TO_LIST(_ORG_TXX "${CMAKE_CURRENT_SOURCE_DIR}/") - SOURCE_GROUP("== Template Files ==" FILES ${_ORG_TXX}) + source_group("== Template Files ==" FILES ${_ORG_TXX}) #_MACRO_APPEND_TO_LIST(_ORG_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/") - SOURCE_GROUP("== Header Files ==" FILES ${_ORG_HEADER} ${_ORG_HEADER} ${CORRESPONDING__H_FILES} ${GLOBBED__H_FILES}) + source_group("== Header Files ==" FILES ${_ORG_HEADER} ${_ORG_HEADER} ${CORRESPONDING__H_FILES} ${GLOBBED__H_FILES}) #_MACRO_APPEND_TO_LIST(_ORG_UI "${CMAKE_CURRENT_SOURCE_DIR}/") - SOURCE_GROUP("QT UI Files" FILES ${_ORG_UI}) + source_group("QT UI Files" FILES ${_ORG_UI}) #_MACRO_APPEND_TO_LIST(_ORG_DOC "${CMAKE_CURRENT_SOURCE_DIR}/") - SOURCE_GROUP("Doxygen Files" FILES ${_ORG_DOC}) + source_group("Doxygen Files" FILES ${_ORG_DOC}) #_MACRO_APPEND_TO_LIST(_ORG_QRC "${CMAKE_CURRENT_SOURCE_DIR}/") - SOURCE_GROUP("Qt Resource Files" FILES ${_ORG_QRC}) + source_group("Qt Resource Files" FILES ${_ORG_QRC}) - SOURCE_GROUP("Plugin META Files" FILES ${_ORG_META}) + source_group("Plugin META Files" FILES ${_ORG_META}) -ENDMACRO() +endmacro() -MACRO(_MACRO_APPEND_TO_LIST _list _value) - SET(_origlist ${${_list}}) - SET(${_list} ) - FOREACH(_element ${_origlist}) - LIST(APPEND ${_list} "${_value}${_element}") - ENDFOREACH() -ENDMACRO() +macro(_MACRO_APPEND_TO_LIST _list _value) + set(_origlist ${${_list}}) + set(${_list} ) + foreach(_element ${_origlist}) + list(APPEND ${_list} "${_value}${_element}") + endforeach() +endmacro() \ No newline at end of file diff --git a/BlueBerry/CMake/MacroParseArguments.cmake b/BlueBerry/CMake/MacroParseArguments.cmake index fe34758fe1..0201fe1b65 100644 --- a/BlueBerry/CMake/MacroParseArguments.cmake +++ b/BlueBerry/CMake/MacroParseArguments.cmake @@ -1,75 +1,75 @@ -# MACRO (MACRO_PARSE_ARGUMENTS prefix arg_names option_names) +# macro(MACRO_PARSE_ARGUMENTS prefix arg_names option_names) # # From http://www.cmake.org/Wiki/CMakeMacroParseArguments: # # The MACRO_PARSE_ARGUMENTS macro will take the arguments of another macro and # define several variables: # # 1) The first argument to is a prefix to put on all variables it creates. # 2) The second argument is a quoted list of names, # 3) and the third argument is a quoted list of options. # # The rest of MACRO_PARSE_ARGUMENTS are arguments from another macro to be # parsed. # # MACRO_PARSE_ARGUMENTS(prefix arg_names options arg1 arg2...) # # For each item in options, MACRO_PARSE_ARGUMENTS will create a variable # with that name, prefixed with prefix_. So, for example, if prefix is # MY_MACRO and options is OPTION1;OPTION2, then PARSE_ARGUMENTS will create # the variables MY_MACRO_OPTION1 and MY_MACRO_OPTION2. These variables will # be set to true if the option exists in the command line or false otherwise. # # For each item in arg_names, MACRO_PARSE_ARGUMENTS will create a variable # with that name, prefixed with prefix_. Each variable will be filled with the # arguments that occur after the given arg_name is encountered up to the next # arg_name or the end of the arguments. All options are removed from these # lists. # # MACRO_PARSE_ARGUMENTS also creates a prefix_DEFAULT_ARGS variable containing # the list of all arguments up to the first arg_name encountered. -MACRO (MACRO_PARSE_ARGUMENTS prefix arg_names option_names) +macro(MACRO_PARSE_ARGUMENTS prefix arg_names option_names) - SET(DEFAULT_ARGS) + set(DEFAULT_ARGS) - FOREACH (arg_name ${arg_names}) - SET(${prefix}_${arg_name}) - ENDFOREACH (arg_name) + foreach(arg_name ${arg_names}) + set(${prefix}_${arg_name}) + endforeach(arg_name) - FOREACH (option ${option_names}) - SET(${prefix}_${option} FALSE) - ENDFOREACH (option) + foreach(option ${option_names}) + set(${prefix}_${option} FALSE) + endforeach(option) - SET(current_arg_name DEFAULT_ARGS) - SET(current_arg_list) + set(current_arg_name DEFAULT_ARGS) + set(current_arg_list) - FOREACH (arg ${ARGN}) + foreach(arg ${ARGN}) - SET(larg_names ${arg_names}) - LIST(FIND larg_names "${arg}" is_arg_name) + set(larg_names ${arg_names}) + list(FIND larg_names "${arg}" is_arg_name) - IF (is_arg_name GREATER -1) + if(is_arg_name GREATER -1) - SET(${prefix}_${current_arg_name} ${current_arg_list}) - SET(current_arg_name "${arg}") - SET(current_arg_list) + set(${prefix}_${current_arg_name} ${current_arg_list}) + set(current_arg_name "${arg}") + set(current_arg_list) - ELSE (is_arg_name GREATER -1) + else(is_arg_name GREATER -1) - SET(loption_names ${option_names}) - LIST(FIND loption_names "${arg}" is_option) + set(loption_names ${option_names}) + list(FIND loption_names "${arg}" is_option) - IF (is_option GREATER -1) - SET(${prefix}_${arg} TRUE) - ELSE (is_option GREATER -1) - SET(current_arg_list ${current_arg_list} "${arg}") - ENDIF (is_option GREATER -1) + if(is_option GREATER -1) + set(${prefix}_${arg} TRUE) + else(is_option GREATER -1) + set(current_arg_list ${current_arg_list} "${arg}") + endif(is_option GREATER -1) - ENDIF (is_arg_name GREATER -1) + endif(is_arg_name GREATER -1) - ENDFOREACH (arg ${ARGN}) + endforeach(arg ${ARGN}) - SET(${prefix}_${current_arg_name} ${current_arg_list}) + set(${prefix}_${current_arg_name} ${current_arg_list}) -ENDMACRO (MACRO_PARSE_ARGUMENTS) +endmacro(MACRO_PARSE_ARGUMENTS) diff --git a/BlueBerry/CMake/berryTestingHelpers.cmake b/BlueBerry/CMake/berryTestingHelpers.cmake index de424a262b..7d7e38acb6 100755 --- a/BlueBerry/CMake/berryTestingHelpers.cmake +++ b/BlueBerry/CMake/berryTestingHelpers.cmake @@ -1,68 +1,68 @@ # Call this macro after calling MACRO_CREATE_PLUGIN in your CMakeLists.txt # # Variables: # # - BLUEBERRY_TEST_APP contains the name of the executable which will start the OSGi framework # -MACRO(MACRO_TEST_PLUGIN) +macro(MACRO_TEST_PLUGIN) - SET(_cla_switch "--") - IF(WIN32) - IF(MSYS) - SET(_cla_switch "//") - ELSE() - SET(_cla_switch "/") - ENDIF() - ENDIF() + set(_cla_switch "--") + if(WIN32) + if(MSYS) + set(_cla_switch "//") + else() + set(_cla_switch "/") + endif() + endif() - IF(NOT BUNDLE-SYMBOLICNAME) - STRING(REPLACE "_" "." BUNDLE-SYMBOLICNAME ${PROJECT_NAME}) - ENDIF() - ADD_TEST(${BUNDLE-SYMBOLICNAME} ${BLUEBERRY_TEST_APP} ${_cla_switch}BlueBerry.application=coretestapplication ${_cla_switch}BlueBerry.testplugin=${BUNDLE-SYMBOLICNAME}) + if(NOT BUNDLE-SYMBOLICNAME) + string(REPLACE "_" "." BUNDLE-SYMBOLICNAME ${PROJECT_NAME}) + endif() + add_test(${BUNDLE-SYMBOLICNAME} ${BLUEBERRY_TEST_APP} ${_cla_switch}BlueBerry.application=coretestapplication ${_cla_switch}BlueBerry.testplugin=${BUNDLE-SYMBOLICNAME}) - SET(_labels ${ARGN}) - IF(NOT _labels) - SET(_labels BlueBerry) - ENDIF() - SET_PROPERTY(TEST ${BUNDLE-SYMBOLICNAME} PROPERTY LABELS ${_labels}) + set(_labels ${ARGN}) + if(NOT _labels) + set(_labels BlueBerry) + endif() + set_property(TEST ${BUNDLE-SYMBOLICNAME} PROPERTY LABELS ${_labels}) -ENDMACRO(MACRO_TEST_PLUGIN) +endmacro(MACRO_TEST_PLUGIN) # Variables: # # - BLUEBERRY_UI_TEST_APP contains the name of the executable which will start the OSGi framework # - BLUEBERRY_TEST_APP_ID contains the application id of the application to test. If empty, # a minimalistic default application will be started -MACRO(MACRO_TEST_UIPLUGIN) +macro(MACRO_TEST_UIPLUGIN) - SET(_cla_switch "--") - IF(WIN32) - IF(MSYS) - SET(_cla_switch "//") - ELSE() - SET(_cla_switch "/") - ENDIF() - ENDIF() + set(_cla_switch "--") + if(WIN32) + if(MSYS) + set(_cla_switch "//") + else() + set(_cla_switch "/") + endif() + endif() - IF(NOT BUNDLE-SYMBOLICNAME) - STRING(REPLACE "_" "." BUNDLE-SYMBOLICNAME ${PROJECT_NAME}) - ENDIF() + if(NOT BUNDLE-SYMBOLICNAME) + string(REPLACE "_" "." BUNDLE-SYMBOLICNAME ${PROJECT_NAME}) + endif() - IF(BLUEBERRY_ENABLE_GUI_TESTING) - IF(BLUEBERRY_TEST_APP_ID) - SET(_app_id_arg "${_cla_switch}BlueBerry.testapplication=${BLUEBERRY_TEST_APP_ID}") - ELSE() - SET(_app_id_arg ) - ENDIF() + if(BLUEBERRY_ENABLE_GUI_TESTING) + if(BLUEBERRY_TEST_APP_ID) + set(_app_id_arg "${_cla_switch}BlueBerry.testapplication=${BLUEBERRY_TEST_APP_ID}") + else() + set(_app_id_arg ) + endif() - ADD_TEST(${BUNDLE-SYMBOLICNAME} ${BLUEBERRY_UI_TEST_APP} ${_cla_switch}BlueBerry.application=uitestapplication ${_app_id_arg} ${_cla_switch}BlueBerry.testplugin=${BUNDLE-SYMBOLICNAME}) + add_test(${BUNDLE-SYMBOLICNAME} ${BLUEBERRY_UI_TEST_APP} ${_cla_switch}BlueBerry.application=uitestapplication ${_app_id_arg} ${_cla_switch}BlueBerry.testplugin=${BUNDLE-SYMBOLICNAME}) - SET(_labels ${ARGN}) - IF(NOT _labels) - SET(_labels BlueBerry) - ENDIF() - SET_PROPERTY(TEST ${BUNDLE-SYMBOLICNAME} PROPERTY LABELS ${_labels}) - ENDIF() + set(_labels ${ARGN}) + if(NOT _labels) + set(_labels BlueBerry) + endif() + set_property(TEST ${BUNDLE-SYMBOLICNAME} PROPERTY LABELS ${_labels}) + endif() -ENDMACRO(MACRO_TEST_UIPLUGIN) +endmacro(MACRO_TEST_UIPLUGIN) diff --git a/BlueBerry/CMakeLists.txt b/BlueBerry/CMakeLists.txt index 44485faa19..ab3b06adad 100644 --- a/BlueBerry/CMakeLists.txt +++ b/BlueBerry/CMakeLists.txt @@ -1,272 +1,272 @@ -PROJECT(BlueBerry) -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.4) +project(BlueBerry) +cmake_minimum_required(VERSION 2.8.4) -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/CMake/") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/CMake/") -INCLUDE(MacroParseArguments) -INCLUDE(MacroConvertSchema) -INCLUDE(MacroOrganizeSources) -INCLUDE(MacroCreateCTKPlugin) -INCLUDE(MacroCreateQtHelp) -INCLUDE(MacroInstallCTKPlugin) -INCLUDE(FunctionCreateProvisioningFile) +include(MacroParseArguments) +include(MacroConvertSchema) +include(MacroOrganizeSources) +include(MacroCreateCTKPlugin) +include(MacroCreateQtHelp) +include(MacroInstallCTKPlugin) +include(FunctionCreateProvisioningFile) -IF(MSVC) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4275 /wd4251 /wd4503") -ENDIF() +if(MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4275 /wd4251 /wd4503") +endif() -IF (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY) - SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) -ENDIF () +if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) +endif() -FIND_PACKAGE(mbilog REQUIRED) -INCLUDE_DIRECTORIES(${mbilog_INCLUDE_DIRS}) +find_package(mbilog REQUIRED) +include_directories(${mbilog_INCLUDE_DIRS}) -FIND_PACKAGE(Qt4 4.6.2 REQUIRED) +find_package(Qt4 4.6.2 REQUIRED) -IF(QT_QMAKE_CHANGED) - SET(QT_HELPGENERATOR_EXECUTABLE NOTFOUND) - SET(QT_COLLECTIONGENERATOR_EXECUTABLE NOTFOUND) - SET(QT_ASSISTANT_EXECUTABLE NOTFOUND) - SET(QT_XMLPATTERNS_EXECUTABLE NOTFOUND) -ENDIF() +if(QT_QMAKE_CHANGED) + set(QT_HELPGENERATOR_EXECUTABLE NOTFOUND) + set(QT_COLLECTIONGENERATOR_EXECUTABLE NOTFOUND) + set(QT_ASSISTANT_EXECUTABLE NOTFOUND) + set(QT_XMLPATTERNS_EXECUTABLE NOTFOUND) +endif() -FIND_PROGRAM(QT_HELPGENERATOR_EXECUTABLE +find_program(QT_HELPGENERATOR_EXECUTABLE NAMES qhelpgenerator qhelpgenerator-qt4 qhelpgenerator4 PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH ) -FIND_PROGRAM(QT_COLLECTIONGENERATOR_EXECUTABLE +find_program(QT_COLLECTIONGENERATOR_EXECUTABLE NAMES qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator4 PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH ) -FIND_PROGRAM(QT_ASSISTANT_EXECUTABLE +find_program(QT_ASSISTANT_EXECUTABLE NAMES assistant-qt4 assistant4 assistant PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH ) -FIND_PROGRAM(QT_XMLPATTERNS_EXECUTABLE +find_program(QT_XMLPATTERNS_EXECUTABLE NAMES xmlpatterns PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH ) -OPTION(BLUEBERRY_USE_QT_HELP "Enable support for integrating bundle documentation into Qt Help" ON) +option(BLUEBERRY_USE_QT_HELP "Enable support for integrating bundle documentation into Qt Help" ON) -MARK_AS_ADVANCED(BLUEBERRY_USE_QT_HELP +mark_as_advanced(BLUEBERRY_USE_QT_HELP QT_HELPGENERATOR_EXECUTABLE QT_COLLECTIONGENERATOR_EXECUTABLE QT_ASSISTANT_EXECUTABLE QT_XMLPATTERNS_EXECUTABLE) -SET(_doxygen_too_old 1) -IF(BLUEBERRY_USE_QT_HELP) - FIND_PACKAGE(Doxygen) - IF(DOXYGEN_FOUND) - EXECUTE_PROCESS(COMMAND ${DOXYGEN_EXECUTABLE} --version +set(_doxygen_too_old 1) +if(BLUEBERRY_USE_QT_HELP) + find_package(Doxygen) + if(DOXYGEN_FOUND) + execute_process(COMMAND ${DOXYGEN_EXECUTABLE} --version OUTPUT_VARIABLE _doxygen_version) - IF(${_doxygen_version} VERSION_GREATER 1.6.0 OR + if(${_doxygen_version} VERSION_GREATER 1.6.0 OR ${_doxygen_version} VERSION_EQUAL 1.6.0) - SET(_doxygen_too_old 0) - ENDIF() - ENDIF() + set(_doxygen_too_old 0) + endif() + endif() - IF(_doxygen_too_old) - MESSAGE("Doxygen was not found or is too old. Version 1.6.0 or later is needed if BLUEBERRY_USE_QT_HELP is ON") - SET(BLUEBERRY_USE_QT_HELP OFF CACHE BOOL "Enable support for integrating bundle documentation into Qt Help" FORCE) - ENDIF() + if(_doxygen_too_old) + message("Doxygen was not found or is too old. Version 1.6.0 or later is needed if BLUEBERRY_USE_QT_HELP is ON") + set(BLUEBERRY_USE_QT_HELP OFF CACHE BOOL "Enable support for integrating bundle documentation into Qt Help" FORCE) + endif() - IF(NOT QT_HELPGENERATOR_EXECUTABLE) - MESSAGE("You have enabled Qt Help support, but QT_HELPGENERATOR_EXECUTABLE is empty") - SET(BLUEBERRY_USE_QT_HELP OFF CACHE BOOL "Enable support for integrating bundle documentation into Qt Help" FORCE) - ENDIF() + if(NOT QT_HELPGENERATOR_EXECUTABLE) + message("You have enabled Qt Help support, but QT_HELPGENERATOR_EXECUTABLE is empty") + set(BLUEBERRY_USE_QT_HELP OFF CACHE BOOL "Enable support for integrating bundle documentation into Qt Help" FORCE) + endif() - IF(NOT QT_XMLPATTERNS_EXECUTABLE) - MESSAGE("You have enabled Qt Help support, but QT_XMLPATTERNS_EXECUTABLE is empty") - SET(BLUEBERRY_USE_QT_HELP OFF CACHE BOOL "Enable support for integrating bundle documentation into Qt Help" FORCE) - ENDIF() -ENDIF(BLUEBERRY_USE_QT_HELP) + if(NOT QT_XMLPATTERNS_EXECUTABLE) + message("You have enabled Qt Help support, but QT_XMLPATTERNS_EXECUTABLE is empty") + set(BLUEBERRY_USE_QT_HELP OFF CACHE BOOL "Enable support for integrating bundle documentation into Qt Help" FORCE) + endif() +endif(BLUEBERRY_USE_QT_HELP) -INCLUDE(${QT_USE_FILE}) +include(${QT_USE_FILE}) # ========= CTK specific CMake stuff ============ -CMAKE_POLICY(SET CMP0012 NEW) +cmake_policy(SET CMP0012 NEW) -FIND_PACKAGE(CTK REQUIRED) +find_package(CTK REQUIRED) # Extract all library names starting with org_blueberry_ -MACRO(GetMyTargetLibraries all_target_libraries varname) - SET(re_ctkplugin "^org_blueberry_[a-zA-Z0-9_]+$") - SET(_tmp_list) - LIST(APPEND _tmp_list ${all_target_libraries}) +macro(GetMyTargetLibraries all_target_libraries varname) + set(re_ctkplugin "^org_blueberry_[a-zA-Z0-9_]+$") + set(_tmp_list) + list(APPEND _tmp_list ${all_target_libraries}) ctkMacroListFilter(_tmp_list re_ctkplugin OUTPUT_VARIABLE ${varname}) -ENDMACRO() +endmacro() # ================================================ -OPTION(BLUEBERRY_BUILD_ALL_PLUGINS "Build all BlueBerry plugins (overriding selection)" OFF) -MARK_AS_ADVANCED(BLUEBERRY_BUILD_ALL_PLUGINS) +option(BLUEBERRY_BUILD_ALL_PLUGINS "Build all BlueBerry plugins (overriding selection)" OFF) +mark_as_advanced(BLUEBERRY_BUILD_ALL_PLUGINS) -IF(BLUEBERRY_BUILD_ALL_PLUGINS) - SET(BLUEBERRY_BUILD_ALL_PLUGINS_OPTION "FORCE_BUILD_ALL") -ENDIF() +if(BLUEBERRY_BUILD_ALL_PLUGINS) + set(BLUEBERRY_BUILD_ALL_PLUGINS_OPTION "FORCE_BUILD_ALL") +endif() -OPTION(BLUEBERRY_STATIC "Build all plugins as static libraries" OFF) -MARK_AS_ADVANCED(BLUEBERRY_STATIC) +option(BLUEBERRY_STATIC "Build all plugins as static libraries" OFF) +mark_as_advanced(BLUEBERRY_STATIC) -OPTION(BLUEBERRY_DEBUG_SMARTPOINTER "Enable code for debugging smart pointers" OFF) -MARK_AS_ADVANCED(BLUEBERRY_DEBUG_SMARTPOINTER) +option(BLUEBERRY_DEBUG_SMARTPOINTER "Enable code for debugging smart pointers" OFF) +mark_as_advanced(BLUEBERRY_DEBUG_SMARTPOINTER) -FIND_PACKAGE(Poco REQUIRED) -FIND_PACKAGE(Ant) -FIND_PACKAGE(Eclipse) +find_package(Poco REQUIRED) +find_package(Ant) +find_package(Eclipse) -SET(BLUEBERRY_SOURCE_DIR ${BlueBerry_SOURCE_DIR}) -SET(BLUEBERRY_BINARY_DIR ${BlueBerry_BINARY_DIR}) +set(BLUEBERRY_SOURCE_DIR ${BlueBerry_SOURCE_DIR}) +set(BLUEBERRY_BINARY_DIR ${BlueBerry_BINARY_DIR}) -SET(BLUEBERRY_PLUGINS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Bundles) -SET(BLUEBERRY_PLUGINS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Bundles) +set(BLUEBERRY_PLUGINS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Bundles) +set(BLUEBERRY_PLUGINS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Bundles) -SET(OSGI_APP solstice) -SET(OSGI_UI_APP solstice_ui) +set(OSGI_APP solstice) +set(OSGI_UI_APP solstice_ui) -IF (Eclipse_DIR) - SET(BLUEBERRY_DOC_TOOLS_DIR "${Eclipse_DIR}" CACHE PATH "Directory containing additional tools needed for generating the documentation") -ELSE () - SET(BLUEBERRY_DOC_TOOLS_DIR "" CACHE PATH "Directory containing additional tools needed for generating the documentation") -ENDIF () +if(Eclipse_DIR) + set(BLUEBERRY_DOC_TOOLS_DIR "${Eclipse_DIR}" CACHE PATH "Directory containing additional tools needed for generating the documentation") +else() + set(BLUEBERRY_DOC_TOOLS_DIR "" CACHE PATH "Directory containing additional tools needed for generating the documentation") +endif() -SET(BLUEBERRY_DEBUG_POSTFIX d) +set(BLUEBERRY_DEBUG_POSTFIX d) # Testing options -OPTION(BLUEBERRY_BUILD_TESTING "Build the BlueBerry tests." ${BUILD_TESTING}) +option(BLUEBERRY_BUILD_TESTING "Build the BlueBerry tests." ${BUILD_TESTING}) -IF(WIN32) - SET(_gui_testing_default "ON") -ELSE() - SET(_gui_testing_default "OFF") -ENDIF() +if(WIN32) + set(_gui_testing_default "ON") +else() + set(_gui_testing_default "OFF") +endif() -OPTION(BLUEBERRY_ENABLE_GUI_TESTING "Enable the BlueBerry GUI tests" ${_gui_testing_default}) -MARK_AS_ADVANCED(BLUEBERRY_ENABLE_GUI_TESTING) +option(BLUEBERRY_ENABLE_GUI_TESTING "Enable the BlueBerry GUI tests" ${_gui_testing_default}) +mark_as_advanced(BLUEBERRY_ENABLE_GUI_TESTING) -IF(BLUEBERRY_BUILD_TESTING) - ENABLE_TESTING() -ENDIF() +if(BLUEBERRY_BUILD_TESTING) + enable_testing() +endif() # Add CTK plugins -SET(_ctk_plugins +set(_ctk_plugins Bundles/org.blueberry.osgi:ON Bundles/org.blueberry.compat:OFF Bundles/org.blueberry.core.runtime:OFF Bundles/org.blueberry.core.expressions:OFF Bundles/org.blueberry.solstice.common:OFF Bundles/org.blueberry.core.commands:OFF Bundles/org.blueberry.core.jobs:OFF Bundles/org.blueberry.ui:OFF Bundles/org.blueberry.ui.qt:OFF Bundles/org.blueberry.ui.qt.help:OFF Bundles/org.blueberry.ui.qt.log:OFF Bundles/org.blueberry.ui.qt.objectinspector:OFF ) -SET(_ctk_test_plugins ) +set(_ctk_test_plugins ) -SET(_ctk_plugins_include_dirs +set(_ctk_plugins_include_dirs ${Poco_INCLUDE_DIRS} ) -SET(_ctk_plugins_link_dirs +set(_ctk_plugins_link_dirs ${Poco_LIBRARY_DIR} ) -INCLUDE_DIRECTORIES(${_ctk_plugins_include_dirs}) -LINK_DIRECTORIES(${_ctk_plugins_link_dirs}) +include_directories(${_ctk_plugins_include_dirs}) +link_directories(${_ctk_plugins_link_dirs}) -IF(BLUEBERRY_BUILD_TESTING) - INCLUDE(berryTestingHelpers) +if(BLUEBERRY_BUILD_TESTING) + include(berryTestingHelpers) - SET(BLUEBERRY_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_APP}") - GET_TARGET_PROPERTY(_is_macosx_bundle ${OSGI_APP} MACOSX_BUNDLE) - IF(APPLE AND _is_macosx_bundle) - SET(BLUEBERRY_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_APP}.app/Contents/MacOS/${OSGI_APP}") - ENDIF() + set(BLUEBERRY_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_APP}") + get_target_property(_is_macosx_bundle ${OSGI_APP} MACOSX_BUNDLE) + if(APPLE AND _is_macosx_bundle) + set(BLUEBERRY_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_APP}.app/Contents/MacOS/${OSGI_APP}") + endif() - SET(_ctk_testinfrastructure_plugins + set(_ctk_testinfrastructure_plugins Bundles/org.blueberry.test:ON Bundles/org.blueberry.uitest:ON ) - SET(_ctk_test_plugins + set(_ctk_test_plugins # Testing/org.blueberry.core.runtime.tests:ON # Testing/org.blueberry.osgi.tests:ON ) - IF(BLUEBERRY_ENABLE_GUI_TESTING) -# LIST(APPEND _ctk_test_plugins Testing/org.blueberry.ui.tests:ON) - - SET(BLUEBERRY_UI_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_UI_APP}") - GET_TARGET_PROPERTY(_is_macosx_bundle ${OSGI_UI_APP} MACOSX_BUNDLE) - IF(APPLE AND _is_macosx_bundle) - SET(BLUEBERRY_UI_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_UI_APP}.app/Contents/MacOS/${OSGI_UI_APP}") - ENDIF() - ENDIF() -ENDIF() + if(BLUEBERRY_ENABLE_GUI_TESTING) +# list(APPEND _ctk_test_plugins Testing/org.blueberry.ui.tests:ON) + + set(BLUEBERRY_UI_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_UI_APP}") + get_target_property(_is_macosx_bundle ${OSGI_UI_APP} MACOSX_BUNDLE) + if(APPLE AND _is_macosx_bundle) + set(BLUEBERRY_UI_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_UI_APP}.app/Contents/MacOS/${OSGI_UI_APP}") + endif() + endif() +endif() -SET(BLUEBERRY_TESTING_PROVISIONING_FILE "${BlueBerry_BINARY_DIR}/BlueBerryTesting.provisioning") +set(BLUEBERRY_TESTING_PROVISIONING_FILE "${BlueBerry_BINARY_DIR}/BlueBerryTesting.provisioning") -ADD_CUSTOM_TARGET(BlueBerry) +add_custom_target(BlueBerry) ctkMacroSetupPlugins(${_ctk_plugins} ${_ctk_testinfrastructure_plugins} ${_ctk_test_plugins} BUILD_OPTION_PREFIX BLUEBERRY_BUILD_ BUILD_ALL ${BLUEBERRY_BUILD_ALL_PLUGINS} COMPACT_OPTIONS) -SET(BLUEBERRY_PROVISIONING_FILE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/BlueBerry.provisioning") +set(BLUEBERRY_PROVISIONING_FILE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/BlueBerry.provisioning") FunctionCreateProvisioningFile( FILE ${BLUEBERRY_PROVISIONING_FILE} PLUGINS ${_ctk_plugins} ) FunctionCreateProvisioningFile( FILE ${BLUEBERRY_TESTING_PROVISIONING_FILE} INCLUDE ${BLUEBERRY_PROVISIONING_FILE} PLUGINS ${_ctk_testinfrastructure_plugins} ${_ctk_test_plugins} ) if(${CMAKE_PROJECT_NAME}_PLUGIN_LIBRARIES) add_dependencies(BlueBerry ${${CMAKE_PROJECT_NAME}_PLUGIN_LIBRARIES}) endif() set_property(TARGET ${${CMAKE_PROJECT_NAME}_PLUGIN_LIBRARIES} PROPERTY LABELS BlueBerry) -SET(BB_PLUGIN_USE_FILE "${BlueBerry_BINARY_DIR}/BlueBerryPluginUseFile.cmake") -IF(${PROJECT_NAME}_PLUGIN_LIBRARIES) +set(BB_PLUGIN_USE_FILE "${BlueBerry_BINARY_DIR}/BlueBerryPluginUseFile.cmake") +if(${PROJECT_NAME}_PLUGIN_LIBRARIES) ctkFunctionGeneratePluginUseFile(${BB_PLUGIN_USE_FILE}) -ELSE() - FILE(REMOVE ${BB_PLUGIN_USE_FILE}) - SET(BB_PLUGIN_USE_FILE ) -ENDIF() +else() + file(REMOVE ${BB_PLUGIN_USE_FILE}) + set(BB_PLUGIN_USE_FILE ) +endif() # CTK Plugin Exports -SET(BB_PLUGIN_EXPORTS_FILE "${CMAKE_CURRENT_BINARY_DIR}/BlueBerryPluginExports.cmake") +set(BB_PLUGIN_EXPORTS_FILE "${CMAKE_CURRENT_BINARY_DIR}/BlueBerryPluginExports.cmake") GetMyTargetLibraries("${${PROJECT_NAME}_PLUGIN_LIBRARIES}" my_plugin_targets) -SET(additional_export_targets mbilog PocoFoundation PocoUtil PocoXML) -IF(BLUEBERRY_BUILD_TESTING) - LIST(APPEND additional_export_targets CppUnit) -ENDIF() +set(additional_export_targets mbilog PocoFoundation PocoUtil PocoXML) +if(BLUEBERRY_BUILD_TESTING) + list(APPEND additional_export_targets CppUnit) +endif() export(TARGETS ${my_plugin_targets} ${additional_export_targets} FILE ${BB_PLUGIN_EXPORTS_FILE}) -ADD_SUBDIRECTORY(Documentation) +add_subdirectory(Documentation) -CONFIGURE_FILE(BlueBerryConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/BlueBerryConfig.cmake @ONLY) +configure_file(BlueBerryConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/BlueBerryConfig.cmake @ONLY) diff --git a/BlueBerry/Documentation/CMakeLists.txt b/BlueBerry/Documentation/CMakeLists.txt index a04e357b2b..3114734fc9 100755 --- a/BlueBerry/Documentation/CMakeLists.txt +++ b/BlueBerry/Documentation/CMakeLists.txt @@ -1,86 +1,86 @@ # # Variables: # BLUEBERRY_DOCS_OUTPUT_DIR: documentation output directory (optional) -ADD_SUBDIRECTORY(snippets) +add_subdirectory(snippets) -FIND_PACKAGE(Doxygen) +find_package(Doxygen) -IF(DOXYGEN_FOUND) +if(DOXYGEN_FOUND) -OPTION(USE_DOT "Use dot program for generating graphical class diagrams with doxygen, if available" ON) -MARK_AS_ADVANCED(USE_DOT) +option(USE_DOT "Use dot program for generating graphical class diagrams with doxygen, if available" ON) +mark_as_advanced(USE_DOT) -SET(HAVE_DOT "NO") -IF(DOXYGEN_DOT_EXECUTABLE AND USE_DOT) - SET(HAVE_DOT "YES") -ENDIF() +set(HAVE_DOT "NO") +if(DOXYGEN_DOT_EXECUTABLE AND USE_DOT) + set(HAVE_DOT "YES") +endif() -SET(BLUEBERRY_DOCS_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH "BlueBerry output directory for all generated documentation.") -SET(BLUEBERRY_DOXYGEN_OUTPUT_DIR ${BLUEBERRY_DOCS_OUTPUT_DIR}/reference/api CACHE INTERNAL "BlueBerry doxygen output directory") -SET(BLUEBERRY_XPDOC_OUTPUT_DIR ${BLUEBERRY_DOCS_OUTPUT_DIR}/reference/extension-points) +set(BLUEBERRY_DOCS_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH "BlueBerry output directory for all generated documentation.") +set(BLUEBERRY_DOXYGEN_OUTPUT_DIR ${BLUEBERRY_DOCS_OUTPUT_DIR}/reference/api CACHE INTERNAL "BlueBerry doxygen output directory") +set(BLUEBERRY_XPDOC_OUTPUT_DIR ${BLUEBERRY_DOCS_OUTPUT_DIR}/reference/extension-points) -SET(BLUEBERRY_DOXYGEN_TAGFILE_NAME ${BLUEBERRY_DOXYGEN_OUTPUT_DIR}/BlueBerry.tag CACHE INTERNAL "BlueBerry Doxygen tag file") +set(BLUEBERRY_DOXYGEN_TAGFILE_NAME ${BLUEBERRY_DOXYGEN_OUTPUT_DIR}/BlueBerry.tag CACHE INTERNAL "BlueBerry Doxygen tag file") # This is relative to the working directory of the doxygen command -SET(BLUEBERRY_DOXYGEN_STYLESHEET bb_doxygen.css) -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${BLUEBERRY_DOXYGEN_STYLESHEET} +set(BLUEBERRY_DOXYGEN_STYLESHEET bb_doxygen.css) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${BLUEBERRY_DOXYGEN_STYLESHEET} ${CMAKE_CURRENT_BINARY_DIR}/${BLUEBERRY_DOXYGEN_STYLESHEET} @COPYONLY) -FILE(RELATIVE_PATH BLUEBERRY_DOXYGEN_XP_RELATIVEDIR ${BLUEBERRY_DOXYGEN_OUTPUT_DIR}/html ${BLUEBERRY_XPDOC_OUTPUT_DIR}/) - -SET(_doxygen_qt4bundles ) -SET(_doxygen_bundles ) -SET(_doxygen_binary_qt4bundles ) -SET(_doxygen_binary_bundles ) -FILE(GLOB _bundle_dirs RELATIVE "${BLUEBERRY_PLUGINS_SOURCE_DIR}" "${BLUEBERRY_PLUGINS_SOURCE_DIR}/*") -FOREACH(_bundle_dir ${_bundle_dirs}) - STRING(REGEX MATCH "^\\..*" _matched_hidden "${_bundle_dir}") - IF(NOT _matched_hidden) - IF(IS_DIRECTORY "${BLUEBERRY_PLUGINS_SOURCE_DIR}/${_bundle_dir}") - STRING(REGEX MATCH ".*\\.qt.*" _matched "${_bundle_dir}") - IF(_matched) - IF(QT4_FOUND) - SET(_doxygen_qt4bundles "${_doxygen_qt4bundles} \"${BLUEBERRY_PLUGINS_SOURCE_DIR}/${_bundle_dir}\"") - SET(_doxygen_binary_qt4bundles "${_doxygen_binary_qt4bundles} \"${BLUEBERRY_PLUGINS_BINARY_DIR}/${_bundle_dir}\"") - ENDIF() - ELSE() - SET(_doxygen_bundles "${_doxygen_bundles} \"${BLUEBERRY_PLUGINS_SOURCE_DIR}/${_bundle_dir}\"") - SET(_doxygen_binary_bundles "${_doxygen_binary_bundles} \"${BLUEBERRY_PLUGINS_BINARY_DIR}/${_bundle_dir}\"") - ENDIF() - ENDIF() - ENDIF() -ENDFOREACH() +file(RELATIVE_PATH BLUEBERRY_DOXYGEN_XP_RELATIVEDIR ${BLUEBERRY_DOXYGEN_OUTPUT_DIR}/html ${BLUEBERRY_XPDOC_OUTPUT_DIR}/) + +set(_doxygen_qt4bundles ) +set(_doxygen_bundles ) +set(_doxygen_binary_qt4bundles ) +set(_doxygen_binary_bundles ) +file(GLOB _bundle_dirs RELATIVE "${BLUEBERRY_PLUGINS_SOURCE_DIR}" "${BLUEBERRY_PLUGINS_SOURCE_DIR}/*") +foreach(_bundle_dir ${_bundle_dirs}) + string(REGEX MATCH "^\\..*" _matched_hidden "${_bundle_dir}") + if(NOT _matched_hidden) + if(IS_DIRECTORY "${BLUEBERRY_PLUGINS_SOURCE_DIR}/${_bundle_dir}") + string(REGEX MATCH ".*\\.qt.*" _matched "${_bundle_dir}") + if(_matched) + if(QT4_FOUND) + set(_doxygen_qt4bundles "${_doxygen_qt4bundles} \"${BLUEBERRY_PLUGINS_SOURCE_DIR}/${_bundle_dir}\"") + set(_doxygen_binary_qt4bundles "${_doxygen_binary_qt4bundles} \"${BLUEBERRY_PLUGINS_BINARY_DIR}/${_bundle_dir}\"") + endif() + else() + set(_doxygen_bundles "${_doxygen_bundles} \"${BLUEBERRY_PLUGINS_SOURCE_DIR}/${_bundle_dir}\"") + set(_doxygen_binary_bundles "${_doxygen_binary_bundles} \"${BLUEBERRY_PLUGINS_BINARY_DIR}/${_bundle_dir}\"") + endif() + endif() + endif() +endforeach() # Compile a doxygen input filter for processing CMake scripts -INCLUDE(FunctionCMakeDoxygenFilterCompile) +include(FunctionCMakeDoxygenFilterCompile) FunctionCMakeDoxygenFilterCompile(NAMESPACE "CMake") -CONFIGURE_FILE(doxygen.conf.in +configure_file(doxygen.conf.in ${CMAKE_CURRENT_BINARY_DIR}/doxygen.conf) -CONFIGURE_FILE(reference/extension-points/index.dox.in +configure_file(reference/extension-points/index.dox.in ${CMAKE_CURRENT_BINARY_DIR}/reference/extension-points/index.dox) -FIND_PACKAGE(Doxygen) +find_package(Doxygen) -ADD_CUSTOM_TARGET(BlueBerryDoc +add_custom_target(BlueBerryDoc ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.conf WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${_BlueBerryDoc_depends} ) # convert the extension points schema files into html -IF(ANT_FOUND AND BLUEBERRY_DOC_TOOLS_DIR) - FILE(GLOB_RECURSE _plugin_xmls ${BLUEBERRY_PLUGINS_SOURCE_DIR}/plugin.xml) +if(ANT_FOUND AND BLUEBERRY_DOC_TOOLS_DIR) + file(GLOB_RECURSE _plugin_xmls ${BLUEBERRY_PLUGINS_SOURCE_DIR}/plugin.xml) MACRO_CONVERT_SCHEMA(INPUT ${_plugin_xmls} OUTPUT_DIR "${BLUEBERRY_XPDOC_OUTPUT_DIR}" TARGET_NAME BlueBerryXPDoc ) - ADD_DEPENDENCIES(BlueBerryDoc BlueBerryXPDoc) -ENDIF(ANT_FOUND AND BLUEBERRY_DOC_TOOLS_DIR) + add_dependencies(BlueBerryDoc BlueBerryXPDoc) +endif(ANT_FOUND AND BLUEBERRY_DOC_TOOLS_DIR) -CONFIGURE_FILE(schema.css ${BLUEBERRY_DOCS_OUTPUT_DIR}/schema.css) +configure_file(schema.css ${BLUEBERRY_DOCS_OUTPUT_DIR}/schema.css) -ENDIF(DOXYGEN_FOUND) +endif(DOXYGEN_FOUND) diff --git a/BlueBerry/Testing/org.blueberry.core.runtime.tests/CMakeLists.txt b/BlueBerry/Testing/org.blueberry.core.runtime.tests/CMakeLists.txt index 2379d1c87c..0a282f2599 100644 --- a/BlueBerry/Testing/org.blueberry.core.runtime.tests/CMakeLists.txt +++ b/BlueBerry/Testing/org.blueberry.core.runtime.tests/CMakeLists.txt @@ -1,10 +1,10 @@ -PROJECT(org_blueberry_core_runtime_tests) +project(org_blueberry_core_runtime_tests) MACRO_CREATE_CTK_PLUGIN( EXPORT_DIRECTIVE BERRY_RUNTIME_TESTS TEST_PLUGIN ) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} optimized CppUnit debug CppUnitd) +target_link_libraries(${PROJECT_NAME} optimized CppUnit debug CppUnitd) MACRO_TEST_PLUGIN() diff --git a/BlueBerry/Testing/org.blueberry.core.runtime.tests/files.cmake b/BlueBerry/Testing/org.blueberry.core.runtime.tests/files.cmake index aa3a07037b..57a8e7e1bb 100644 --- a/BlueBerry/Testing/org.blueberry.core.runtime.tests/files.cmake +++ b/BlueBerry/Testing/org.blueberry.core.runtime.tests/files.cmake @@ -1,30 +1,30 @@ -SET(MOC_H_FILES +set(MOC_H_FILES src/berryCoreRuntimeTestSuite.h src/berryPluginActivator.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml ) -SET(SRC_CPP_FILES +set(SRC_CPP_FILES berryCoreRuntimeTestSuite.cpp berryPreferencesServiceTest.cpp berryPreferencesTest.cpp berryPluginActivator.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/BlueBerry/Testing/org.blueberry.osgi.tests/CMakeLists.txt b/BlueBerry/Testing/org.blueberry.osgi.tests/CMakeLists.txt index 13b9520b89..99b854c408 100755 --- a/BlueBerry/Testing/org.blueberry.osgi.tests/CMakeLists.txt +++ b/BlueBerry/Testing/org.blueberry.osgi.tests/CMakeLists.txt @@ -1,10 +1,10 @@ -PROJECT(org_blueberry_osgi_tests) +project(org_blueberry_osgi_tests) MACRO_CREATE_CTK_PLUGIN( EXPORT_DIRECTIVE BERRY_OSGI_TESTS TEST_PLUGIN ) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} optimized CppUnit debug CppUnitd) +target_link_libraries(${PROJECT_NAME} optimized CppUnit debug CppUnitd) MACRO_TEST_PLUGIN() diff --git a/BlueBerry/Testing/org.blueberry.osgi.tests/files.cmake b/BlueBerry/Testing/org.blueberry.osgi.tests/files.cmake index 9652d61110..c5cecd9412 100644 --- a/BlueBerry/Testing/org.blueberry.osgi.tests/files.cmake +++ b/BlueBerry/Testing/org.blueberry.osgi.tests/files.cmake @@ -1,31 +1,31 @@ -SET(MOC_H_FILES +set(MOC_H_FILES src/berryOSGiCoreTestSuite.h src/berryPluginActivator.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml ) -SET(SRC_CPP_FILES +set(SRC_CPP_FILES berryMessageTest.cpp berryObjectTest.cpp berryOSGiCoreTestSuite.cpp berryPluginActivator.cpp berrySmartPointerTest.cpp berryWeakPointerTest.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/BlueBerry/Testing/org.blueberry.ui.tests/CMakeLists.txt b/BlueBerry/Testing/org.blueberry.ui.tests/CMakeLists.txt index fda114b3f2..a2725ec76b 100644 --- a/BlueBerry/Testing/org.blueberry.ui.tests/CMakeLists.txt +++ b/BlueBerry/Testing/org.blueberry.ui.tests/CMakeLists.txt @@ -1,12 +1,12 @@ -PROJECT(org_blueberry_ui_tests) +project(org_blueberry_ui_tests) MACRO_CREATE_CTK_PLUGIN( EXPORT_DIRECTIVE BERRY_UI_TESTS TEST_PLUGIN ) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} optimized CppUnit debug CppUnitd) +target_link_libraries(${PROJECT_NAME} optimized CppUnit debug CppUnitd) -ADD_DEPENDENCIES(${PROJECT_NAME} org_blueberry_ui_qt) +add_dependencies(${PROJECT_NAME} org_blueberry_ui_qt) MACRO_TEST_UIPLUGIN() diff --git a/BlueBerry/Testing/org.blueberry.ui.tests/files.cmake b/BlueBerry/Testing/org.blueberry.ui.tests/files.cmake index 23130e5eef..5103c91a50 100644 --- a/BlueBerry/Testing/org.blueberry.ui.tests/files.cmake +++ b/BlueBerry/Testing/org.blueberry.ui.tests/files.cmake @@ -1,45 +1,45 @@ -SET(MOC_H_FILES +set(MOC_H_FILES src/berryPluginActivator.h src/berryUiTestSuite.h src/api/berryMockViewPart.h src/api/berrySaveableMockViewPart.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml icons/view.gif ) -SET(SRC_CPP_FILES +set(SRC_CPP_FILES berryPluginActivator.cpp berryUiTestSuite.cpp # API Tests api/berryIPageLayoutTest.cpp api/berryIViewPartTest.cpp api/berryIWorkbenchPartTest.cpp api/berryMockSelectionProvider.cpp api/berryMockViewPart.cpp api/berryMockWorkbenchPart.cpp api/berrySaveableMockViewPart.cpp api/berryUiApiTestSuite.cpp api/berryXMLMementoTest.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Build/Tools/BundleGenerator/BundleDefaults.cmake b/Build/Tools/BundleGenerator/BundleDefaults.cmake index 73d32150c2..8fac34c9e8 100755 --- a/Build/Tools/BundleGenerator/BundleDefaults.cmake +++ b/Build/Tools/BundleGenerator/BundleDefaults.cmake @@ -1,30 +1,30 @@ -SET(BUNDLE_NAMESPACE "") -SET(DEFAULT_REQUIRED_BUNDLES "org.mitk.core.services") -SET(DEFAULT_REQUIRED_BUNDLES_FOR_GUI "org.mitk.gui.qt.common") -SET(DEFAULT_PLUGIN_VERSION "0.1") -SET(DEFAULT_PLUGIN_VENDOR "DKFZ, Medical and Biological Informatics") -SET(DEFAULT_VIEW_BASEID "org.mitk.views.") -SET(DEFAULT_VIEW_CLASS_BEGIN "Qmitk") -SET(DEFAULT_VIEW_BASE_CLASS "QmitkFunctionality") -SET(DEFAULT_VIEW_BASE_CLASS_H "QmitkFunctionality.h") -SET(PROJECT_STATIC_VAR "MITK_STATIC") -SET(DOXYGEN_INGROUP "MITKPlugins") -SET(DEFAULT_CREATE_PLUGIN_MACRO "MACRO_CREATE_MITK_PLUGIN()") -SET(DEFAULT_CREATE_GUI_PLUGIN_MACRO "MACRO_CREATE_MITK_PLUGIN(QmitkExt)") -SET(PLUGIN_TEMPLATE "${PROJECT_SOURCE_DIR}/../../../CMake/QBundleTemplate" CACHE PATH "Path to the plugin templates" FORCE) -SET(PLUGIN_COPYRIGHT "/*========================================================================= +set(BUNDLE_NAMESPACE "") +set(DEFAULT_REQUIRED_BUNDLES "org.mitk.core.services") +set(DEFAULT_REQUIRED_BUNDLES_FOR_GUI "org.mitk.gui.qt.common") +set(DEFAULT_PLUGIN_VERSION "0.1") +set(DEFAULT_PLUGIN_VENDOR "DKFZ, Medical and Biological Informatics") +set(DEFAULT_VIEW_BASEID "org.mitk.views.") +set(DEFAULT_VIEW_CLASS_BEGIN "Qmitk") +set(DEFAULT_VIEW_BASE_CLASS "QmitkFunctionality") +set(DEFAULT_VIEW_BASE_CLASS_H "QmitkFunctionality.h") +set(PROJECT_STATIC_VAR "MITK_STATIC") +set(DOXYGEN_INGROUP "MITKPlugins") +set(DEFAULT_CREATE_PLUGIN_MACRO "MACRO_CREATE_MITK_PLUGIN()") +set(DEFAULT_CREATE_GUI_PLUGIN_MACRO "MACRO_CREATE_MITK_PLUGIN(QmitkExt)") +set(PLUGIN_TEMPLATE "${PROJECT_SOURCE_DIR}/../../../CMake/QBundleTemplate" CACHE PATH "Path to the plugin templates" FORCE) +set(PLUGIN_COPYRIGHT "/*========================================================================= Program: Medical Imaging & Interaction Toolkit Language: C++ Date: $Date$ Version: $Revision$ Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. See MITKCopyright.txt or http://www.mitk.org/copyright.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/") diff --git a/Build/Tools/BundleGenerator/CMakeLists.txt b/Build/Tools/BundleGenerator/CMakeLists.txt index 8f10143818..853e0271fd 100755 --- a/Build/Tools/BundleGenerator/CMakeLists.txt +++ b/Build/Tools/BundleGenerator/CMakeLists.txt @@ -1,9 +1,9 @@ -PROJECT(MITKBundleGenerator) +project(MITKBundleGenerator) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +cmake_minimum_required(VERSION 2.6) -SET(BUNDLE_DEFAULTS_FILE "${CMAKE_CURRENT_SOURCE_DIR}/BundleDefaults.cmake") +set(BUNDLE_DEFAULTS_FILE "${CMAKE_CURRENT_SOURCE_DIR}/BundleDefaults.cmake") -ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/../../../BlueBerry/Build/BundleGenerator" +add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../../../BlueBerry/Build/BundleGenerator" "${CMAKE_CURRENT_BINARY_DIR}/Generated") -#INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../../../Utilities/BlueBerry/Build/CMakeLists.txt) \ No newline at end of file +#include(${CMAKE_CURRENT_SOURCE_DIR}/../../../Utilities/BlueBerry/Build/CMakeLists.txt) \ No newline at end of file diff --git a/Build/Tools/FunctionalityGenerator/CMakeLists.txt b/Build/Tools/FunctionalityGenerator/CMakeLists.txt index 4f20be2d5e..0ee48848a8 100644 --- a/Build/Tools/FunctionalityGenerator/CMakeLists.txt +++ b/Build/Tools/FunctionalityGenerator/CMakeLists.txt @@ -1,30 +1,30 @@ -PROJECT(FunctionalityGenerator) +project(FunctionalityGenerator) -SET(GENERATE_FUNCTIONALITY OFF CACHE BOOL "Turn this on for final generation of functionality") -SET(FUNCTIONALITY_NAME "" CACHE STRING "Name of the new functionality") -FIND_FILE(FUNCTIONALITY_TEMPLATE QmitkFunctionalityTemplate +set(GENERATE_FUNCTIONALITY OFF CACHE BOOL "Turn this on for final generation of functionality") +set(FUNCTIONALITY_NAME "" CACHE STRING "Name of the new functionality") +find_file(FUNCTIONALITY_TEMPLATE QmitkFunctionalityTemplate ${PROJECT_SOURCE_DIR}/../../../CMake DOC "Path to the functionality template") -SET(FUNCTIONALITY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${FUNCTIONALITY_NAME}) +set(FUNCTIONALITY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${FUNCTIONALITY_NAME}) -IF(GENERATE_FUNCTIONALITY) - IF(FUNCTIONALITY_TEMPLATE) - MESSAGE("Generating ${FUNCTIONALITY_NAME} from template ${FUNCTIONALITY_TEMPLATE} in directory ${FUNCTIONALITY_DIR} ...") - FILE(GLOB_RECURSE TEMPLATE_FILES RELATIVE ${FUNCTIONALITY_TEMPLATE} ${FUNCTIONALITY_TEMPLATE}/*) - FOREACH(F ${TEMPLATE_FILES}) - IF(NOT F MATCHES ".svn/") - STRING(REPLACE QmitkFunctionalityTemplate ${FUNCTIONALITY_NAME} NEW_RELPATH ${F}) - MESSAGE(STATUS "Generating ${FUNCTIONALITY_DIR}/${NEW_RELPATH}") - IF(EXISTS ${FUNCTIONALITY_DIR}/${NEW_RELPATH}) - MESSAGE(FATAL_ERROR "Won't overwrite existing functionality. Please remove all files from ${FUNCTIONALITY_DIR}!") - ENDIF(EXISTS ${FUNCTIONALITY_DIR}/${NEW_RELPATH}) - CONFIGURE_FILE(${FUNCTIONALITY_TEMPLATE}/${F} ${FUNCTIONALITY_DIR}/${NEW_RELPATH} @ONLY) - ENDIF(NOT F MATCHES ".svn/") - ENDFOREACH(F) - SET(GENERATE_FUNCTIONALITY OFF CACHE BOOL "Turn this on for final generation of functionality" FORCE) - MESSAGE("New Functionality \"${FUNCTIONALITY_NAME}\" has been generated in \"${FUNCTIONALITY_DIR}\"." +if(GENERATE_FUNCTIONALITY) + if(FUNCTIONALITY_TEMPLATE) + message("Generating ${FUNCTIONALITY_NAME} from template ${FUNCTIONALITY_TEMPLATE} in directory ${FUNCTIONALITY_DIR} ...") + file(GLOB_RECURSE TEMPLATE_FILES RELATIVE ${FUNCTIONALITY_TEMPLATE} ${FUNCTIONALITY_TEMPLATE}/*) + foreach(F ${TEMPLATE_FILES}) + if(NOT F MATCHES ".svn/") + string(REPLACE QmitkFunctionalityTemplate ${FUNCTIONALITY_NAME} NEW_RELPATH ${F}) + message(STATUS "Generating ${FUNCTIONALITY_DIR}/${NEW_RELPATH}") + if(EXISTS ${FUNCTIONALITY_DIR}/${NEW_RELPATH}) + message(FATAL_ERROR "Won't overwrite existing functionality. Please remove all files from ${FUNCTIONALITY_DIR}!") + endif(EXISTS ${FUNCTIONALITY_DIR}/${NEW_RELPATH}) + configure_file(${FUNCTIONALITY_TEMPLATE}/${F} ${FUNCTIONALITY_DIR}/${NEW_RELPATH} @ONLY) + endif(NOT F MATCHES ".svn/") + endforeach(F) + set(GENERATE_FUNCTIONALITY OFF CACHE BOOL "Turn this on for final generation of functionality" FORCE) + message("New Functionality \"${FUNCTIONALITY_NAME}\" has been generated in \"${FUNCTIONALITY_DIR}\"." "Add this directory to QFunctionalities to add it to the MainApp!") - ENDIF(FUNCTIONALITY_TEMPLATE) -ENDIF(GENERATE_FUNCTIONALITY) + endif(FUNCTIONALITY_TEMPLATE) +endif(GENERATE_FUNCTIONALITY) diff --git a/Build/Tools/Xml2Const/CMakeLists.txt b/Build/Tools/Xml2Const/CMakeLists.txt index b8b76c162c..f68b163ea4 100644 --- a/Build/Tools/Xml2Const/CMakeLists.txt +++ b/Build/Tools/Xml2Const/CMakeLists.txt @@ -1,2 +1,2 @@ -ADD_EXECUTABLE(xml2const xml2const.cpp) +add_executable(xml2const xml2const.cpp) diff --git a/CMake/CTestCustom.cmake.in b/CMake/CTestCustom.cmake.in index 8a7311dd07..8d4b42b06c 100644 --- a/CMake/CTestCustom.cmake.in +++ b/CMake/CTestCustom.cmake.in @@ -1,86 +1,86 @@ -SET(CTEST_CUSTOM_COVERAGE_EXCLUDE +set(CTEST_CUSTOM_COVERAGE_EXCLUDE ${CTEST_CUSTOM_COVERAGE_EXCLUDE} # Exclude try_compile sources from coverage results: "/CMakeFiles/CMakeTmp/" # Exclude files generated by the moc pre-compiler ".*/moc_.*" # Exclude files generated by the uic pre-compiler ".*/ui_.*" # Exclude files from the Testing directories ".*/Testing/.*" ".*/CMakeExternals/.*" ) # The following tests should not be run under valgrind -SET(CTEST_CUSTOM_MEMCHECK_IGNORE +set(CTEST_CUSTOM_MEMCHECK_IGNORE ) -SET(CTEST_CUSTOM_ERROR_MATCH +set(CTEST_CUSTOM_ERROR_MATCH ${CTEST_CUSTOM_ERROR_MATCH} "CMake Error[ :]" ) -SET(CTEST_CUSTOM_WARNING_MATCH +set(CTEST_CUSTOM_WARNING_MATCH ${CTEST_CUSTOM_WARNING_MATCH} "CMake Warning[ :]" ) -SET(CTEST_CUSTOM_WARNING_EXCEPTION +set(CTEST_CUSTOM_WARNING_EXCEPTION ${CTEST_CUSTOM_WARNING_EXCEPTION} # MITK Utilities "Utilities/Poco/" "Utilities/qwt/" "Utilities/qxt" "Utilities/tinyxml/" # kwstyle suppressions "[Kk][Ww][Ss]tyle.*kws.*cxx" "[Kk][Ww][Ss]tyle.*kws.*h" "[Kk][Ww][Ss]tyle.*metaCommand.*cxx" # vtk suppressions "vtkfreetype" "Utilities.vtktiff" "VTK.*IO.vtkMySQLQuery.cxx" "VTK.*Utilities.vtkexodus2" "VTK.*Utilities.vtklibproj" "VTK.*Utilities.vtksqlite" "VTK.*Utilities.vtkmetaio" "VTK.*warn_unused_result" "VTK.*Filtering.*cxx" "VTK.*IO.*cxx" "VTK.*Infovis.*cxx" # qt suppressions from vtk... # Some VTK dashboards include building bits of Qt which produce lots of # the following warnings when built with the MS compilers. Qt guys should # fix their code. Until they do, keep the Qt chatter off the VTK dashboard # results: "include.[Qq]t([Cc]ore|[Gg]ui).*warning C4127: conditional expression is constant" "[Qq]t.*h.*warning.*declaration of .* shadows a member of .this" "[Qq]t.*h.*warning.*(copy constructor|assignment operator) could not be generated" # Suppress warning caused when QT 'foreach' loops are combined ".*warning: declaration of '_container_' shadows a previous local" # PythonQt suppressions "PythonQt.*src.*PythonQt.*(cpp|h)" "include.PythonQt.PythonQt.*h" # Suppressing warnings about duplicate libraries in Darwin # At some point this may be addressed by CMake feature request: # http://public.kitware.com/Bug/view.php?id=10179 "ld: warning: duplicate dylib.*" # Visual studio spurious warnings... "The following environment variables were not found" ) diff --git a/CMake/FindDCMTK.cmake b/CMake/FindDCMTK.cmake index 9750db2505..bd1f3b7ab0 100644 --- a/CMake/FindDCMTK.cmake +++ b/CMake/FindDCMTK.cmake @@ -1,157 +1,157 @@ # adapted version of FindDCMTK, better suited for super-builds # - find DCMTK libraries and applications # # DCMTK_INCLUDE_DIRS - Directories to include to use DCMTK # DCMTK_LIBRARIES - Files to link against to use DCMTK # DCMTK_FOUND - If false, don't try to use DCMTK # DCMTK_DIR - (optional) Source directory for DCMTK # # DCMTK_DIR can be used to make it simpler to find the various include # directories and compiled libraries if you've just compiled it in the # source tree. Just set it to the root of the tree where you extracted # the source (default to /usr/include/dcmtk/) #============================================================================= # Copyright 2004-2009 Kitware, Inc. # Copyright 2009-2010 Mathieu Malaterre # Copyright 2010 Thomas Sondergaard # # Distributed under the OSI-approved BSD License (the "License"); # see accompanying file Copyright.txt for details. # # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. #============================================================================= # (To distributed this file outside of CMake, substitute the full # License text for the above reference.) # # Written for VXL by Amitha Perera. # Upgraded for GDCM by Mathieu Malaterre. # Modified for EasyViz by Thomas Sondergaard. # # prefer DCMTK_DIR over default system paths like /usr/lib -SET(CMAKE_PREFIX_PATH ${DCMTK_DIR}/lib ${CMAKE_PREFIX_PATH}) # this is given to FIND_LIBRARY or FIND_PATH +set(CMAKE_PREFIX_PATH ${DCMTK_DIR}/lib ${CMAKE_PREFIX_PATH}) # this is given to FIND_LIBRARY or FIND_PATH if(NOT DCMTK_FOUND AND NOT DCMTK_DIR) set(DCMTK_DIR "/usr/include/dcmtk/" CACHE PATH "Root of DCMTK source tree (optional).") mark_as_advanced(DCMTK_DIR) endif() foreach(lib dcmdata dcmimage dcmimgle dcmjpeg dcmnet dcmpstat dcmqrdb dcmsign dcmsr dcmtls ijg12 ijg16 ijg8 oflog ofstd) find_library(DCMTK_${lib}_LIBRARY ${lib} PATHS ${DCMTK_DIR}/${lib}/libsrc ${DCMTK_DIR}/${lib}/libsrc/Release ${DCMTK_DIR}/${lib}/libsrc/Debug ${DCMTK_DIR}/${lib}/Release ${DCMTK_DIR}/${lib}/Debug ${DCMTK_DIR}/lib NO_DEFAULT_PATH ) mark_as_advanced(DCMTK_${lib}_LIBRARY) #message("** DCMTKs ${lib} found at ${DCMTK_${lib}_LIBRARY}") if(DCMTK_${lib}_LIBRARY) list(APPEND DCMTK_LIBRARIES ${DCMTK_${lib}_LIBRARY}) endif() endforeach() set(DCMTK_config_TEST_HEADER osconfig.h) set(DCMTK_dcmdata_TEST_HEADER dctypes.h) set(DCMTK_dcmimage_TEST_HEADER dicoimg.h) set(DCMTK_dcmimgle_TEST_HEADER dcmimage.h) set(DCMTK_dcmjpeg_TEST_HEADER djdecode.h) set(DCMTK_dcmnet_TEST_HEADER assoc.h) set(DCMTK_dcmpstat_TEST_HEADER dcmpstat.h) set(DCMTK_dcmqrdb_TEST_HEADER dcmqrdba.h) set(DCMTK_dcmsign_TEST_HEADER sicert.h) set(DCMTK_dcmsr_TEST_HEADER dsrtree.h) set(DCMTK_dcmtls_TEST_HEADER tlslayer.h) set(DCMTK_ofstd_TEST_HEADER ofstdinc.h) foreach(dir config dcmdata dcmimage dcmimgle dcmjpeg dcmnet dcmpstat dcmqrdb dcmsign dcmsr dcmtls ofstd) find_path(DCMTK_${dir}_INCLUDE_DIR ${DCMTK_${dir}_TEST_HEADER} PATHS ${DCMTK_DIR}/${dir}/include ${DCMTK_DIR}/${dir} ${DCMTK_DIR}/include/dcmtk/${dir} ${DCMTK_DIR}/include/${dir}) mark_as_advanced(DCMTK_${dir}_INCLUDE_DIR) #message("** DCMTKs ${dir} found at ${DCMTK_${dir}_INCLUDE_DIR}") if(DCMTK_${dir}_INCLUDE_DIR) list(APPEND DCMTK_INCLUDE_DIRS ${DCMTK_${dir}_INCLUDE_DIR}) endif() endforeach() if(WIN32) list(APPEND DCMTK_LIBRARIES netapi32 wsock32) endif() if(DCMTK_ofstd_INCLUDE_DIR) get_filename_component(DCMTK_dcmtk_INCLUDE_DIR ${DCMTK_ofstd_INCLUDE_DIR} PATH CACHE) list(APPEND DCMTK_INCLUDE_DIRS ${DCMTK_dcmtk_INCLUDE_DIR}) mark_as_advanced(DCMTK_dcmtk_INCLUDE_DIR) endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(DCMTK DEFAULT_MSG DCMTK_config_INCLUDE_DIR DCMTK_ofstd_INCLUDE_DIR DCMTK_ofstd_LIBRARY DCMTK_dcmdata_INCLUDE_DIR DCMTK_dcmdata_LIBRARY DCMTK_dcmimgle_INCLUDE_DIR DCMTK_dcmimgle_LIBRARY) # Compatibility: This variable is deprecated set(DCMTK_INCLUDE_DIR ${DCMTK_INCLUDE_DIRS}) diff --git a/CMake/FindGit.cmake b/CMake/FindGit.cmake index 97b4815eaf..8b65ce6dde 100644 --- a/CMake/FindGit.cmake +++ b/CMake/FindGit.cmake @@ -1,80 +1,80 @@ # # FindGit # -SET(git_candidates git eg) +set(git_candidates git eg) -IF(WIN32) - LIST(APPEND git_candidates eg.cmd) - IF(NOT MSYS) +if(WIN32) + list(APPEND git_candidates eg.cmd) + if(NOT MSYS) # We don't append git.cmd, since it does not correctly return # exit codes, see http://code.google.com/p/msysgit/issues/detail?id=428 - LIST(APPEND git_candidates git.cmd) - ENDIF() -ENDIF() + list(APPEND git_candidates git.cmd) + endif() +endif() -FIND_PROGRAM(GIT_EXECUTABLE ${git_candidates} +find_program(GIT_EXECUTABLE ${git_candidates} PATHS "C:/Program Files/Git/bin" "C:/Program Files (x86)/Git/bin" DOC "git command line client") -MARK_AS_ADVANCED(GIT_EXECUTABLE) +mark_as_advanced(GIT_EXECUTABLE) -IF(GIT_EXECUTABLE) +if(GIT_EXECUTABLE) - MACRO(GIT_IS_REPO dir result_var) - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} status + macro(GIT_IS_REPO dir result_var) + execute_process(COMMAND ${GIT_EXECUTABLE} status WORKING_DIRECTORY ${dir} RESULT_VARIABLE GIT_error OUTPUT_QUIET ERROR_QUIET) if(GIT_error EQUAL 0) - SET(${result_var} 1) - ELSE() - SET(${result_var} 0) - ENDIF() - ENDMACRO() + set(${result_var} 1) + else() + set(${result_var} 0) + endif() + endmacro() - MACRO(GIT_WC_INFO dir prefix) - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list -n 1 HEAD + macro(GIT_WC_INFO dir prefix) + execute_process(COMMAND ${GIT_EXECUTABLE} rev-list -n 1 HEAD WORKING_DIRECTORY ${dir} ERROR_VARIABLE GIT_error OUTPUT_VARIABLE ${prefix}_WC_REVISION_HASH OUTPUT_STRIP_TRAILING_WHITESPACE) - IF(NOT ${GIT_error} EQUAL 0) - MESSAGE(SEND_ERROR "Command \"${GIT_EXECUTBALE} rev-list -n 1 HEAD\" in directory ${dir} failed with output:\n${GIT_error}") - ELSE() - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} name-rev ${${prefix}_WC_REVISION_HASH} + if(NOT ${GIT_error} EQUAL 0) + message(SEND_ERROR "Command \"${GIT_EXECUTBALE} rev-list -n 1 HEAD\" in directory ${dir} failed with output:\n${GIT_error}") + else() + execute_process(COMMAND ${GIT_EXECUTABLE} name-rev ${${prefix}_WC_REVISION_HASH} WORKING_DIRECTORY ${dir} OUTPUT_VARIABLE ${prefix}_WC_REVISION_NAME OUTPUT_STRIP_TRAILING_WHITESPACE) - ENDIF() + endif() - SET(${prefix}_WC_GITSVN 0) + set(${prefix}_WC_GITSVN 0) # In case, git-svn is used, attempt to extract svn info - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} svn info + execute_process(COMMAND ${GIT_EXECUTABLE} svn info WORKING_DIRECTORY ${dir} ERROR_VARIABLE git_svn_info_error OUTPUT_VARIABLE ${prefix}_WC_INFO RESULT_VARIABLE git_svn_info_result OUTPUT_STRIP_TRAILING_WHITESPACE) - IF(${git_svn_info_result} EQUAL 0) - SET(${prefix}_WC_GITSVN 1) - STRING(REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*" + if(${git_svn_info_result} EQUAL 0) + set(${prefix}_WC_GITSVN 1) + string(REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*" "\\2" ${prefix}_WC_URL "${${prefix}_WC_INFO}") - STRING(REGEX REPLACE "^(.*\n)?Revision: ([^\n]+).*" + string(REGEX REPLACE "^(.*\n)?Revision: ([^\n]+).*" "\\2" ${prefix}_WC_REVISION "${${prefix}_WC_INFO}") - STRING(REGEX REPLACE "^(.*\n)?Last Changed Author: ([^\n]+).*" + string(REGEX REPLACE "^(.*\n)?Last Changed Author: ([^\n]+).*" "\\2" ${prefix}_WC_LAST_CHANGED_AUTHOR "${${prefix}_WC_INFO}") - STRING(REGEX REPLACE "^(.*\n)?Last Changed Rev: ([^\n]+).*" + string(REGEX REPLACE "^(.*\n)?Last Changed Rev: ([^\n]+).*" "\\2" ${prefix}_WC_LAST_CHANGED_REV "${${prefix}_WC_INFO}") - STRING(REGEX REPLACE "^(.*\n)?Last Changed Date: ([^\n]+).*" + string(REGEX REPLACE "^(.*\n)?Last Changed Date: ([^\n]+).*" "\\2" ${prefix}_WC_LAST_CHANGED_DATE "${${prefix}_WC_INFO}") - ENDIF() + endif() - ENDMACRO() -ENDIF() + endmacro() +endif() -INCLUDE(FindPackageHandleStandardArgs) +include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Git DEFAULT_MSG GIT_EXECUTABLE) diff --git a/CMake/MITKDashboardDriverScript.cmake b/CMake/MITKDashboardDriverScript.cmake index b0ecb0feea..8f634c7d96 100644 --- a/CMake/MITKDashboardDriverScript.cmake +++ b/CMake/MITKDashboardDriverScript.cmake @@ -1,486 +1,486 @@ # # Included from a dashboard script, this cmake file will drive the configure and build # steps of MITK # #----------------------------------------------------------------------------- # The following variable are expected to be define in the top-level script: set(expected_variables CTEST_NOTES_FILES CTEST_SITE CTEST_DASHBOARD_ROOT CTEST_CMAKE_COMMAND CTEST_CMAKE_GENERATOR WITH_MEMCHECK WITH_COVERAGE WITH_DOCUMENTATION CTEST_BUILD_CONFIGURATION CTEST_TEST_TIMEOUT CTEST_BUILD_FLAGS TEST_TO_EXCLUDE_REGEX CTEST_SOURCE_DIRECTORY CTEST_BINARY_DIRECTORY CTEST_BUILD_NAME SCRIPT_MODE CTEST_COVERAGE_COMMAND CTEST_MEMORYCHECK_COMMAND CTEST_GIT_COMMAND QT_QMAKE_EXECUTABLE PROJECT_BUILD_DIR SUPERBUILD_TARGETS ) foreach(var ${expected_variables}) if(NOT DEFINED ${var}) message(FATAL_ERROR "Variable ${var} should be defined in top-level script !") endif() endforeach() # Check if "mbits" is reachable file(DOWNLOAD "http://mbits" "${CTEST_SCRIPT_DIRECTORY}/mbits.html" TIMEOUT 2 STATUS _status) list(GET _status 0 _status_code) -if (_status_code EQUAL 6) # couldn't resovle host name +if(_status_code EQUAL 6) # couldn't resovle host name set(MBITS_AVAILABLE 0) else() set(MBITS_AVAILABLE 1) endif() # # Site specific options # if(NOT CDASH_ADMIN_URL_PREFIX AND MBITS_AVAILABLE) set(CDASH_ADMIN_URL_PREFIX "http://mbits") endif() if(NOT MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL AND MBITS_AVAILABLE) set(MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL "http://mbits/dl-cache") endif() -if (NOT DEFINED GIT_BRANCH OR GIT_BRANCH STREQUAL "") +if(NOT DEFINED GIT_BRANCH OR GIT_BRANCH STREQUAL "") set(GIT_BRANCH "") else() set(GIT_BRANCH "-b ${GIT_BRANCH}") endif() # Should binary directory be cleaned? set(empty_binary_directory FALSE) # Attempt to build and test also if 'ctest_update' returned an error set(initial_force_build FALSE) # Set model options set(model "") -if (SCRIPT_MODE STREQUAL "experimental") +if(SCRIPT_MODE STREQUAL "experimental") set(empty_binary_directory FALSE) set(initial_force_build TRUE) set(model Experimental) -elseif (SCRIPT_MODE STREQUAL "continuous") +elseif(SCRIPT_MODE STREQUAL "continuous") set(empty_binary_directory FALSE) set(initial_force_build FALSE) set(model Continuous) -elseif (SCRIPT_MODE STREQUAL "nightly") +elseif(SCRIPT_MODE STREQUAL "nightly") set(empty_binary_directory TRUE) set(initial_force_build TRUE) set(model Nightly) else() message(FATAL_ERROR "Unknown script mode: '${SCRIPT_MODE}'. Script mode should be either 'experimental', 'continuous' or 'nightly'") endif() #message("script_mode:${SCRIPT_MODE}") #message("model:${model}") #message("empty_binary_directory:${empty_binary_directory}") #message("force_build:${initial_force_build}") set(CTEST_CONFIGURATION_TYPE ${CTEST_BUILD_CONFIGURATION}) if(empty_binary_directory) message("Directory ${CTEST_BINARY_DIRECTORY} cleaned !") ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY}) endif() if(NOT DEFINED CTEST_CHECKOUT_DIR) set(CTEST_CHECKOUT_DIR ${CTEST_SOURCE_DIRECTORY}) endif() if(NOT EXISTS "${CTEST_CHECKOUT_DIR}") set(CTEST_CHECKOUT_COMMAND "\"${CTEST_GIT_COMMAND}\" clone ${GIT_BRANCH} ${GIT_REPOSITORY} \"${CTEST_CHECKOUT_DIR}\"") endif() set(CTEST_UPDATE_TYPE "git") set(CTEST_UPDATE_COMMAND "${CTEST_GIT_COMMAND}") #---------------------------------------------------------------------- # Utility macros #---------------------------------------------------------------------- function(func_build_target target build_dir) set(CTEST_BUILD_TARGET ${target}) ctest_build(BUILD "${build_dir}" APPEND RETURN_VALUE res NUMBER_ERRORS num_errors NUMBER_WARNINGS num_warnings) ctest_submit(PARTS Build) if(num_errors) math(EXPR build_errors "${build_errors} + ${num_errors}") set(build_errors ${build_errors} PARENT_SCOPE) endif() if(num_warnings) math(EXPR build_warnings "${build_warnings} + ${num_warnings}") set(build_warnings ${build_warnings} PARENT_SCOPE) endif() endfunction() function(func_test label build_dir) - if (NOT TESTING_PARALLEL_LEVEL) + if(NOT TESTING_PARALLEL_LEVEL) set(TESTING_PARALLEL_LEVEL 8) endif() if(label MATCHES "Unlabeled") set(_include_label EXCLUDE_LABEL .*) else() set(_include_label INCLUDE_LABEL ${label}) endif() ctest_test(BUILD "${build_dir}" ${_include_label} PARALLEL_LEVEL ${TESTING_PARALLEL_LEVEL} EXCLUDE ${TEST_TO_EXCLUDE_REGEX} RETURN_VALUE res ) ctest_submit(PARTS Test) if(res) math(EXPR test_errors "${test_errors} + 1") set(test_errors ${test_errors} PARENT_SCOPE) endif() if(ARG3) set(WITH_COVERAGE ${ARG3}) endif() if(ARG4) set(WITH_MEMCHECK ${ARG4}) endif() if(WITH_COVERAGE AND CTEST_COVERAGE_COMMAND) message("----------- [ Coverage ${label} ] -----------") ctest_coverage(BUILD "${build_dir}" LABELS ${label}) ctest_submit(PARTS Coverage) - endif () + endif() if(WITH_MEMCHECK AND CTEST_MEMORYCHECK_COMMAND) if(NOT CTEST_MEMORYCHECK_SUPPRESSIONS_FILE) if(EXISTS "${CTEST_SOURCE_DIRECTORY}/CMake/valgrind.supp") set(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "${CTEST_SOURCE_DIRECTORY}/CMake/valgrind.supp") endif() endif() if(NOT CTEST_MEMORYCHECK_COMMAND_OPTIONS) set(CTEST_MEMORYCHECK_COMMAND_OPTIONS "-q --tool=memcheck --leak-check=yes --show-reachable=no --show-possibly-lost=no --workaround-gcc296-bugs=yes --num-callers=50") endif() ctest_memcheck(BUILD "${build_dir}" INCLUDE_LABEL ${label}) ctest_submit(PARTS MemCheck) - endif () + endif() endfunction() #--------------------------------------------------------------------- # run_ctest macro #--------------------------------------------------------------------- -MACRO(run_ctest) +macro(run_ctest) set(build_warnings 0) set(build_errors 0) set(test_errors 0) ctest_start(${model}) ctest_update(SOURCE "${CTEST_CHECKOUT_DIR}" RETURN_VALUE res) if(res LESS 0) # update error math(EXPR build_errors "${build_errors} + 1") endif() set(force_build ${initial_force_build}) # Check if a forced run was requested set(cdash_remove_rerun_url ) if(CDASH_ADMIN_URL_PREFIX) set(cdash_rerun_url "${CDASH_ADMIN_URL_PREFIX}/rerun/${CTEST_BUILD_NAME}") set(cdash_remove_rerun_url "${CDASH_ADMIN_URL_PREFIX}/rerun/rerun.php?name=${CTEST_BUILD_NAME}&remove=1") file(DOWNLOAD "${cdash_rerun_url}" "${CTEST_BINARY_DIRECTORY}/tmp.txt" STATUS status ) list(GET status 0 error_code) file(READ "${CTEST_BINARY_DIRECTORY}/tmp.txt" rerun_content LIMIT 1) if(NOT error_code AND NOT rerun_content) set(force_build 1) endif() endif() if(COMMAND MITK_OVERRIDE_FORCE_BUILD) MITK_OVERRIDE_FORCE_BUILD(force_build) endif() # force a build if this is the first run and the build dir is empty if(NOT EXISTS "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt") message("First time build - Initialize CMakeCache.txt") set(res 1) # Write initial cache. - if (NOT DEFINED BUILD_TESTING) + if(NOT DEFINED BUILD_TESTING) set(BUILD_TESTING ON) endif() # Write initial cache. file(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" " CTEST_USE_LAUNCHERS:BOOL=${CTEST_USE_LAUNCHERS} CTEST_PROJECT_ADDITIONAL_TARGETS:INTERNAL=${CTEST_PROJECT_ADDITIONAL_TARGETS} BUILD_TESTING:BOOL=${BUILD_TESTING} MITK_CTEST_SCRIPT_MODE:STRING=${SCRIPT_MODE} CMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} QT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} WITH_COVERAGE:BOOL=${WITH_COVERAGE} MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL:STRING=${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL} ${INITIAL_CMAKECACHE_OPTIONS} ") endif() if(res GREATER 0 OR force_build) # Clear the forced rerun request if(CDASH_ADMIN_URL_PREFIX AND cdash_remove_rerun_url) file(DOWNLOAD "${cdash_remove_rerun_url}" "${CTEST_BINARY_DIRECTORY}/tmp.txt") file(REMOVE "${CTEST_BINARY_DIRECTORY}/tmp.txt") endif() if(CTEST_PROJECT_NAME_SUPERBUILD) set(ctest_project_name_orig ${CTEST_PROJECT_NAME}) set(CTEST_PROJECT_NAME ${CTEST_PROJECT_NAME_SUPERBUILD}) endif() message("----------- [ Configure SuperBuild ] -----------") set_property(GLOBAL PROPERTY SubProject SuperBuild) set_property(GLOBAL PROPERTY Label SuperBuild) ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res OPTIONS "${SUPERBUILD_CONFIG_OPTIONS}") if(res) math(EXPR build_errors "${build_errors} + 1") endif() # Project.xml is generated during the superbuild configure step ctest_submit(FILES "${CTEST_BINARY_DIRECTORY}/Project.xml") ctest_read_custom_files("${CTEST_BINARY_DIRECTORY}") ctest_submit(PARTS Configure) # submit the update results *after* the submitting the Configure info, # otherwise CDash is somehow confused and cannot add the update info # to the superbuild project ctest_submit(PARTS Update) # To get CTEST_PROJECT_SUBPROJECTS and CTEST_PROJECT_EXTERNALS definition include("${CTEST_BINARY_DIRECTORY}/CTestConfigSubProject.cmake") # Build top level (either all or the supplied targets at # superbuild level if(SUPERBUILD_TARGETS AND NOT build_errors) foreach(superbuild_target ${SUPERBUILD_TARGETS}) message("----------- [ Build ${superbuild_target} - SuperBuild ] -----------") func_build_target(${superbuild_target} "${CTEST_BINARY_DIRECTORY}") # runs only tests that have a LABELS property matching "SuperBuild" func_test("SuperBuild" "${CTEST_BINARY_DIRECTORY}") endforeach() # HACK Unfortunately ctest_coverage ignores the build argument, back-up the original dirs file(READ "${CTEST_BINARY_DIRECTORY}/CMakeFiles/TargetDirectories.txt" old_coverage_dirs) # explicitly build requested external projects as subprojects foreach(external_project_with_build_dir ${CTEST_PROJECT_EXTERNALS}) string(REPLACE "^^" ";" external_project_with_build_dir_list "${external_project_with_build_dir}") list(GET external_project_with_build_dir_list 0 external_project_name) list(GET external_project_with_build_dir_list 1 external_project_builddir) set_property(GLOBAL PROPERTY SubProject ${external_project_name}) set_property(GLOBAL PROPERTY Label ${external_project_name}) message("----------- [ Build ${external_project_name} ] -----------") func_build_target("${external_project_name}" "${CTEST_BINARY_DIRECTORY}") - if (NOT build_errors) + if(NOT build_errors) # HACK Unfortunately ctest_coverage ignores the build argument, try to force it... file(READ "${CTEST_BINARY_DIRECTORY}/${external_project_builddir}/CMakeFiles/TargetDirectories.txt" mitk_build_coverage_dirs) file(APPEND "${CTEST_BINARY_DIRECTORY}/CMakeFiles/TargetDirectories.txt" "${mitk_build_coverage_dirs}") message("----------- [ Test ${external_project_name} ] -----------") # runs only tests that have a LABELS property matching "${external_project_name}" func_test(${external_project_name} "${CTEST_BINARY_DIRECTORY}/${external_project_builddir}") # restore old coverage dirs file(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeFiles/TargetDirectories.txt" "${old_coverage_dirs}") endif() endforeach() # switch back to SuperBuild label set_property(GLOBAL PROPERTY SubProject SuperBuild) set_property(GLOBAL PROPERTY Label SuperBuild) message("----------- [ Finish SuperBuild ] -----------") else() message("----------- [ Build SuperBuild ] -----------") endif() if(NOT build_errors) # build everything at superbuild level which has not yet been built func_build_target("" "${CTEST_BINARY_DIRECTORY}") endif() # runs only tests that have a LABELS property matching "SuperBuild" #func_test("SuperBuild" "${CTEST_BINARY_DIRECTORY}") set(build_dir "${CTEST_BINARY_DIRECTORY}/${PROJECT_BUILD_DIR}") if(CTEST_PROJECT_NAME_SUPERBUILD) set(CTEST_PROJECT_NAME ${ctest_project_name_orig}) endif() message("----------- [ Configure ${build_dir} ] -----------") # Configure target ctest_configure(BUILD "${build_dir}" OPTIONS "-DCTEST_USE_LAUNCHERS=${CTEST_USE_LAUNCHERS}" RETURN_VALUE res ) ctest_read_custom_files("${CTEST_BINARY_DIRECTORY}") ctest_submit(PARTS Configure) if(res) math(EXPR build_errors "${build_errors} + 1") endif() foreach(subproject ${CTEST_PROJECT_SUBPROJECTS}) if(NOT build_errors) set_property(GLOBAL PROPERTY SubProject ${subproject}) set_property(GLOBAL PROPERTY Label ${subproject}) if(subproject MATCHES "Unlabeled") message("----------- [ Build All (Unlabeled) ] -----------") # Build target func_build_target("" "${build_dir}") else() message("----------- [ Build ${subproject} ] -----------") # Build target func_build_target(${subproject} "${build_dir}") endif() endif() endforeach() if(NOT build_errors) # HACK Unfortunately ctest_coverage ignores the build argument, try to force it... file(READ ${build_dir}/CMakeFiles/TargetDirectories.txt mitk_build_coverage_dirs) file(APPEND "${CTEST_BINARY_DIRECTORY}/CMakeFiles/TargetDirectories.txt" "${mitk_build_coverage_dirs}") foreach(subproject ${CTEST_PROJECT_SUBPROJECTS}) set_property(GLOBAL PROPERTY SubProject ${subproject}) set_property(GLOBAL PROPERTY Label ${subproject}) message("----------- [ Test ${subproject} ] -----------") # runs only tests that have a LABELS property matching "${subproject}" func_test(${subproject} "${build_dir}") endforeach() endif() # Build any additional target which is not build by "all" # i.e. the "package" target if(CTEST_PROJECT_ADDITIONAL_TARGETS AND NOT build_errors) foreach(additional_target ${CTEST_PROJECT_ADDITIONAL_TARGETS}) set_property(GLOBAL PROPERTY SubProject ${additional_target}) set_property(GLOBAL PROPERTY Label ${additional_target}) message("----------- [ Build ${additional_target} ] -----------") func_build_target(${additional_target} "${build_dir}") message("----------- [ Test ${additional_target} ] -----------") # runs only tests that have a LABELS property matching "${subproject}" func_test(${additional_target} "${build_dir}") endforeach() endif() - if (WITH_DOCUMENTATION) + if(WITH_DOCUMENTATION) message("----------- [ Build Documentation ] -----------") set(ctest_use_launchers_orig ${CTEST_USE_LAUNCHERS}) set(CTEST_USE_LAUNCHERS 0) # Build Documentation target set_property(GLOBAL PROPERTY SubProject Documentation) set_property(GLOBAL PROPERTY Label Documentation) func_build_target("doc" "${build_dir}") set(CTEST_USE_LAUNCHERS ${ctest_use_launchers_orig}) endif() set_property(GLOBAL PROPERTY SubProject SuperBuild) set_property(GLOBAL PROPERTY Label SuperBuild) # Global coverage ... - if (WITH_COVERAGE AND CTEST_COVERAGE_COMMAND) + if(WITH_COVERAGE AND CTEST_COVERAGE_COMMAND) message("----------- [ Global coverage ] -----------") ctest_coverage(BUILD "${build_dir}" APPEND) ctest_submit(PARTS Coverage) - endif () + endif() # Global dynamic analysis ... - if (WITH_MEMCHECK AND CTEST_MEMORYCHECK_COMMAND) + if(WITH_MEMCHECK AND CTEST_MEMORYCHECK_COMMAND) message("----------- [ Global memcheck ] -----------") ctest_memcheck(BUILD "${build_dir}") ctest_submit(PARTS MemCheck) - endif () + endif() # Note should be at the end ctest_submit(PARTS Notes) # Send status to the "CDash Web Admin" if(CDASH_ADMIN_URL_PREFIX) set(cdash_admin_url "${CDASH_ADMIN_URL_PREFIX}/cdashadmin-web/index.php?pw=4da12ca9c06d46d3171d7f73974c900f") string(REGEX REPLACE ".*\\?project=(.*)&?" "\\1" _ctest_project "${CTEST_DROP_LOCATION}") file(DOWNLOAD "${cdash_admin_url}&action=submit&name=${CTEST_BUILD_NAME}&hasTestErrors=${test_errors}&hasBuildErrors=${build_errors}&hasBuildWarnings=${build_warnings}&ctestDropSite=${CTEST_DROP_SITE}&ctestProject=${_ctest_project}" "${CTEST_BINARY_DIRECTORY}/cdashadmin.txt" STATUS status ) list(GET status 0 error_code) list(GET status 1 error_msg) if(error_code) message(FATAL_ERROR "error: Failed to communicate with cdashadmin-web - ${error_msg}") endif() endif() endif() # Clear the CTEST_CHECKOUT_COMMAND variable to prevent continuous clients # to try to checkout again set(CTEST_CHECKOUT_COMMAND "") endmacro() if(SCRIPT_MODE STREQUAL "continuous") while(1) run_ctest() # Loop no faster than once every 5 minutes message("Wait for 5 minutes ...") ctest_sleep(300) endwhile() else() run_ctest() endif() diff --git a/CMake/MITKDashboardSetup.cmake b/CMake/MITKDashboardSetup.cmake index fa7184d8cc..5260ff9670 100644 --- a/CMake/MITKDashboardSetup.cmake +++ b/CMake/MITKDashboardSetup.cmake @@ -1,120 +1,120 @@ # This file is intended to be included at the end of a custom MITKDashboardScript.TEMPLATE.cmake file list(APPEND CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}") # # Automatically determined properties # set(MY_OPERATING_SYSTEM "${CMAKE_HOST_SYSTEM}") # Windows 7, Linux-2.6.32, Darwin... site_name(CTEST_SITE) if(QT_BINARY_DIR) set(QT_QMAKE_EXECUTABLE "${QT_BINARY_DIR}/qmake") else() set(QT_QMAKE_EXECUTABLE "qmake") endif() execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} --version OUTPUT_VARIABLE MY_QT_VERSION RESULT_VARIABLE qmake_error) if(qmake_error) message(FATAL_ERROR "Error when executing ${QT_QMAKE_EXECUTABLE} --version\n${qmake_error}") endif() string(REGEX REPLACE ".*Qt version ([0-9.]+) .*" "\\1" MY_QT_VERSION ${MY_QT_VERSION}) # # Project specific properties # if(NOT CTEST_BUILD_NAME) set(CTEST_BUILD_NAME "${MY_OPERATING_SYSTEM}-${MY_COMPILER}-Qt-${MY_QT_VERSION}-${CTEST_BUILD_CONFIGURATION}") endif() set(PROJECT_BUILD_DIR "MITK-build") set(CTEST_PATH "$ENV{PATH}") if(WIN32) set(VTK_BINARY_DIR "${CTEST_BINARY_DIRECTORY}/VTK-build/bin/${CTEST_BUILD_CONFIGURATION}") set(ITK_BINARY_DIR "${CTEST_BINARY_DIRECTORY}/ITK-build/bin/${CTEST_BUILD_CONFIGURATION}") set(BOOST_BINARY_DIR "${CTEST_BINARY_DIRECTORY}/Boost-src/stage/lib") set(GDCM_BINARY_DIR "${CTEST_BINARY_DIRECTORY}/GDCM-build/bin/${CTEST_BUILD_CONFIGURATION}") set(OPENCV_BINARY_DIR "${CTEST_BINARY_DIRECTORY}/OpenCV-build/bin/${CTEST_BUILD_CONFIGURATION}") set(BLUEBERRY_OSGI_DIR "${CTEST_BINARY_DIRECTORY}/MITK-build/bin/BlueBerry/org.blueberry.osgi/bin/${CTEST_BUILD_CONFIGURATION}") set(CTEST_PATH "${CTEST_PATH};${QT_BINARY_DIR};${VTK_BINARY_DIR};${ITK_BINARY_DIR};${BOOST_BINARY_DIR};${GDCM_BINARY_DIR};${OPENCV_BINARY_DIR};${BLUEBERRY_OSGI_DIR}") endif() set(ENV{PATH} "${CTEST_PATH}") set(SUPERBUILD_TARGETS "") # If the dashscript doesn't define a GIT_REPOSITORY variable, let's define it here. -if (NOT DEFINED GIT_REPOSITORY OR GIT_REPOSITORY STREQUAL "") +if(NOT DEFINED GIT_REPOSITORY OR GIT_REPOSITORY STREQUAL "") set(GIT_REPOSITORY "http://git.mitk.org/MITK.git") endif() # # Display build info # message("Site name: ${CTEST_SITE}") message("Build name: ${CTEST_BUILD_NAME}") message("Script Mode: ${SCRIPT_MODE}") message("Coverage: ${WITH_COVERAGE}, MemCheck: ${WITH_MEMCHECK}") # # Set initial cache options # if(CMAKE_GENERATOR MATCHES "[Mm]ake") set(CTEST_USE_LAUNCHERS 1) else() set(CTEST_USE_LAUNCHERS 0) endif() # Remove this if block after all dartclients work if(DEFINED ADDITIONNAL_CMAKECACHE_OPTION) message(WARNING "Rename ADDITIONNAL to ADDITIONAL in your dartlclient script: ${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}") set(ADDITIONAL_CMAKECACHE_OPTION ${ADDITIONNAL_CMAKECACHE_OPTION}) endif() if(NOT DEFINED MITK_USE_Boost) set(MITK_USE_Boost 1) endif() if(NOT DEFINED MITK_USE_OpenCV) set(MITK_USE_OpenCV 1) endif() set(INITIAL_CMAKECACHE_OPTIONS " BLUEBERRY_BUILD_TESTING:BOOL=TRUE BLUEBERRY_BUILD_ALL_PLUGINS:BOOL=TRUE MITK_BUILD_ALL_PLUGINS:BOOL=TRUE MITK_BUILD_ALL_APPS:BOOL=TRUE SUPERBUILD_EXCLUDE_MITKBUILD_TARGET:BOOL=TRUE MITK_USE_Boost:BOOL=${MITK_USE_Boost} MITK_USE_OpenCV:BOOL=${MITK_USE_OpenCV} ${ADDITIONAL_CMAKECACHE_OPTION} ") # Write a cache file for populating the MITK initial cache (not the superbuild cache). # This can be used to provide variables which are not passed through the # superbuild process to the MITK configure step) if(MITK_INITIAL_CACHE) set(mitk_cache_file "${CTEST_SCRIPT_DIRECTORY}/mitk_initial_cache.txt") file(WRITE "${mitk_cache_file}" "${MITK_INITIAL_CACHE}") set(INITIAL_CMAKECACHE_OPTIONS "${INITIAL_CMAKECACHE_OPTIONS} MITK_INITIAL_CACHE_FILE:INTERNAL=${mitk_cache_file} ") endif() # # Download and include dashboard driver script # if(NOT DEFINED GIT_BRANCH OR GIT_BRANCH STREQUAL "") set(hb "HEAD") else() set(hb "refs/heads/${GIT_BRANCH}") endif() set(url "http://mitk.org/git/?p=MITK.git;a=blob_plain;f=CMake/MITKDashboardDriverScript.cmake;hb=${hb}") set(dest ${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}.driver) downloadFile("${url}" "${dest}") include(${dest}) diff --git a/CMake/MacroParseArguments.cmake b/CMake/MacroParseArguments.cmake index 6519d014c2..8f61fdc704 100644 --- a/CMake/MacroParseArguments.cmake +++ b/CMake/MacroParseArguments.cmake @@ -1,79 +1,79 @@ -# MACRO (MACRO_PARSE_ARGUMENTS prefix arg_names option_names) +# macro(MACRO_PARSE_ARGUMENTS prefix arg_names option_names) # # From http://www.cmake.org/Wiki/CMakeMacroParseArguments: # # The MACRO_PARSE_ARGUMENTS macro will take the arguments of another macro and # define several variables: # # 1) The first argument to is a prefix to put on all variables it creates. # 2) The second argument is a quoted list of names, # 3) and the third argument is a quoted list of options. # # The rest of MACRO_PARSE_ARGUMENTS are arguments from another macro to be # parsed. # # MACRO_PARSE_ARGUMENTS(prefix arg_names options arg1 arg2...) # # For each item in options, MACRO_PARSE_ARGUMENTS will create a variable # with that name, prefixed with prefix_. So, for example, if prefix is # MY_MACRO and options is OPTION1;OPTION2, then PARSE_ARGUMENTS will create # the variables MY_MACRO_OPTION1 and MY_MACRO_OPTION2. These variables will # be set to true if the option exists in the command line or false otherwise. # # For each item in arg_names, MACRO_PARSE_ARGUMENTS will create a variable # with that name, prefixed with prefix_. Each variable will be filled with the # arguments that occur after the given arg_name is encountered up to the next # arg_name or the end of the arguments. All options are removed from these # lists. # # MACRO_PARSE_ARGUMENTS also creates a prefix_DEFAULT_ARGS variable containing # the list of all arguments up to the first arg_name encountered. -IF(NOT COMMAND MACRO_PARSE_ARGUMENTS) +if(NOT COMMAND MACRO_PARSE_ARGUMENTS) -MACRO (MACRO_PARSE_ARGUMENTS prefix arg_names option_names) +macro(MACRO_PARSE_ARGUMENTS prefix arg_names option_names) - SET(DEFAULT_ARGS) + set(DEFAULT_ARGS) - FOREACH (arg_name ${arg_names}) - SET(${prefix}_${arg_name}) - ENDFOREACH (arg_name) + foreach(arg_name ${arg_names}) + set(${prefix}_${arg_name}) + endforeach(arg_name) - FOREACH (option ${option_names}) - SET(${prefix}_${option} FALSE) - ENDFOREACH (option) + foreach(option ${option_names}) + set(${prefix}_${option} FALSE) + endforeach(option) - SET(current_arg_name DEFAULT_ARGS) - SET(current_arg_list) + set(current_arg_name DEFAULT_ARGS) + set(current_arg_list) - FOREACH (arg ${ARGN}) + foreach(arg ${ARGN}) - SET(larg_names ${arg_names}) - LIST(FIND larg_names "${arg}" is_arg_name) + set(larg_names ${arg_names}) + list(FIND larg_names "${arg}" is_arg_name) - IF (is_arg_name GREATER -1) + if(is_arg_name GREATER -1) - SET(${prefix}_${current_arg_name} ${current_arg_list}) - SET(current_arg_name "${arg}") - SET(current_arg_list) + set(${prefix}_${current_arg_name} ${current_arg_list}) + set(current_arg_name "${arg}") + set(current_arg_list) - ELSE (is_arg_name GREATER -1) + else(is_arg_name GREATER -1) - SET(loption_names ${option_names}) - LIST(FIND loption_names "${arg}" is_option) + set(loption_names ${option_names}) + list(FIND loption_names "${arg}" is_option) - IF (is_option GREATER -1) - SET(${prefix}_${arg} TRUE) - ELSE (is_option GREATER -1) - SET(current_arg_list ${current_arg_list} "${arg}") - ENDIF (is_option GREATER -1) + if(is_option GREATER -1) + set(${prefix}_${arg} TRUE) + else(is_option GREATER -1) + set(current_arg_list ${current_arg_list} "${arg}") + endif(is_option GREATER -1) - ENDIF (is_arg_name GREATER -1) + endif(is_arg_name GREATER -1) - ENDFOREACH (arg ${ARGN}) + endforeach(arg ${ARGN}) - SET(${prefix}_${current_arg_name} ${current_arg_list}) + set(${prefix}_${current_arg_name} ${current_arg_list}) -ENDMACRO (MACRO_PARSE_ARGUMENTS) +endmacro(MACRO_PARSE_ARGUMENTS) -ENDIF(NOT COMMAND MACRO_PARSE_ARGUMENTS) +endif(NOT COMMAND MACRO_PARSE_ARGUMENTS) diff --git a/CMake/PackageDepends/MITK_Boost_Config.cmake b/CMake/PackageDepends/MITK_Boost_Config.cmake index 84a583308c..e263660947 100644 --- a/CMake/PackageDepends/MITK_Boost_Config.cmake +++ b/CMake/PackageDepends/MITK_Boost_Config.cmake @@ -1,24 +1,24 @@ -IF(MITK_USE_Boost) +if(MITK_USE_Boost) - IF(NOT MITK_USE_SYSTEM_Boost) - SET(Boost_NO_SYSTEM_PATHS 1) - ENDIF() + if(NOT MITK_USE_SYSTEM_Boost) + set(Boost_NO_SYSTEM_PATHS 1) + endif() - SET(Boost_USE_MULTITHREADED 1) - SET(Boost_USE_STATIC_LIBS 0) - SET(Boost_USE_STATIC_RUNTIME 0) + set(Boost_USE_MULTITHREADED 1) + set(Boost_USE_STATIC_LIBS 0) + set(Boost_USE_STATIC_RUNTIME 0) - IF(MITK_USE_Boost_LIBRARIES) - FIND_PACKAGE(Boost 1.40.0 REQUIRED COMPONENTS ${MITK_USE_Boost_LIBRARIES}) - ELSE() - FIND_PACKAGE(Boost 1.40.0 REQUIRED) - ENDIF() + if(MITK_USE_Boost_LIBRARIES) + find_package(Boost 1.40.0 REQUIRED COMPONENTS ${MITK_USE_Boost_LIBRARIES}) + else() + find_package(Boost 1.40.0 REQUIRED) + endif() - LIST(APPEND ALL_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS}) - IF(Boost_LIBRARIES) - LIST(APPEND ALL_LIBRARIES ${Boost_LIBRARIES}) - LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) - ENDIF() + list(APPEND ALL_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS}) + if(Boost_LIBRARIES) + list(APPEND ALL_LIBRARIES ${Boost_LIBRARIES}) + link_directories(${Boost_LIBRARY_DIRS}) + endif() -ENDIF(MITK_USE_Boost) +endif(MITK_USE_Boost) diff --git a/CMake/PackageDepends/MITK_CTK_Config.cmake b/CMake/PackageDepends/MITK_CTK_Config.cmake index 60a54fb087..b200a61413 100644 --- a/CMake/PackageDepends/MITK_CTK_Config.cmake +++ b/CMake/PackageDepends/MITK_CTK_Config.cmake @@ -1,7 +1,7 @@ -# MESSAGE("In package CTK config") -FIND_PACKAGE(CTK REQUIRED) -LIST(APPEND ALL_INCLUDE_DIRECTORIES ${CTK_INCLUDE_DIRS}) -LIST(APPEND ALL_LIBRARIES ${CTK_LIBRARIES}) +# message("In package CTK config") +find_package(CTK REQUIRED) +list(APPEND ALL_INCLUDE_DIRECTORIES ${CTK_INCLUDE_DIRS}) +list(APPEND ALL_LIBRARIES ${CTK_LIBRARIES}) link_directories(${CTK_LIBRARY_DIRS}) diff --git a/CMake/PackageDepends/MITK_DCMTK_Config.cmake b/CMake/PackageDepends/MITK_DCMTK_Config.cmake index 8d24b1ea91..3f59479417 100644 --- a/CMake/PackageDepends/MITK_DCMTK_Config.cmake +++ b/CMake/PackageDepends/MITK_DCMTK_Config.cmake @@ -1,48 +1,48 @@ -IF(MITK_USE_DCMTK) +if(MITK_USE_DCMTK) -IF(NOT DCMTK_DIR) - SET(DCMTK_DIR "$ENV{DCMTK_DIR}" CACHE PATH "Location of DCMTK") - SET(DCMTK_DIR "$ENV{DCMTK_DIR}") - IF(NOT DCMTK_DIR) - MESSAGE(FATAL_ERROR "DCMTK_DIR not set. Cannot proceed.") - ENDIF(NOT DCMTK_DIR) -ENDIF(NOT DCMTK_DIR) +if(NOT DCMTK_DIR) + set(DCMTK_DIR "$ENV{DCMTK_DIR}" CACHE PATH "Location of DCMTK") + set(DCMTK_DIR "$ENV{DCMTK_DIR}") + if(NOT DCMTK_DIR) + message(FATAL_ERROR "DCMTK_DIR not set. Cannot proceed.") + endif(NOT DCMTK_DIR) +endif(NOT DCMTK_DIR) -FIND_PACKAGE(DCMTK) +find_package(DCMTK) -IF(NOT DCMTK_FOUND) - MESSAGE(SEND_ERROR "DCMTK development files not found.\n Please check variables (e.g. DCMTK_DIR) for include directories and libraries.\nYou may set environment variable DCMTK_DIR before pressing 'configure'") -ENDIF(NOT DCMTK_FOUND) +if(NOT DCMTK_FOUND) + message(SEND_ERROR "DCMTK development files not found.\n Please check variables (e.g. DCMTK_DIR) for include directories and libraries.\nYou may set environment variable DCMTK_DIR before pressing 'configure'") +endif(NOT DCMTK_FOUND) -IF( NOT WIN32 ) - SET(MISSING_LIBS_REQUIRED_BY_DCMTK wrap tiff z) -ENDIF( NOT WIN32 ) +if( NOT WIN32 ) + set(MISSING_LIBS_REQUIRED_BY_DCMTK wrap tiff z) +endif( NOT WIN32 ) -SET(QT_USE_QTSQL 1) +set(QT_USE_QTSQL 1) -IF(EXISTS ${DCMTK_config_INCLUDE_DIR}/osconfig.h) +if(EXISTS ${DCMTK_config_INCLUDE_DIR}/osconfig.h) -FILE(READ ${DCMTK_config_INCLUDE_DIR}/osconfig.h _osconfig_h) - IF(NOT _osconfig_h MATCHES "PACKAGE_VERSION_NUMBER \"354\"") - # MESSAGE(STATUS "Found DCMTK newer that 3.5.4 ...") - SET(MITK_USE_DCMTK_NEWER_THAN_3_5_4 TRUE) +file(READ ${DCMTK_config_INCLUDE_DIR}/osconfig.h _osconfig_h) + if(NOT _osconfig_h MATCHES "PACKAGE_VERSION_NUMBER \"354\"") + # message(STATUS "Found DCMTK newer that 3.5.4 ...") + set(MITK_USE_DCMTK_NEWER_THAN_3_5_4 TRUE) # assume the new oflog library is located next to the others # this can be removed if FindDCMTK is adapted for 3.5.5 - GET_FILENAME_COMPONENT(_DCMTK_lib_dir ${DCMTK_ofstd_LIBRARY} PATH) - FIND_LIBRARY(DCMTK_oflog_LIBRARY oflog ${_DCMTK_lib_dir} ) - LIST(APPEND DCMTK_LIBRARIES ${DCMTK_oflog_LIBRARY}) - ENDIF(NOT _osconfig_h MATCHES "PACKAGE_VERSION_NUMBER \"354\"") -ENDIF(EXISTS ${DCMTK_config_INCLUDE_DIR}/osconfig.h) + get_filename_component(_DCMTK_lib_dir ${DCMTK_ofstd_LIBRARY} PATH) + find_library(DCMTK_oflog_LIBRARY oflog ${_DCMTK_lib_dir} ) + list(APPEND DCMTK_LIBRARIES ${DCMTK_oflog_LIBRARY}) + endif(NOT _osconfig_h MATCHES "PACKAGE_VERSION_NUMBER \"354\"") +endif(EXISTS ${DCMTK_config_INCLUDE_DIR}/osconfig.h) # # Usually all code should be adapted to DCMTK 3.6 # If necessary you could configure the MITK_USE_DCMTK_NEWER_THAN_3_5_4 variable # to configure a header file for ifdefs: -# CONFIGURE_FILE( mitkDCMTKConfig.h.in mitkDCMTKConfig.h ) +# configure_file( mitkDCMTKConfig.h.in mitkDCMTKConfig.h ) -LIST(APPEND ALL_INCLUDE_DIRECTORIES ${DCMTK_INCLUDE_DIR} ${DCMTK_DIR}/include) -LIST(APPEND ALL_LIBRARIES ${DCMTK_LIBRARIES} ${MISSING_LIBS_REQUIRED_BY_DCMTK}) +list(APPEND ALL_INCLUDE_DIRECTORIES ${DCMTK_INCLUDE_DIR} ${DCMTK_DIR}/include) +list(APPEND ALL_LIBRARIES ${DCMTK_LIBRARIES} ${MISSING_LIBS_REQUIRED_BY_DCMTK}) #link_directories() -ENDIF(MITK_USE_DCMTK) +endif(MITK_USE_DCMTK) diff --git a/CMake/PackageDepends/MITK_ITK_Config.cmake b/CMake/PackageDepends/MITK_ITK_Config.cmake index 5089845848..6a855f50a0 100644 --- a/CMake/PackageDepends/MITK_ITK_Config.cmake +++ b/CMake/PackageDepends/MITK_ITK_Config.cmake @@ -1,19 +1,19 @@ -FIND_PACKAGE(ITK REQUIRED) +find_package(ITK REQUIRED) # # for some reason this does not work on windows, probably an ITK bug # ITK_BUILD_SHARED is OFF even in shared library builds # -#IF(ITK_FOUND AND NOT ITK_BUILD_SHARED) -# MESSAGE(FATAL_ERROR "MITK only supports a ITK which was built with shared libraries. Turn on BUILD_SHARED_LIBS in your ITK config.") -#ENDIF(ITK_FOUND AND NOT ITK_BUILD_SHARED) +#if(ITK_FOUND AND NOT ITK_BUILD_SHARED) +# message(FATAL_ERROR "MITK only supports a ITK which was built with shared libraries. Turn on BUILD_SHARED_LIBS in your ITK config.") +#endif(ITK_FOUND AND NOT ITK_BUILD_SHARED) -INCLUDE(${ITK_USE_FILE}) -LIST(APPEND ALL_LIBRARIES ${ITK_LIBRARIES}) -LIST(APPEND ALL_INCLUDE_DIRECTORIES ${ITK_INCLUDE_DIRS}) -IF(ITK_USE_SYSTEM_GDCM) - FIND_PACKAGE(GDCM PATHS ${ITK_GDCM_DIR} REQUIRED) - LIST(APPEND ALL_INCLUDE_DIRECTORIES ${GDCM_INCLUDE_DIRS}) - LIST(APPEND ALL_LIBRARIES ${GDCM_LIBRARIES}) -ENDIF(ITK_USE_SYSTEM_GDCM) +include(${ITK_USE_FILE}) +list(APPEND ALL_LIBRARIES ${ITK_LIBRARIES}) +list(APPEND ALL_INCLUDE_DIRECTORIES ${ITK_INCLUDE_DIRS}) +if(ITK_USE_SYSTEM_GDCM) + find_package(GDCM PATHS ${ITK_GDCM_DIR} REQUIRED) + list(APPEND ALL_INCLUDE_DIRECTORIES ${GDCM_INCLUDE_DIRS}) + list(APPEND ALL_LIBRARIES ${GDCM_LIBRARIES}) +endif(ITK_USE_SYSTEM_GDCM) diff --git a/CMake/PackageDepends/MITK_OpenCV_Config.cmake b/CMake/PackageDepends/MITK_OpenCV_Config.cmake index 527ce068ca..d65a3758cb 100644 --- a/CMake/PackageDepends/MITK_OpenCV_Config.cmake +++ b/CMake/PackageDepends/MITK_OpenCV_Config.cmake @@ -1,9 +1,9 @@ -FIND_PACKAGE(OpenCV REQUIRED) -LIST(APPEND ALL_LIBRARIES ${OpenCV_LIBS}) +find_package(OpenCV REQUIRED) +list(APPEND ALL_LIBRARIES ${OpenCV_LIBS}) # adding release directory for fixing error with RelWitgDebInfo (debug dlls have the suffix "d". thus release dlls wont be loaded accidentally) -LINK_DIRECTORIES(${OpenCV_LIB_DIR} "${OpenCV_LIB_DIR}/Release") +link_directories(${OpenCV_LIB_DIR} "${OpenCV_LIB_DIR}/Release") -IF(WIN32) - OPTION(MITK_USE_videoInput "Use videoInput (DirectShow wrapper) library" OFF) -ENDIF(WIN32) \ No newline at end of file +if(WIN32) + option(MITK_USE_videoInput "Use videoInput (DirectShow wrapper) library" OFF) +endif(WIN32) \ No newline at end of file diff --git a/CMake/PackageDepends/MITK_Poco_Config.cmake b/CMake/PackageDepends/MITK_Poco_Config.cmake index a7ac473c4e..9b6f40b923 100644 --- a/CMake/PackageDepends/MITK_Poco_Config.cmake +++ b/CMake/PackageDepends/MITK_Poco_Config.cmake @@ -1,12 +1,12 @@ -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${MITK_SOURCE_DIR}/BlueBerry/CMake) -FIND_PACKAGE(Poco) -LIST(APPEND ALL_INCLUDE_DIRECTORIES ${Poco_INCLUDE_DIRS}) -LIST(APPEND ALL_LIBRARIES optimized PocoFoundation +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${MITK_SOURCE_DIR}/BlueBerry/CMake) +find_package(Poco) +list(APPEND ALL_INCLUDE_DIRECTORIES ${Poco_INCLUDE_DIRS}) +list(APPEND ALL_LIBRARIES optimized PocoFoundation debug PocoFoundationd optimized PocoUtil debug PocoUtild optimized PocoXML debug PocoXMLd) link_directories(${Poco_LIBRARY_DIRS}) diff --git a/CMake/PackageDepends/MITK_QT_Config.cmake b/CMake/PackageDepends/MITK_QT_Config.cmake index 663932b144..6d1d9f6397 100644 --- a/CMake/PackageDepends/MITK_QT_Config.cmake +++ b/CMake/PackageDepends/MITK_QT_Config.cmake @@ -1,6 +1,6 @@ -FIND_PACKAGE(Qt4 REQUIRED) -INCLUDE(${QT_USE_FILE}) -LIST(APPEND ALL_INCLUDE_DIRECTORIES ${QT_INCLUDE_DIRS}) -LIST(APPEND ALL_LIBRARIES ${QT_LIBRARIES}) +find_package(Qt4 REQUIRED) +include(${QT_USE_FILE}) +list(APPEND ALL_INCLUDE_DIRECTORIES ${QT_INCLUDE_DIRS}) +list(APPEND ALL_LIBRARIES ${QT_LIBRARIES}) diff --git a/CMake/PackageDepends/MITK_QVTK_Config.cmake b/CMake/PackageDepends/MITK_QVTK_Config.cmake index ebb31a62f0..560c8a1624 100644 --- a/CMake/PackageDepends/MITK_QVTK_Config.cmake +++ b/CMake/PackageDepends/MITK_QVTK_Config.cmake @@ -1,3 +1,3 @@ -INCLUDE(${MITK_MODULES_PACKAGE_DEPENDS_DIR}/MITK_VTK_Config.cmake) -LIST(APPEND ALL_LIBRARIES QVTK) +include(${MITK_MODULES_PACKAGE_DEPENDS_DIR}/MITK_VTK_Config.cmake) +list(APPEND ALL_LIBRARIES QVTK) diff --git a/CMake/PackageDepends/MITK_VPX_Config.cmake b/CMake/PackageDepends/MITK_VPX_Config.cmake index 4b3a509b39..ec51ff8dc7 100644 --- a/CMake/PackageDepends/MITK_VPX_Config.cmake +++ b/CMake/PackageDepends/MITK_VPX_Config.cmake @@ -1,9 +1,9 @@ -SET( VPX_LIB "" CACHE FILEPATH "Search for the vpx library file" ) -SET( VPX_HEADER_DIR "" CACHE PATH "The path containing vpy headers" ) -SET( VPX_FOUND FALSE ) +set( VPX_LIB "" CACHE FILEPATH "Search for the vpx library file" ) +set( VPX_HEADER_DIR "" CACHE PATH "The path containing vpy headers" ) +set( VPX_FOUND FALSE ) -IF(VPX_LIB AND VPX_HEADER_DIR) - LIST(APPEND ALL_LIBRARIES ${VPX_LIB}) - LIST(APPEND ALL_INCLUDE_DIRECTORIES ${VPX_HEADER_DIR}) - SET( VPX_FOUND TRUE ) -ENDIF() +if(VPX_LIB AND VPX_HEADER_DIR) + list(APPEND ALL_LIBRARIES ${VPX_LIB}) + list(APPEND ALL_INCLUDE_DIRECTORIES ${VPX_HEADER_DIR}) + set( VPX_FOUND TRUE ) +endif() diff --git a/CMake/PackageDepends/MITK_VTK_Config.cmake b/CMake/PackageDepends/MITK_VTK_Config.cmake index 28a241b5a3..bdcddb9950 100644 --- a/CMake/PackageDepends/MITK_VTK_Config.cmake +++ b/CMake/PackageDepends/MITK_VTK_Config.cmake @@ -1,37 +1,37 @@ -IF(NOT MITK_VTK_Config_INCLUDED) - SET(MITK_VTK_Config_INCLUDED 1) - FIND_PACKAGE(VTK REQUIRED) - IF(VTK_FOUND AND NOT VTK_BUILD_SHARED_LIBS) - MESSAGE(FATAL_ERROR "MITK only supports a VTK which was built with shared libraries. Turn on BUILD_SHARED_LIBS in your VTK config.") - ENDIF() +if(NOT MITK_VTK_Config_INCLUDED) + set(MITK_VTK_Config_INCLUDED 1) + find_package(VTK REQUIRED) + if(VTK_FOUND AND NOT VTK_BUILD_SHARED_LIBS) + message(FATAL_ERROR "MITK only supports a VTK which was built with shared libraries. Turn on BUILD_SHARED_LIBS in your VTK config.") + endif() - INCLUDE(${VTK_USE_FILE}) - LIST(APPEND ALL_INCLUDE_DIRECTORIES ${VTK_INCLUDE_DIRS}) - IF(VTK_FOR_MITK_LIBRARIES) - LIST(APPEND ALL_LIBRARIES ${VTK_FOR_MITK_LIBRARIES}) - ELSE() + include(${VTK_USE_FILE}) + list(APPEND ALL_INCLUDE_DIRECTORIES ${VTK_INCLUDE_DIRS}) + if(VTK_FOR_MITK_LIBRARIES) + list(APPEND ALL_LIBRARIES ${VTK_FOR_MITK_LIBRARIES}) + else() # Libraries in mitk/Utilities may depend on VTK but # the VTK_FOR_MITK_LIBRARIES variable is not yet set. # Supply the VTK libraries manually - LIST(APPEND ALL_LIBRARIES + list(APPEND ALL_LIBRARIES vtkGraphics vtkCommon vtkFiltering vtkftgl vtkGraphics vtkHybrid vtkImaging vtkIO vtkParallel vtkRendering vtkVolumeRendering vtkWidgets ${VTK_JPEG_LIBRARIES} ${VTK_PNG_LIBRARIES} ${VTK_ZLIB_LIBRARIES} ${VTK_EXPAT_LIBRARIES} ${VTK_FREETYPE_LIBRARIES} ) - ENDIF() + endif() -ENDIF(NOT MITK_VTK_Config_INCLUDED) +endif(NOT MITK_VTK_Config_INCLUDED) diff --git a/CMake/PackageDepends/MITK_videoInput_Config.cmake b/CMake/PackageDepends/MITK_videoInput_Config.cmake index c8c831e0e7..b10cd0d52f 100644 --- a/CMake/PackageDepends/MITK_videoInput_Config.cmake +++ b/CMake/PackageDepends/MITK_videoInput_Config.cmake @@ -1,16 +1,16 @@ -SET( VIDEOINPUT_LIB "" CACHE FILEPATH "Search for the videoInput.lib file" ) -SET( VIDEOINPUT_HEADER_DIR "" CACHE PATH "The path containing VideoInput.h" ) +set( VIDEOINPUT_LIB "" CACHE FILEPATH "Search for the videoInput.lib file" ) +set( VIDEOINPUT_HEADER_DIR "" CACHE PATH "The path containing VideoInput.h" ) #message(STATUS "now in videoinput") -IF(CMAKE_CL_64) - SET( STRMBASD_LIB "" CACHE FILEPATH "Search for the strmbasd.lib file. Provided by DirectShow, if not found, download Microsoft Platform SDK and go to the Samples_Multimedia_DirectShow_BaseClasses folder and compile the BaseClasses solution to generate the strmbasd.lib. Place it in the same folder as the videoInput.lib") -ENDIF(CMAKE_CL_64) +if(CMAKE_CL_64) + set( STRMBASD_LIB "" CACHE FILEPATH "Search for the strmbasd.lib file. Provided by DirectShow, if not found, download Microsoft Platform SDK and go to the Samples_Multimedia_DirectShow_BaseClasses folder and compile the BaseClasses solution to generate the strmbasd.lib. Place it in the same folder as the videoInput.lib") +endif(CMAKE_CL_64) -SET( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT /NODEFAULTLIB:atlthunk" ) -SET( VIDEOINPUT_LIBS ${VIDEOINPUT_LIB} ${STRMBASD_LIB} ) -INCLUDE_DIRECTORIES( ${VIDEOINPUT_HEADER_DIR} ) -ADD_DEFINITIONS(-DMITK_USE_VIDEOINPUT_LIB) -LIST(APPEND ALL_LIBRARIES ${VIDEOINPUT_LIBS}) -LIST(APPEND ALL_INCLUDE_DIRECTORIES ${VIDEOINPUT_HEADER_DIR}) +set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT /NODEFAULTLIB:atlthunk" ) +set( VIDEOINPUT_LIBS ${VIDEOINPUT_LIB} ${STRMBASD_LIB} ) +include_directories( ${VIDEOINPUT_HEADER_DIR} ) +add_definitions(-DMITK_USE_VIDEOINPUT_LIB) +list(APPEND ALL_LIBRARIES ${VIDEOINPUT_LIBS}) +list(APPEND ALL_INCLUDE_DIRECTORIES ${VIDEOINPUT_HEADER_DIR}) diff --git a/CMake/QBundleTemplate/BundleDefaults.cmake b/CMake/QBundleTemplate/BundleDefaults.cmake index e415540c3c..8982dfceb5 100644 --- a/CMake/QBundleTemplate/BundleDefaults.cmake +++ b/CMake/QBundleTemplate/BundleDefaults.cmake @@ -1,30 +1,30 @@ -SET(BUNDLE_NAMESPACE "") -SET(DEFAULT_REQUIRED_BUNDLES "org.mitk.core.services") -SET(DEFAULT_REQUIRED_BUNDLES_FOR_GUI "org.mitk.gui.qt.common") -SET(DEFAULT_PLUGIN_VERSION "0.1") -SET(DEFAULT_PLUGIN_VENDOR "DKFZ, Medical and Biological Informatics") -SET(DEFAULT_VIEW_BASEID "org.mitk.views.") -SET(DEFAULT_VIEW_CLASS_BEGIN "Qmitk") -SET(DEFAULT_VIEW_BASE_CLASS "QmitkFunctionality") -SET(DEFAULT_VIEW_BASE_CLASS_H "QmitkFunctionality.h") -SET(PROJECT_STATIC_VAR "MITK_STATIC") -SET(DOXYGEN_INGROUP "MITKPlugins") -SET(DEFAULT_CREATE_PLUGIN_MACRO "MACRO_CREATE_MITK_PLUGIN()") -SET(DEFAULT_CREATE_GUI_PLUGIN_MACRO "MACRO_CREATE_MITK_PLUGIN(QmitkExt)") -SET(PLUGIN_COPYRIGHT "/*========================================================================= +set(BUNDLE_NAMESPACE "") +set(DEFAULT_REQUIRED_BUNDLES "org.mitk.core.services") +set(DEFAULT_REQUIRED_BUNDLES_FOR_GUI "org.mitk.gui.qt.common") +set(DEFAULT_PLUGIN_VERSION "0.1") +set(DEFAULT_PLUGIN_VENDOR "DKFZ, Medical and Biological Informatics") +set(DEFAULT_VIEW_BASEID "org.mitk.views.") +set(DEFAULT_VIEW_CLASS_BEGIN "Qmitk") +set(DEFAULT_VIEW_BASE_CLASS "QmitkFunctionality") +set(DEFAULT_VIEW_BASE_CLASS_H "QmitkFunctionality.h") +set(PROJECT_STATIC_VAR "MITK_STATIC") +set(DOXYGEN_INGROUP "MITKPlugins") +set(DEFAULT_CREATE_PLUGIN_MACRO "MACRO_CREATE_MITK_PLUGIN()") +set(DEFAULT_CREATE_GUI_PLUGIN_MACRO "MACRO_CREATE_MITK_PLUGIN(QmitkExt)") +set(PLUGIN_COPYRIGHT "/*========================================================================= Program: Medical Imaging & Interaction Toolkit Language: C++ Date: $Date$ Version: $Revision: 16706 $ Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. See MITKCopyright.txt or http://www.mitk.org/copyright.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/") diff --git a/CMake/QBundleTemplate/filesTemplate.cmake b/CMake/QBundleTemplate/filesTemplate.cmake index ab83a386fb..026c965f61 100644 --- a/CMake/QBundleTemplate/filesTemplate.cmake +++ b/CMake/QBundleTemplate/filesTemplate.cmake @@ -1,34 +1,34 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES @PLUGIN_SOURCES@ ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES @PLUGIN_INTERNAL_SOURCES@ ) -SET(UI_FILES +set(UI_FILES @PLUGIN_UI_FILES@ ) -SET(MOC_H_FILES +set(MOC_H_FILES @PLUGIN_MOC_H_FILES@ ) -SET(RESOURCE_FILES +set(RESOURCE_FILES @PLUGIN_RESOURCE_FILES@ ) -SET(RES_FILES +set(RES_FILES @PLUGIN_RES_FILES@ ) @SET_MANIFEST_SRC@ foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/CMake/QBundleTemplate/project/CMakeListsTemplate.txt b/CMake/QBundleTemplate/project/CMakeListsTemplate.txt index fcc148ea62..a7fbe8f4f1 100755 --- a/CMake/QBundleTemplate/project/CMakeListsTemplate.txt +++ b/CMake/QBundleTemplate/project/CMakeListsTemplate.txt @@ -1,62 +1,62 @@ -PROJECT(@CUSTOM_PROJECT_NAME@) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +project(@CUSTOM_PROJECT_NAME@) +cmake_minimum_required(VERSION 2.6) -SET(BUILD_SHARED_LIBS 1) +set(BUILD_SHARED_LIBS 1) -SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin" CACHE INTERNAL "Single output directory for building all libraries.") -SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin" CACHE INTERNAL "Single output directory for building all executables.") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin" CACHE INTERNAL "Single output directory for building all libraries.") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin" CACHE INTERNAL "Single output directory for building all executables.") # This variable will contain a list of directories # which contain your binary plug-ins -SET(@CUSTOM_PROJECT_NAME@_PLUGIN_OUTPUT_DIRS "" CACHE INTERNAL "@CUSTOM_PROJECT_NAME@ base plugin directories." FORCE) +set(@CUSTOM_PROJECT_NAME@_PLUGIN_OUTPUT_DIRS "" CACHE INTERNAL "@CUSTOM_PROJECT_NAME@ base plugin directories." FORCE) @FIND_PACKAGE_QT4@ -INCLUDE(${QT_USE_FILE}) +include(${QT_USE_FILE}) -SET(MITK_USE_BLUEBERRY 1) +set(MITK_USE_BLUEBERRY 1) # Set the variable below to 0 if you do not want to # use the extended MITK functionality -SET(MITK_USE_EXT 1) -FIND_PACKAGE(MITK REQUIRED) +set(MITK_USE_EXT 1) +find_package(MITK REQUIRED) -ADD_SUBDIRECTORY(Bundles) +add_subdirectory(Bundles) # Now build a custom executable to start the # BlueBerry Workbench with our plug-ins -INCLUDE_DIRECTORIES( +include_directories( ${org_blueberry_osgi_INCLUDE_DIRS} ${Poco_INCLUDE_DIRS} ${mbilog_INCLUDE_DIRS} ) -LINK_DIRECTORIES("${org.blueberry.osgi_OUT_DIR}/bin" ${Poco_LIBRARY_DIR}) -ADD_EXECUTABLE(@CUSTOM_PROJECT_EXECUTABLE@ @CUSTOM_PROJECT_EXECUTABLE@.cpp) -TARGET_LINK_LIBRARIES(@CUSTOM_PROJECT_EXECUTABLE@ org_blueberry_osgi) +link_directories("${org.blueberry.osgi_OUT_DIR}/bin" ${Poco_LIBRARY_DIR}) +add_executable(@CUSTOM_PROJECT_EXECUTABLE@ @CUSTOM_PROJECT_EXECUTABLE@.cpp) +target_link_libraries(@CUSTOM_PROJECT_EXECUTABLE@ org_blueberry_osgi) -IF(@CUSTOM_PROJECT_NAME@_ENABLED_PLUGINS) - ADD_DEPENDENCIES(@CUSTOM_PROJECT_EXECUTABLE@ ${@CUSTOM_PROJECT_NAME@_ENABLED_PLUGINS}) -ENDIF() +if(@CUSTOM_PROJECT_NAME@_ENABLED_PLUGINS) + add_dependencies(@CUSTOM_PROJECT_EXECUTABLE@ ${@CUSTOM_PROJECT_NAME@_ENABLED_PLUGINS}) +endif() # Configure the application's .ini file -SET(PLUGIN_CACHE_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/plugin_cache") -SET(PLUGIN_OUTPUT_DIRS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Bundles") -CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/@CUSTOM_PROJECT_EXECUTABLE@.ini" +set(PLUGIN_CACHE_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/plugin_cache") +set(PLUGIN_OUTPUT_DIRS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Bundles") +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/@CUSTOM_PROJECT_EXECUTABLE@.ini" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/@CUSTOM_PROJECT_EXECUTABLE@.ini" @ONLY) # If we are under Windows, create two batch files which correctly # set up the environment for the application and for VS 2008 -IF(WIN32) - INCLUDE(mitkFunctionCreateWindowsBatchScript) +if(WIN32) + include(mitkFunctionCreateWindowsBatchScript) - FOREACH(APP_BUILD_TYPE debug release) + foreach(APP_BUILD_TYPE debug release) mitkFunctionCreateWindowsBatchScript(start@CUSTOM_PROJECT_EXECUTABLE@.bat.in ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/start@CUSTOM_PROJECT_EXECUTABLE@_${APP_BUILD_TYPE}.bat ${APP_BUILD_TYPE}) # Configure VS batch file mitkFunctionCreateWindowsBatchScript("${CMAKE_CURRENT_SOURCE_DIR}/startVS2008.bat.in" "${PROJECT_BINARY_DIR}/startVS2008_${APP_BUILD_TYPE}.bat" ${APP_BUILD_TYPE}) - ENDFOREACH() -ENDIF(WIN32) + endforeach() +endif(WIN32) diff --git a/CMake/mitkFunctionAddTestLabel.cmake b/CMake/mitkFunctionAddTestLabel.cmake index ba62c5ee93..1eca064e77 100644 --- a/CMake/mitkFunctionAddTestLabel.cmake +++ b/CMake/mitkFunctionAddTestLabel.cmake @@ -1,15 +1,15 @@ # # Use to attach a CTest/CDash label to a test (already added via ADD_TEST) # # Call with or without an explicit second parameter. If no second parameter is given, # ${MITK_DEFAULT_SUBPROJECTS} will be used as standard label # function(mitkFunctionAddTestLabel test_name) set(label ${MITK_DEFAULT_SUBPROJECTS}) - if (ARGN) + if(ARGN) set(label ${ARGN}) endif() set_property(TEST ${test_name} APPEND PROPERTY LABELS ${label}) endfunction(mitkFunctionAddTestLabel) diff --git a/CMake/mitkFunctionCheckCompilerFlags.cmake b/CMake/mitkFunctionCheckCompilerFlags.cmake index 8d9a18b3fb..78dddd67a3 100644 --- a/CMake/mitkFunctionCheckCompilerFlags.cmake +++ b/CMake/mitkFunctionCheckCompilerFlags.cmake @@ -1,47 +1,47 @@ # # Helper macro allowing to check if the given flags are supported # by the underlying build tool # # If the flag(s) is/are supported, they will be appended to the string identified by RESULT_VAR # # Usage: # MITKFunctionCheckCompilerFlags(FLAGS_TO_CHECK VALID_FLAGS_VAR) # # Example: # # set(myflags) # mitkFunctionCheckCompilerFlags("-fprofile-arcs" myflags) # message(1-myflags:${myflags}) # mitkFunctionCheckCompilerFlags("-fauto-bugfix" myflags) # message(2-myflags:${myflags}) # mitkFunctionCheckCompilerFlags("-Wall" myflags) # message(1-myflags:${myflags}) # # The output will be: # 1-myflags: -fprofile-arcs # 2-myflags: -fprofile-arcs # 3-myflags: -fprofile-arcs -Wall -INCLUDE(TestCXXAcceptsFlag) +include(TestCXXAcceptsFlag) -FUNCTION(mitkFunctionCheckCompilerFlags CXX_FLAG_TO_TEST RESULT_VAR) +function(mitkFunctionCheckCompilerFlags CXX_FLAG_TO_TEST RESULT_VAR) - IF(CXX_FLAG_TO_TEST STREQUAL "") - MESSAGE(FATAL_ERROR "CXX_FLAG_TO_TEST shouldn't be empty") - ENDIF() + if(CXX_FLAG_TO_TEST STREQUAL "") + message(FATAL_ERROR "CXX_FLAG_TO_TEST shouldn't be empty") + endif() # Internally, the macro CMAKE_CXX_ACCEPTS_FLAG calls TRY_COMPILE. To avoid # the cost of compiling the test each time the project is configured, the variable set by # the macro is added to the cache so that following invocation of the macro with # the same variable name skip the compilation step. # For that same reason, ctkFunctionCheckCompilerFlags function appends a unique suffix to # the HAS_FLAG variable. This suffix is created using a 'clean version' of the flag to test. - STRING(REGEX REPLACE "-\\s\\$\\+\\*\\{\\}\\(\\)\\#" "" suffix ${CXX_FLAG_TO_TEST}) + string(REGEX REPLACE "-\\s\\$\\+\\*\\{\\}\\(\\)\\#" "" suffix ${CXX_FLAG_TO_TEST}) CHECK_CXX_ACCEPTS_FLAG(${CXX_FLAG_TO_TEST} HAS_FLAG_${suffix}) - IF(HAS_FLAG_${suffix}) - SET(${RESULT_VAR} "${${RESULT_VAR}} ${CXX_FLAG_TO_TEST}" PARENT_SCOPE) - ENDIF() + if(HAS_FLAG_${suffix}) + set(${RESULT_VAR} "${${RESULT_VAR}} ${CXX_FLAG_TO_TEST}" PARENT_SCOPE) + endif() -ENDFUNCTION() +endfunction() diff --git a/CMake/mitkFunctionCheckMitkCompatibility.cmake b/CMake/mitkFunctionCheckMitkCompatibility.cmake index 5831f008f5..b1abc873e0 100644 --- a/CMake/mitkFunctionCheckMitkCompatibility.cmake +++ b/CMake/mitkFunctionCheckMitkCompatibility.cmake @@ -1,40 +1,40 @@ # mitkFunctionCheckMitkCompatibility(VERSIONS [ ]... [REQUIRED]) # # Example: # mitkFunctionCheckMitkCompatibility(VERSIONS MITK_VERSION_PLUGIN_SYSTEM 1 REQUIRED) # function(mitkFunctionCheckMitkCompatibility) macro_parse_arguments(_COMPAT "VERSIONS" "REQUIRED" ${ARGN}) set(_is_version_name 1) foreach(_item ${_COMPAT_VERSIONS}) if(_is_version_name) set(_is_version_name 0) set(_version_name ${_item}) - if (NOT ${_version_name}) + if(NOT ${_version_name}) set(_msg_version_name_not_defined "Your MITK version is too old (${_version_name} not defined)") if(_COMPAT_REQUIRED) message(SEND_ERROR "${_msg_version_name_not_defined}") else() message(WARNING "${_msg_version_name_not_defined}") endif() endif() else() set(_is_version_name 1) - if (${_version_name}) + if(${_version_name}) set(_required_version ${_item}) if(${_version_name} VERSION_LESS ${_required_version}) set(_msg_version_mismatch "Your MITK version is too old, ${_version_name} version ${_required_version} or higher required, but only version ${${_version_name}} present.") if(_COMPAT_REQUIRED) message(SEND_ERROR "${_msg_version_mismatch}") else() message(WARNING "${_msg_version_mismatch}") endif() endif() endif() endif() endforeach() endfunction() diff --git a/CMake/mitkFunctionGetGccVersion.cmake b/CMake/mitkFunctionGetGccVersion.cmake index 19f1b9a395..381341eac0 100644 --- a/CMake/mitkFunctionGetGccVersion.cmake +++ b/CMake/mitkFunctionGetGccVersion.cmake @@ -1,38 +1,38 @@ ########################################################################### # # Library: CTK # # Copyright (c) Kitware Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.commontk.org/LICENSE # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # ########################################################################### #! \brief Get the gcc version -FUNCTION(mitkFunctionGetGccVersion path_to_gcc output_var) - IF(CMAKE_COMPILER_IS_GNUCXX) - EXECUTE_PROCESS( +function(mitkFunctionGetGccVersion path_to_gcc output_var) + if(CMAKE_COMPILER_IS_GNUCXX) + execute_process( COMMAND ${path_to_gcc} -dumpversion RESULT_VARIABLE result OUTPUT_VARIABLE output ERROR_VARIABLE error OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE ) - IF(result) - MESSAGE(FATAL_ERROR "Failed to obtain compiler version running [${path_to_gcc} -dumpversion]: ${error}") - ENDIF() - SET(${output_var} ${output} PARENT_SCOPE) - ENDIF() -ENDFUNCTION() + if(result) + message(FATAL_ERROR "Failed to obtain compiler version running [${path_to_gcc} -dumpversion]: ${error}") + endif() + set(${output_var} ${output} PARENT_SCOPE) + endif() +endfunction() diff --git a/CMake/mitkFunctionOrganizeSources.cmake b/CMake/mitkFunctionOrganizeSources.cmake index 1f7e1aa888..8635bd5537 100644 --- a/CMake/mitkFunctionOrganizeSources.cmake +++ b/CMake/mitkFunctionOrganizeSources.cmake @@ -1,64 +1,64 @@ -FUNCTION(ORGANIZE_SOURCES) +function(ORGANIZE_SOURCES) # this functions gets a filelist as input and looks # for corresponding h-files to add them to the project. # additionally files are grouped in source-groups. # No parameters explicitly declared here, because # we want to allow for variable argument lists, which - # are later access by the keyword FOREACH(MYFILE ${ARGV}) + # are later access by the keyword foreach(MYFILE ${ARGV}) # output: after calling the macro, files that were found # correspondigly to the given files are stored in the # variable: # ${CORRESPONDING_H_FILES} # ${CORRESPONDING_TXX_FILES} # ${CORRESPONDING_UI_H_FILES} # Globbed can be found in the variables # ${GLOBBED_TXX_FILES} (CURRENTLY COMMENTED OUT) # ${GLOBBED_DOX_FILES} MACRO_PARSE_ARGUMENTS(_ORG "HEADER;SOURCE;TXX;DOC;MOC;GEN_QRC;GEN_UI;UI;QRC" "" ${ARGN}) - SET(CORRESPONDING__H_FILES "" ) - SET(GLOBBED__H_FILES "" ) + set(CORRESPONDING__H_FILES "" ) + set(GLOBBED__H_FILES "" ) - IF(_ORG_HEADER) - FOREACH(_file ${_ORG_SOURCE}) - STRING(REGEX REPLACE "(.*)\\.(txx|cpp|c|cxx)$" "\\1.h" H_FILE ${_file}) - IF(EXISTS ${H_FILE}) - LIST(APPEND CORRESPONDING__H_FILES "${H_FILE}") - ENDIF() - ENDFOREACH() - ELSE() - FILE(GLOB_RECURSE GLOBBED__H_FILES *.h) - ENDIF() + if(_ORG_HEADER) + foreach(_file ${_ORG_SOURCE}) + string(REGEX REPLACE "(.*)\\.(txx|cpp|c|cxx)$" "\\1.h" H_FILE ${_file}) + if(EXISTS ${H_FILE}) + list(APPEND CORRESPONDING__H_FILES "${H_FILE}") + endif() + endforeach() + else() + file(GLOB_RECURSE GLOBBED__H_FILES *.h) + endif() - IF(_ORG_GEN_QRC OR _ORG_GEN_UI OR _ORG_MOC) - SOURCE_GROUP("Generated\\Qt QRC Source Files" FILES ${_ORG_GEN_QRC}) - SOURCE_GROUP("Generated\\Qt UI Header Files" FILES ${_ORG_GEN_UI}) - SOURCE_GROUP("Generated\\Qt MOC Source Files" FILES ${_ORG_MOC}) - ENDIF() + if(_ORG_GEN_QRC OR _ORG_GEN_UI OR _ORG_MOC) + source_group("Generated\\Qt QRC Source Files" FILES ${_ORG_GEN_QRC}) + source_group("Generated\\Qt UI Header Files" FILES ${_ORG_GEN_UI}) + source_group("Generated\\Qt MOC Source Files" FILES ${_ORG_MOC}) + endif() #_MACRO_APPEND_TO_LIST(_ORG_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/") - SOURCE_GROUP("== Source Files ==" FILES ${_ORG_SOURCE}) + source_group("== Source Files ==" FILES ${_ORG_SOURCE}) #_MACRO_APPEND_TO_LIST(_ORG_TXX "${CMAKE_CURRENT_SOURCE_DIR}/") - SOURCE_GROUP("== Template Files ==" FILES ${_ORG_TXX}) + source_group("== Template Files ==" FILES ${_ORG_TXX}) #_MACRO_APPEND_TO_LIST(_ORG_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/") - SOURCE_GROUP("== Header Files ==" FILES ${_ORG_HEADER} ${_ORG_HEADER} ${CORRESPONDING__H_FILES} ${GLOBBED__H_FILES}) + source_group("== Header Files ==" FILES ${_ORG_HEADER} ${_ORG_HEADER} ${CORRESPONDING__H_FILES} ${GLOBBED__H_FILES}) #_MACRO_APPEND_TO_LIST(_ORG_UI "${CMAKE_CURRENT_SOURCE_DIR}/") - SOURCE_GROUP("QT UI Files" FILES ${_ORG_UI}) + source_group("QT UI Files" FILES ${_ORG_UI}) #_MACRO_APPEND_TO_LIST(_ORG_DOC "${CMAKE_CURRENT_SOURCE_DIR}/") - SOURCE_GROUP("Doxygen Files" FILES ${_ORG_DOC}) + source_group("Doxygen Files" FILES ${_ORG_DOC}) #_MACRO_APPEND_TO_LIST(_ORG_QRC "${CMAKE_CURRENT_SOURCE_DIR}/") - SOURCE_GROUP("Qt Resource Files" FILES ${_ORG_QRC}) + source_group("Qt Resource Files" FILES ${_ORG_QRC}) -ENDFUNCTION(ORGANIZE_SOURCES) +endfunction(ORGANIZE_SOURCES) diff --git a/CMake/mitkMacroCheckModule.cmake b/CMake/mitkMacroCheckModule.cmake index 6f5de321ec..fda4348c40 100644 --- a/CMake/mitkMacroCheckModule.cmake +++ b/CMake/mitkMacroCheckModule.cmake @@ -1,63 +1,63 @@ # Usage: MITK_CHECK_MODULE(RESULT_VAR [dependencies ...] ) # check if all required modules exist and stores missing module names in RESULT_VAR. -MACRO(MITK_CHECK_MODULE RESULT_VAR) - SET(${RESULT_VAR} "") - SET(DEPENDS "") - SET(DEPENDS_BEFORE "not initialized") - SET(PACKAGE_DEPENDS "") +macro(MITK_CHECK_MODULE RESULT_VAR) + set(${RESULT_VAR} "") + set(DEPENDS "") + set(DEPENDS_BEFORE "not initialized") + set(PACKAGE_DEPENDS "") # check for each parameter if it is a package (3rd party) - FOREACH(package ${ARGN}) - SET(is_package) - FOREACH(dir ${MODULES_PACKAGE_DEPENDS_DIRS}) - IF(EXISTS "${dir}/MITK_${package}_Config.cmake") - LIST(APPEND PACKAGE_DEPENDS ${package}) - SET(is_package 1) - BREAK() - ENDIF() - ENDFOREACH() - IF(NOT is_package) - LIST(APPEND DEPENDS ${package}) - ENDIF() - ENDFOREACH(package) + foreach(package ${ARGN}) + set(is_package) + foreach(dir ${MODULES_PACKAGE_DEPENDS_DIRS}) + if(EXISTS "${dir}/MITK_${package}_Config.cmake") + list(APPEND PACKAGE_DEPENDS ${package}) + set(is_package 1) + break() + endif() + endforeach() + if(NOT is_package) + list(APPEND DEPENDS ${package}) + endif() + endforeach(package) - WHILE(NOT "${DEPENDS}" STREQUAL "${DEPENDS_BEFORE}") - SET(DEPENDS_BEFORE ${DEPENDS}) - FOREACH(dependency ${DEPENDS}) - SET(_module_found 1) - IF(NOT ${dependency}_CONFIG_FILE) - SET(_module_found 0) - ENDIF() - SET(_dependency_file_name ${${dependency}_CONFIG_FILE}) - IF(NOT EXISTS ${_dependency_file_name}) - SET(_module_found 0) - ENDIF() + while(NOT "${DEPENDS}" STREQUAL "${DEPENDS_BEFORE}") + set(DEPENDS_BEFORE ${DEPENDS}) + foreach(dependency ${DEPENDS}) + set(_module_found 1) + if(NOT ${dependency}_CONFIG_FILE) + set(_module_found 0) + endif() + set(_dependency_file_name ${${dependency}_CONFIG_FILE}) + if(NOT EXISTS ${_dependency_file_name}) + set(_module_found 0) + endif() - IF(_module_found) - INCLUDE(${_dependency_file_name}) - IF(${dependency}_IS_ENABLED) - LIST(APPEND DEPENDS ${${dependency}_DEPENDS}) - LIST(APPEND PACKAGE_DEPENDS ${${dependency}_PACKAGE_DEPENDS}) - ELSE(${dependency}_IS_ENABLED) - LIST(APPEND ${RESULT_VAR} ${dependency}) - LIST(REMOVE_DUPLICATES ${RESULT_VAR}) - ENDIF(${dependency}_IS_ENABLED) - ELSE() - LIST(APPEND ${RESULT_VAR} ${dependency}) - LIST(REMOVE_DUPLICATES ${RESULT_VAR}) - ENDIF() + if(_module_found) + include(${_dependency_file_name}) + if(${dependency}_IS_ENABLED) + list(APPEND DEPENDS ${${dependency}_DEPENDS}) + list(APPEND PACKAGE_DEPENDS ${${dependency}_PACKAGE_DEPENDS}) + else(${dependency}_IS_ENABLED) + list(APPEND ${RESULT_VAR} ${dependency}) + list(REMOVE_DUPLICATES ${RESULT_VAR}) + endif(${dependency}_IS_ENABLED) + else() + list(APPEND ${RESULT_VAR} ${dependency}) + list(REMOVE_DUPLICATES ${RESULT_VAR}) + endif() - ENDFOREACH(dependency) - LIST(REMOVE_DUPLICATES DEPENDS) - LIST(REMOVE_DUPLICATES PACKAGE_DEPENDS) - LIST(SORT DEPENDS) - LIST(SORT PACKAGE_DEPENDS) - ENDWHILE() + endforeach(dependency) + list(REMOVE_DUPLICATES DEPENDS) + list(REMOVE_DUPLICATES PACKAGE_DEPENDS) + list(SORT DEPENDS) + list(SORT PACKAGE_DEPENDS) + endwhile() - FOREACH(_package PACKAGE_DEPENDS) - IF((DEFINED MITK_USE_${_package}) AND NOT (${MITK_USE_${_package}})) - LIST(APPEND ${RESULT_VAR} ${_package}) - ENDIF() - ENDFOREACH() + foreach(_package PACKAGE_DEPENDS) + if((DEFINED MITK_USE_${_package}) AND NOT (${MITK_USE_${_package}})) + list(APPEND ${RESULT_VAR} ${_package}) + endif() + endforeach() -ENDMACRO(MITK_CHECK_MODULE) +endmacro(MITK_CHECK_MODULE) diff --git a/CMake/mitkMacroCreateCTKPlugin.cmake b/CMake/mitkMacroCreateCTKPlugin.cmake index d8fc663f44..8250579269 100644 --- a/CMake/mitkMacroCreateCTKPlugin.cmake +++ b/CMake/mitkMacroCreateCTKPlugin.cmake @@ -1,42 +1,42 @@ -MACRO(MACRO_CREATE_MITK_CTK_PLUGIN) +macro(MACRO_CREATE_MITK_CTK_PLUGIN) MACRO_PARSE_ARGUMENTS(_PLUGIN "EXPORT_DIRECTIVE;EXPORTED_INCLUDE_SUFFIXES;MODULE_DEPENDENCIES;SUBPROJECTS" "TEST_PLUGIN" ${ARGN}) MITK_CHECK_MODULE(_MODULE_CHECK_RESULT Mitk ${_PLUGIN_MODULE_DEPENDENCIES}) - IF(NOT _MODULE_CHECK_RESULT) + if(NOT _MODULE_CHECK_RESULT) MITK_USE_MODULE(Mitk ${_PLUGIN_MODULE_DEPENDENCIES}) - LINK_DIRECTORIES(${ALL_LIBRARY_DIRS}) - INCLUDE_DIRECTORIES(${ALL_INCLUDE_DIRECTORIES}) + link_directories(${ALL_LIBRARY_DIRS}) + include_directories(${ALL_INCLUDE_DIRECTORIES}) - IF(_PLUGIN_TEST_PLUGIN) - SET(is_test_plugin "TEST_PLUGIN") - ELSE() - SET(is_test_plugin) - ENDIF() + if(_PLUGIN_TEST_PLUGIN) + set(is_test_plugin "TEST_PLUGIN") + else() + set(is_test_plugin) + endif() MACRO_CREATE_CTK_PLUGIN(EXPORT_DIRECTIVE ${_PLUGIN_EXPORT_DIRECTIVE} EXPORTED_INCLUDE_SUFFIXES ${_PLUGIN_EXPORTED_INCLUDE_SUFFIXES} ${is_test_plugin}) - TARGET_LINK_LIBRARIES(${PLUGIN_TARGET} ${ALL_LIBRARIES}) - - IF(MITK_DEFAULT_SUBPROJECTS AND NOT MY_SUBPROJECTS) - SET(MY_SUBPROJECTS ${MITK_DEFAULT_SUBPROJECTS}) - ENDIF() - - IF(MY_SUBPROJECTS) - SET_PROPERTY(TARGET ${PLUGIN_TARGET} PROPERTY LABELS ${MY_SUBPROJECTS}) - FOREACH(subproject ${MY_SUBPROJECTS}) - ADD_DEPENDENCIES(${subproject} ${PLUGIN_TARGET}) - ENDFOREACH() - ENDIF() - ELSE(NOT _MODULE_CHECK_RESULT) - IF(NOT MITK_BUILD_ALL_PLUGINS) - MESSAGE(SEND_ERROR "${PLUGIN_TARGET} is missing requirements and won't be built. Missing: ${_MODULE_CHECK_RESULT}") - ELSE() - MESSAGE(STATUS "${PLUGIN_TARGET} is missing requirements and won't be built. Missing: ${_MODULE_CHECK_RESULT}") - ENDIF() - ENDIF(NOT _MODULE_CHECK_RESULT) -ENDMACRO() + target_link_libraries(${PLUGIN_TARGET} ${ALL_LIBRARIES}) + + if(MITK_DEFAULT_SUBPROJECTS AND NOT MY_SUBPROJECTS) + set(MY_SUBPROJECTS ${MITK_DEFAULT_SUBPROJECTS}) + endif() + + if(MY_SUBPROJECTS) + set_property(TARGET ${PLUGIN_TARGET} PROPERTY LABELS ${MY_SUBPROJECTS}) + foreach(subproject ${MY_SUBPROJECTS}) + add_dependencies(${subproject} ${PLUGIN_TARGET}) + endforeach() + endif() + else(NOT _MODULE_CHECK_RESULT) + if(NOT MITK_BUILD_ALL_PLUGINS) + message(SEND_ERROR "${PLUGIN_TARGET} is missing requirements and won't be built. Missing: ${_MODULE_CHECK_RESULT}") + else() + message(STATUS "${PLUGIN_TARGET} is missing requirements and won't be built. Missing: ${_MODULE_CHECK_RESULT}") + endif() + endif(NOT _MODULE_CHECK_RESULT) +endmacro() diff --git a/CMake/mitkMacroCreateDefaultTests.cmake b/CMake/mitkMacroCreateDefaultTests.cmake index 6f1df524ac..60e53659f6 100644 --- a/CMake/mitkMacroCreateDefaultTests.cmake +++ b/CMake/mitkMacroCreateDefaultTests.cmake @@ -1,61 +1,61 @@ # Create TestDriver and default tests for MITK # # CMake variables used: # # ${${KITNAME}_GUI_TESTS} : filenames of all tests that run without a parameter # ${${KITNAME}_IMAGE_GUI_TESTS : filenames of all tests that run with an image filename as parameter # ${${KITNAME}_TESTS} : filenames of all tests that run without a parameter # ${${KITNAME}_IMAGE_TESTS : filenames of all tests that run with an image filename as parameter # ${${KITNAME}_TESTIMAGES} : list of images passed as parameter for the IMAGE_TESTS # ${${KITNAME}_CUSTOM_TESTS} : filenames of custom tests which are just added to the TestDriver. Execution # of these has to be specified manually with the ADD_TEST CMake command. # -MACRO(MITK_CREATE_DEFAULT_TESTS) +macro(MITK_CREATE_DEFAULT_TESTS) # add tests which need a GUI if it is not disabled - IF(NOT MITK_GUI_TESTS_DISABLED) - SET( ${KITNAME}_TESTS ${${KITNAME}_TESTS} ${${KITNAME}_GUI_TESTS} ) - SET( ${KITNAME}_IMAGE_TESTS ${${KITNAME}_IMAGE_TESTS} ${${KITNAME}_IMAGE_GUI_TESTS} ) - ENDIF(NOT MITK_GUI_TESTS_DISABLED) + if(NOT MITK_GUI_TESTS_DISABLED) + set( ${KITNAME}_TESTS ${${KITNAME}_TESTS} ${${KITNAME}_GUI_TESTS} ) + set( ${KITNAME}_IMAGE_TESTS ${${KITNAME}_IMAGE_TESTS} ${${KITNAME}_IMAGE_GUI_TESTS} ) + endif(NOT MITK_GUI_TESTS_DISABLED) # # Create the TestDriver binary which contains all the tests. # - CREATE_TEST_SOURCELIST(MITKTEST_SOURCE ${KITNAME}TestDriver.cpp + create_test_sourcelist(MITKTEST_SOURCE ${KITNAME}TestDriver.cpp ${${KITNAME}_TESTS} ${${KITNAME}_IMAGE_TESTS} ${${KITNAME}_CUSTOM_TESTS} ) - ADD_EXECUTABLE(${KITNAME}TestDriver ${MITKTEST_SOURCE}) + add_executable(${KITNAME}TestDriver ${MITKTEST_SOURCE}) set_property(TARGET ${KITNAME}TestDriver PROPERTY LABELS ${PROJECT_NAME}) - TARGET_LINK_LIBRARIES(${KITNAME}TestDriver ${${KITNAME}_CORE_LIBRARIES} ${${KITNAME}_LIBRARIES} ${LIBRARIES_FOR_${KITNAME}_CORE}) + target_link_libraries(${KITNAME}TestDriver ${${KITNAME}_CORE_LIBRARIES} ${${KITNAME}_LIBRARIES} ${LIBRARIES_FOR_${KITNAME}_CORE}) # # Now tell CMake which tests should be run. This is done automatically # for all tests in ${KITNAME}_TESTS and ${KITNAME}_IMAGE_TESTS. The IMAGE_TESTS # are run for each image in the TESTIMAGES list. # - FOREACH( test ${${KITNAME}_TESTS} ) - GET_FILENAME_COMPONENT(TName ${test} NAME_WE) - ADD_TEST(${TName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KITNAME}TestDriver ${TName}) + foreach( test ${${KITNAME}_TESTS} ) + get_filename_component(TName ${test} NAME_WE) + add_test(${TName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KITNAME}TestDriver ${TName}) set_property(TEST ${TName} PROPERTY LABELS ${PROJECT_NAME}) - ENDFOREACH( test ) + endforeach( test ) - FOREACH(image ${${KITNAME}_TESTIMAGES} ${ADDITIONAL_TEST_IMAGES} ) - IF(EXISTS ${image}) - SET(IMAGE_FULL_PATH ${image}) - ELSE(EXISTS ${image}) + foreach(image ${${KITNAME}_TESTIMAGES} ${ADDITIONAL_TEST_IMAGES} ) + if(EXISTS ${image}) + set(IMAGE_FULL_PATH ${image}) + else(EXISTS ${image}) # todo: maybe search other paths as well # yes, please in mitk/Testing/Data, too - SET(IMAGE_FULL_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Data/${image}) - ENDIF(EXISTS ${image}) + set(IMAGE_FULL_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Data/${image}) + endif(EXISTS ${image}) - IF(EXISTS ${IMAGE_FULL_PATH}) - FOREACH( test ${${KITNAME}_IMAGE_TESTS} ) - GET_FILENAME_COMPONENT(TName ${test} NAME_WE) - GET_FILENAME_COMPONENT(ImageName ${IMAGE_FULL_PATH} NAME) - ADD_TEST(${TName}_${ImageName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KITNAME}TestDriver ${TName} ${IMAGE_FULL_PATH}) + if(EXISTS ${IMAGE_FULL_PATH}) + foreach( test ${${KITNAME}_IMAGE_TESTS} ) + get_filename_component(TName ${test} NAME_WE) + get_filename_component(ImageName ${IMAGE_FULL_PATH} NAME) + add_test(${TName}_${ImageName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KITNAME}TestDriver ${TName} ${IMAGE_FULL_PATH}) set_property(TEST ${TName}_${ImageName} PROPERTY LABELS ${PROJECT_NAME}) - ENDFOREACH( test ) - ELSE(EXISTS ${IMAGE_FULL_PATH}) - MESSAGE("!!!!! No such file: ${IMAGE_FULL_PATH} !!!!!") - ENDIF(EXISTS ${IMAGE_FULL_PATH}) - ENDFOREACH( image ) -ENDMACRO(MITK_CREATE_DEFAULT_TESTS) + endforeach( test ) + else(EXISTS ${IMAGE_FULL_PATH}) + message("!!!!! No such file: ${IMAGE_FULL_PATH} !!!!!") + endif(EXISTS ${IMAGE_FULL_PATH}) + endforeach( image ) +endmacro(MITK_CREATE_DEFAULT_TESTS) diff --git a/CMake/mitkMacroCreateModule.cmake b/CMake/mitkMacroCreateModule.cmake index a547e8c7e0..66f0214a1f 100644 --- a/CMake/mitkMacroCreateModule.cmake +++ b/CMake/mitkMacroCreateModule.cmake @@ -1,267 +1,267 @@ ################################################################## # # MITK_CREATE_MODULE # #! Creates a module for the automatic module dependency system within MITK. #! Configurations are generated in the moduleConf directory. #! #! USAGE: #! #! \code #! MITK_CREATE_MODULE( #! [INCLUDE_DIRS ] #! [INTERNAL_INCLUDE_DIRS ] #! [DEPENDS ] #! [PACKAGE_DEPENDS ] #! [TARGET_DEPENDS #! [EXPORT_DEFINE ] #! [QT_MODULE] #! [HEADERS_ONLY] #! \endcode #! #! \param MODULE_NAME_IN The name for the new module #! \param HEADERS_ONLY specify this if the modules just contains header files. ################################################################## -MACRO(MITK_CREATE_MODULE MODULE_NAME_IN) +macro(MITK_CREATE_MODULE MODULE_NAME_IN) MACRO_PARSE_ARGUMENTS(MODULE "SUBPROJECTS;VERSION;INCLUDE_DIRS;INTERNAL_INCLUDE_DIRS;DEPENDS;DEPENDS_INTERNAL;PACKAGE_DEPENDS;TARGET_DEPENDS;EXPORT_DEFINE;ADDITIONAL_LIBS;GENERATED_CPP" "QT_MODULE;FORCE_STATIC;HEADERS_ONLY;GCC_DEFAULT_VISIBILITY;NO_INIT" ${ARGN}) - SET(MODULE_NAME ${MODULE_NAME_IN}) + set(MODULE_NAME ${MODULE_NAME_IN}) - IF(MODULE_HEADERS_ONLY) - SET(MODULE_PROVIDES ) - ELSE() - SET(MODULE_PROVIDES ${MODULE_NAME}) - IF(NOT MODULE_NO_INIT AND NOT MODULE_NAME STREQUAL "Mitk") + if(MODULE_HEADERS_ONLY) + set(MODULE_PROVIDES ) + else() + set(MODULE_PROVIDES ${MODULE_NAME}) + if(NOT MODULE_NO_INIT AND NOT MODULE_NAME STREQUAL "Mitk") # Add a dependency to the "Mitk" module - LIST(APPEND MODULE_DEPENDS Mitk) - ENDIF() - ENDIF() + list(APPEND MODULE_DEPENDS Mitk) + endif() + endif() - IF(NOT MODULE_SUBPROJECTS) - IF(MITK_DEFAULT_SUBPROJECTS) - SET(MODULE_SUBPROJECTS ${MITK_DEFAULT_SUBPROJECTS}) - ENDIF() - ENDIF() + if(NOT MODULE_SUBPROJECTS) + if(MITK_DEFAULT_SUBPROJECTS) + set(MODULE_SUBPROJECTS ${MITK_DEFAULT_SUBPROJECTS}) + endif() + endif() # check if the subprojects exist as targets - IF(MODULE_SUBPROJECTS) - FOREACH(subproject ${MODULE_SUBPROJECTS}) - IF(NOT TARGET ${subproject}) - MESSAGE(SEND_ERROR "The subproject ${subproject} does not have a corresponding target") - ENDIF() - ENDFOREACH() - ENDIF() + if(MODULE_SUBPROJECTS) + foreach(subproject ${MODULE_SUBPROJECTS}) + if(NOT TARGET ${subproject}) + message(SEND_ERROR "The subproject ${subproject} does not have a corresponding target") + endif() + endforeach() + endif() # assume worst case - SET(MODULE_IS_ENABLED 0) + set(MODULE_IS_ENABLED 0) # first we check if we have an explicit module build list - IF(MITK_MODULES_TO_BUILD) - LIST(FIND MITK_MODULES_TO_BUILD ${MODULE_NAME} _MOD_INDEX) - IF(_MOD_INDEX EQUAL -1) - SET(MODULE_IS_EXCLUDED 1) - ENDIF() - ENDIF() - IF(NOT MODULE_IS_EXCLUDED) + if(MITK_MODULES_TO_BUILD) + list(FIND MITK_MODULES_TO_BUILD ${MODULE_NAME} _MOD_INDEX) + if(_MOD_INDEX EQUAL -1) + set(MODULE_IS_EXCLUDED 1) + endif() + endif() + if(NOT MODULE_IS_EXCLUDED) # first of all we check for the dependencies MITK_CHECK_MODULE(_MISSING_DEP ${MODULE_DEPENDS}) - IF(_MISSING_DEP) - MESSAGE("Module ${MODULE_NAME} won't be built, missing dependency: ${_MISSING_DEP}") - SET(MODULE_IS_ENABLED 0) - ELSE(_MISSING_DEP) - SET(MODULE_IS_ENABLED 1) + if(_MISSING_DEP) + message("Module ${MODULE_NAME} won't be built, missing dependency: ${_MISSING_DEP}") + set(MODULE_IS_ENABLED 0) + else(_MISSING_DEP) + set(MODULE_IS_ENABLED 1) # now check for every package if it is enabled. This overlaps a bit with # MITK_CHECK_MODULE ... - FOREACH(_package ${MODULE_PACKAGE_DEPENDS}) - IF((DEFINED MITK_USE_${_package}) AND NOT (MITK_USE_${_package})) - MESSAGE("Module ${MODULE_NAME} won't be built. Turn on MITK_USE_${_package} if you want to use it.") - SET(MODULE_IS_ENABLED 0) - ENDIF() - ENDFOREACH() - IF(MODULE_IS_ENABLED) + foreach(_package ${MODULE_PACKAGE_DEPENDS}) + if((DEFINED MITK_USE_${_package}) AND NOT (MITK_USE_${_package})) + message("Module ${MODULE_NAME} won't be built. Turn on MITK_USE_${_package} if you want to use it.") + set(MODULE_IS_ENABLED 0) + endif() + endforeach() + if(MODULE_IS_ENABLED) - IF(NOT MODULE_QT_MODULE OR MITK_USE_QT) - SET(MODULE_IS_ENABLED 1) + if(NOT MODULE_QT_MODULE OR MITK_USE_QT) + set(MODULE_IS_ENABLED 1) _MITK_CREATE_MODULE_CONF() - IF(NOT MODULE_EXPORT_DEFINE) - SET(MODULE_EXPORT_DEFINE ${MODULE_NAME}_EXPORT) - ENDIF(NOT MODULE_EXPORT_DEFINE) - CONFIGURE_FILE(${MITK_SOURCE_DIR}/CMake/moduleExports.h.in ${CMAKE_BINARY_DIR}/${MODULES_CONF_DIRNAME}/${MODULE_NAME}Exports.h @ONLY) + if(NOT MODULE_EXPORT_DEFINE) + set(MODULE_EXPORT_DEFINE ${MODULE_NAME}_EXPORT) + endif(NOT MODULE_EXPORT_DEFINE) + configure_file(${MITK_SOURCE_DIR}/CMake/moduleExports.h.in ${CMAKE_BINARY_DIR}/${MODULES_CONF_DIRNAME}/${MODULE_NAME}Exports.h @ONLY) - IF(MITK_GENERATE_MODULE_DOT) - MESSAGE("MODULEDOTNAME ${MODULE_NAME}") - FOREACH(dep ${MODULE_DEPENDS}) - MESSAGE("MODULEDOT \"${MODULE_NAME}\" -> \"${dep}\" ; ") - ENDFOREACH(dep) - ENDIF(MITK_GENERATE_MODULE_DOT) + if(MITK_GENERATE_MODULE_DOT) + message("MODULEDOTNAME ${MODULE_NAME}") + foreach(dep ${MODULE_DEPENDS}) + message("MODULEDOT \"${MODULE_NAME}\" -> \"${dep}\" ; ") + endforeach(dep) + endif(MITK_GENERATE_MODULE_DOT) - IF(NOT MODULE_NO_INIT) - SET(MODULE_LIBNAME ${MODULE_PROVIDES}) + if(NOT MODULE_NO_INIT) + set(MODULE_LIBNAME ${MODULE_PROVIDES}) - SET(module_init_src_file) + set(module_init_src_file) usFunctionGenerateModuleInit(module_init_src_file NAME ${MODULE_NAME} LIBRARY_NAME ${MODULE_LIBNAME} DEPENDS ${MODULE_DEPENDS} ${MODULE_DEPENDS_INTERNAL} ${MODULE_PACKAGE_DEPENDS} #VERSION ${MODULE_VERSION} ) - ENDIF() + endif() - SET(DEPENDS "${MODULE_DEPENDS}") - SET(DEPENDS_BEFORE "not initialized") - SET(PACKAGE_DEPENDS "${MODULE_PACKAGE_DEPENDS}") + set(DEPENDS "${MODULE_DEPENDS}") + set(DEPENDS_BEFORE "not initialized") + set(PACKAGE_DEPENDS "${MODULE_PACKAGE_DEPENDS}") MITK_USE_MODULE("${MODULE_DEPENDS}") # ok, now create the module itself - INCLUDE_DIRECTORIES(. ${ALL_INCLUDE_DIRECTORIES}) - INCLUDE(files.cmake) + include_directories(. ${ALL_INCLUDE_DIRECTORIES}) + include(files.cmake) - SET(module_compile_flags ) - IF(WIN32) - SET(module_compile_flags "${module_compile_flags} -DPOCO_NO_UNWINDOWS -DWIN32_LEAN_AND_MEAN") - ENDIF() + set(module_compile_flags ) + if(WIN32) + set(module_compile_flags "${module_compile_flags} -DPOCO_NO_UNWINDOWS -DWIN32_LEAN_AND_MEAN") + endif() # MinGW does not export all symbols automatically, so no need to set flags - IF(CMAKE_COMPILER_IS_GNUCXX AND NOT MINGW AND NOT MODULE_GCC_DEFAULT_VISIBILITY) - IF(${GCC_VERSION} VERSION_GREATER "4.5.0") + if(CMAKE_COMPILER_IS_GNUCXX AND NOT MINGW AND NOT MODULE_GCC_DEFAULT_VISIBILITY) + if(${GCC_VERSION} VERSION_GREATER "4.5.0") # With gcc < 4.5, type_info objects need special care. Especially exceptions # and inline definitions of classes from 3rd party libraries would need # to be wrapped with pragma GCC visibility statements if the library is not # prepared to handle hidden visibility. This would need too many changes in # MITK and would be too fragile. - SET(module_compile_flags "${module_compile_flags} -fvisibility=hidden -fvisibility-inlines-hidden") - ENDIF() - ENDIF() + set(module_compile_flags "${module_compile_flags} -fvisibility=hidden -fvisibility-inlines-hidden") + endif() + endif() - IF(NOT MODULE_NO_INIT) - LIST(APPEND CPP_FILES ${module_init_src_file}) - ENDIF() + if(NOT MODULE_NO_INIT) + list(APPEND CPP_FILES ${module_init_src_file}) + endif() - IF(NOT MODULE_QT_MODULE) + if(NOT MODULE_QT_MODULE) ORGANIZE_SOURCES(SOURCE ${CPP_FILES} HEADER ${H_FILES} TXX ${TXX_FILES} DOC ${DOX_FILES} ) - IF(MODULE_FORCE_STATIC) - SET(_STATIC STATIC) - ELSE() - SET(_STATIC ) - ENDIF(MODULE_FORCE_STATIC) + if(MODULE_FORCE_STATIC) + set(_STATIC STATIC) + else() + set(_STATIC ) + endif(MODULE_FORCE_STATIC) - SET(coverage_sources ${CPP_FILES} ${H_FILES} ${GLOBBED__H_FILES} ${CORRESPONDING__H_FILES} ${TXX_FILES} ${TOOL_CPPS}) - IF(MODULE_SUBPROJECTS) - SET_PROPERTY(SOURCE ${coverage_sources} APPEND PROPERTY LABELS ${MODULE_SUBPROJECTS} MITK) - ENDIF() + set(coverage_sources ${CPP_FILES} ${H_FILES} ${GLOBBED__H_FILES} ${CORRESPONDING__H_FILES} ${TXX_FILES} ${TOOL_CPPS}) + if(MODULE_SUBPROJECTS) + set_property(SOURCE ${coverage_sources} APPEND PROPERTY LABELS ${MODULE_SUBPROJECTS} MITK) + endif() - IF(NOT MODULE_HEADERS_ONLY) - IF(ALL_LIBRARY_DIRS) + if(NOT MODULE_HEADERS_ONLY) + if(ALL_LIBRARY_DIRS) # LINK_DIRECTORIES applies only to targets which are added after the call to LINK_DIRECTORIES - LINK_DIRECTORIES(${ALL_LIBRARY_DIRS}) - ENDIF(ALL_LIBRARY_DIRS) - ADD_LIBRARY(${MODULE_PROVIDES} ${_STATIC} ${coverage_sources} ${CPP_FILES_GENERATED} ${DOX_FILES} ${UI_FILES}) - IF(MODULE_TARGET_DEPENDS) - ADD_DEPENDENCIES(${MODULE_PROVIDES} ${MODULE_TARGET_DEPENDS}) - ENDIF() - IF(MODULE_SUBPROJECTS) - SET_PROPERTY(TARGET ${MODULE_PROVIDES} PROPERTY LABELS ${MODULE_SUBPROJECTS} MITK) - FOREACH(subproject ${MODULE_SUBPROJECTS}) - ADD_DEPENDENCIES(${subproject} ${MODULE_PROVIDES}) - ENDFOREACH() - ENDIF() - IF(ALL_LIBRARIES) - TARGET_LINK_LIBRARIES(${MODULE_PROVIDES} ${ALL_LIBRARIES}) - ENDIF(ALL_LIBRARIES) + link_directories(${ALL_LIBRARY_DIRS}) + endif(ALL_LIBRARY_DIRS) + add_library(${MODULE_PROVIDES} ${_STATIC} ${coverage_sources} ${CPP_FILES_GENERATED} ${DOX_FILES} ${UI_FILES}) + if(MODULE_TARGET_DEPENDS) + add_dependencies(${MODULE_PROVIDES} ${MODULE_TARGET_DEPENDS}) + endif() + if(MODULE_SUBPROJECTS) + set_property(TARGET ${MODULE_PROVIDES} PROPERTY LABELS ${MODULE_SUBPROJECTS} MITK) + foreach(subproject ${MODULE_SUBPROJECTS}) + add_dependencies(${subproject} ${MODULE_PROVIDES}) + endforeach() + endif() + if(ALL_LIBRARIES) + target_link_libraries(${MODULE_PROVIDES} ${ALL_LIBRARIES}) + endif(ALL_LIBRARIES) - IF(MINGW) - TARGET_LINK_LIBRARIES(${MODULE_PROVIDES} ssp) # add stack smash protection lib - ENDIF() - ENDIF() + if(MINGW) + target_link_libraries(${MODULE_PROVIDES} ssp) # add stack smash protection lib + endif() + endif() - ELSE(NOT MODULE_QT_MODULE) + else(NOT MODULE_QT_MODULE) - INCLUDE(files.cmake) - IF(NOT MODULE_NO_INIT) - LIST(APPEND CPP_FILES ${module_init_src_file}) - ENDIF() + include(files.cmake) + if(NOT MODULE_NO_INIT) + list(APPEND CPP_FILES ${module_init_src_file}) + endif() - IF(UI_FILES) + if(UI_FILES) QT4_WRAP_UI(Q${KITNAME}_GENERATED_UI_CPP ${UI_FILES}) - ENDIF(UI_FILES) + endif(UI_FILES) - IF(MOC_H_FILES) + if(MOC_H_FILES) QT4_WRAP_CPP(Q${KITNAME}_GENERATED_MOC_CPP ${MOC_H_FILES}) - ENDIF(MOC_H_FILES) + endif(MOC_H_FILES) - IF(QRC_FILES) + if(QRC_FILES) QT4_ADD_RESOURCES(Q${KITNAME}_GENERATED_QRC_CPP ${QRC_FILES}) - ENDIF(QRC_FILES) + endif(QRC_FILES) - SET(Q${KITNAME}_GENERATED_CPP ${Q${KITNAME}_GENERATED_CPP} ${Q${KITNAME}_GENERATED_UI_CPP} ${Q${KITNAME}_GENERATED_MOC_CPP} ${Q${KITNAME}_GENERATED_QRC_CPP}) + set(Q${KITNAME}_GENERATED_CPP ${Q${KITNAME}_GENERATED_CPP} ${Q${KITNAME}_GENERATED_UI_CPP} ${Q${KITNAME}_GENERATED_MOC_CPP} ${Q${KITNAME}_GENERATED_QRC_CPP}) ORGANIZE_SOURCES(SOURCE ${CPP_FILES} HEADER ${H_FILES} TXX ${TXX_FILES} DOC ${DOX_FILES} UI ${UI_FILES} QRC ${QRC_FILES} MOC ${Q${KITNAME}_GENERATED_MOC_CPP} GEN_QRC ${Q${KITNAME}_GENERATED_QRC_CPP} GEN_UI ${Q${KITNAME}_GENERATED_UI_CPP}) # MITK_GENERATE_TOOLS_LIBRARY(Qmitk${LIBPOSTFIX} "NO") - SET(coverage_sources ${CPP_FILES} ${CORRESPONDING__H_FILES} ${GLOBBED__H_FILES} ${TXX_FILES} ${TOOL_GUI_CPPS}) - SET_PROPERTY(SOURCE ${coverage_sources} APPEND PROPERTY LABELS ${MODULE_SUBPROJECTS}) + set(coverage_sources ${CPP_FILES} ${CORRESPONDING__H_FILES} ${GLOBBED__H_FILES} ${TXX_FILES} ${TOOL_GUI_CPPS}) + set_property(SOURCE ${coverage_sources} APPEND PROPERTY LABELS ${MODULE_SUBPROJECTS}) - IF(NOT MODULE_HEADERS_ONLY) - IF(ALL_LIBRARY_DIRS) + if(NOT MODULE_HEADERS_ONLY) + if(ALL_LIBRARY_DIRS) # LINK_DIRECTORIES applies only to targets which are added after the call to LINK_DIRECTORIES - LINK_DIRECTORIES(${ALL_LIBRARY_DIRS}) - ENDIF(ALL_LIBRARY_DIRS) - ADD_LIBRARY(${MODULE_PROVIDES} ${coverage_sources} ${CPP_FILES_GENERATED} ${Q${KITNAME}_GENERATED_CPP} ${DOX_FILES} ${UI_FILES} ${QRC_FILES}) - TARGET_LINK_LIBRARIES(${MODULE_PROVIDES} ${QT_LIBRARIES} ${ALL_LIBRARIES} QVTK) - IF(MODULE_TARGET_DEPENDS) - ADD_DEPENDENCIES(${MODULE_PROVIDES} ${MODULE_TARGET_DEPENDS}) - ENDIF() - IF(MINGW) - TARGET_LINK_LIBRARIES(${MODULE_PROVIDES} ssp) # add stack smash protection lib - ENDIF() - IF(MODULE_SUBPROJECTS) - SET_PROPERTY(TARGET ${MODULE_PROVIDES} PROPERTY LABELS ${MODULE_SUBPROJECTS} MITK) - FOREACH(subproject ${MODULE_SUBPROJECTS}) - ADD_DEPENDENCIES(${subproject} ${MODULE_PROVIDES}) - ENDFOREACH() - ENDIF() - ENDIF() + link_directories(${ALL_LIBRARY_DIRS}) + endif(ALL_LIBRARY_DIRS) + add_library(${MODULE_PROVIDES} ${coverage_sources} ${CPP_FILES_GENERATED} ${Q${KITNAME}_GENERATED_CPP} ${DOX_FILES} ${UI_FILES} ${QRC_FILES}) + target_link_libraries(${MODULE_PROVIDES} ${QT_LIBRARIES} ${ALL_LIBRARIES} QVTK) + if(MODULE_TARGET_DEPENDS) + add_dependencies(${MODULE_PROVIDES} ${MODULE_TARGET_DEPENDS}) + endif() + if(MINGW) + target_link_libraries(${MODULE_PROVIDES} ssp) # add stack smash protection lib + endif() + if(MODULE_SUBPROJECTS) + set_property(TARGET ${MODULE_PROVIDES} PROPERTY LABELS ${MODULE_SUBPROJECTS} MITK) + foreach(subproject ${MODULE_SUBPROJECTS}) + add_dependencies(${subproject} ${MODULE_PROVIDES}) + endforeach() + endif() + endif() - ENDIF(NOT MODULE_QT_MODULE) + endif(NOT MODULE_QT_MODULE) - IF(NOT MODULE_HEADERS_ONLY) + if(NOT MODULE_HEADERS_ONLY) # Apply properties to the module target. - SET_TARGET_PROPERTIES(${MODULE_PROVIDES} PROPERTIES + set_target_properties(${MODULE_PROVIDES} PROPERTIES COMPILE_FLAGS "${module_compile_flags}" ) - ENDIF() + endif() # install only if shared lib (for now) - IF(NOT _STATIC OR MINGW) - IF(NOT MODULE_HEADERS_ONLY) + if(NOT _STATIC OR MINGW) + if(NOT MODULE_HEADERS_ONLY) # # deprecated: MITK_INSTALL_TARGETS(${MODULE_PROVIDES}) - ENDIF() - ENDIF(NOT _STATIC OR MINGW) + endif() + endif(NOT _STATIC OR MINGW) - ENDIF(NOT MODULE_QT_MODULE OR MITK_USE_QT) - ENDIF(MODULE_IS_ENABLED) - ENDIF(_MISSING_DEP) - ENDIF(NOT MODULE_IS_EXCLUDED) + endif(NOT MODULE_QT_MODULE OR MITK_USE_QT) + endif(MODULE_IS_ENABLED) + endif(_MISSING_DEP) + endif(NOT MODULE_IS_EXCLUDED) - IF(NOT MODULE_IS_ENABLED) + if(NOT MODULE_IS_ENABLED) _MITK_CREATE_MODULE_CONF() - ENDIF(NOT MODULE_IS_ENABLED) + endif(NOT MODULE_IS_ENABLED) -ENDMACRO(MITK_CREATE_MODULE) +endmacro(MITK_CREATE_MODULE) diff --git a/CMake/mitkMacroCreateModuleConf.cmake b/CMake/mitkMacroCreateModuleConf.cmake index 77e649d193..7e8d8af5cd 100644 --- a/CMake/mitkMacroCreateModuleConf.cmake +++ b/CMake/mitkMacroCreateModuleConf.cmake @@ -1,40 +1,40 @@ ################################################################### # # MITK_CREATE_MODULE_CONF # # This can be called in a similar way like MITK_CREATE_MODULE # but it just creates the module configuration files without # actually building it. It is used for integration of legacy libraries # into the MITK module build system # ################################################################## -MACRO(MITK_CREATE_MODULE_CONF MODULE_NAME_IN) +macro(MITK_CREATE_MODULE_CONF MODULE_NAME_IN) MACRO_PARSE_ARGUMENTS(MODULE "INCLUDE_DIRS;DEPENDS;" "QT_MODULE;HEADERS_ONLY" ${ARGN}) - SET(MODULE_NAME ${MODULE_NAME_IN}) - IF(MODULE_HEADERS_ONLY) - SET(MODULE_PROVIDES ) - ELSE() - SET(MODULE_PROVIDES ${MODULE_NAME}) - ENDIF() - SET(MODULE_IS_ENABLED 1) + set(MODULE_NAME ${MODULE_NAME_IN}) + if(MODULE_HEADERS_ONLY) + set(MODULE_PROVIDES ) + else() + set(MODULE_PROVIDES ${MODULE_NAME}) + endif() + set(MODULE_IS_ENABLED 1) _MITK_CREATE_MODULE_CONF() -ENDMACRO(MITK_CREATE_MODULE_CONF) +endmacro(MITK_CREATE_MODULE_CONF) -MACRO(_MITK_CREATE_MODULE_CONF) - IF(NOT MODULE_QT_MODULE OR MITK_USE_QT) - SET(MODULE_INCLUDE_DIRS_ABSOLUTE "") - FOREACH(dir ${MODULE_INCLUDE_DIRS}) - GET_FILENAME_COMPONENT(abs_dir ${dir} ABSOLUTE) - SET(MODULE_INCLUDE_DIRS_ABSOLUTE ${MODULE_INCLUDE_DIRS_ABSOLUTE} ${abs_dir}) - ENDFOREACH(dir) +macro(_MITK_CREATE_MODULE_CONF) + if(NOT MODULE_QT_MODULE OR MITK_USE_QT) + set(MODULE_INCLUDE_DIRS_ABSOLUTE "") + foreach(dir ${MODULE_INCLUDE_DIRS}) + get_filename_component(abs_dir ${dir} ABSOLUTE) + set(MODULE_INCLUDE_DIRS_ABSOLUTE ${MODULE_INCLUDE_DIRS_ABSOLUTE} ${abs_dir}) + endforeach(dir) - SET(MODULE_INCLUDE_DIRS ${MODULE_INCLUDE_DIRS_ABSOLUTE} ${CMAKE_CURRENT_SOURCE_DIR}) + set(MODULE_INCLUDE_DIRS ${MODULE_INCLUDE_DIRS_ABSOLUTE} ${CMAKE_CURRENT_SOURCE_DIR}) # Qt generates headers in the binary tree - IF(MODULE_QT_MODULE) - SET(MODULE_INCLUDE_DIRS ${MODULE_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) - ENDIF(MODULE_QT_MODULE) - SET(${MODULE_NAME}_CONFIG_FILE "${CMAKE_BINARY_DIR}/${MODULES_CONF_DIRNAME}/${MODULE_NAME}Config.cmake" CACHE INTERNAL "Path to module config" FORCE) - CONFIGURE_FILE(${MITK_SOURCE_DIR}/CMake/moduleConf.cmake.in ${${MODULE_NAME}_CONFIG_FILE} @ONLY) - ENDIF(NOT MODULE_QT_MODULE OR MITK_USE_QT) -ENDMACRO(_MITK_CREATE_MODULE_CONF) + if(MODULE_QT_MODULE) + set(MODULE_INCLUDE_DIRS ${MODULE_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) + endif(MODULE_QT_MODULE) + set(${MODULE_NAME}_CONFIG_FILE "${CMAKE_BINARY_DIR}/${MODULES_CONF_DIRNAME}/${MODULE_NAME}Config.cmake" CACHE INTERNAL "Path to module config" FORCE) + configure_file(${MITK_SOURCE_DIR}/CMake/moduleConf.cmake.in ${${MODULE_NAME}_CONFIG_FILE} @ONLY) + endif(NOT MODULE_QT_MODULE OR MITK_USE_QT) +endmacro(_MITK_CREATE_MODULE_CONF) diff --git a/CMake/mitkMacroCreateModuleTests.cmake b/CMake/mitkMacroCreateModuleTests.cmake index e7948abb0e..db5caccb54 100644 --- a/CMake/mitkMacroCreateModuleTests.cmake +++ b/CMake/mitkMacroCreateModuleTests.cmake @@ -1,85 +1,85 @@ # # Create tests and testdriver for this module # # Usage: MITK_CREATE_MODULE_TESTS( [EXTRA_DRIVER_INIT init_code] ) # # EXTRA_DRIVER_INIT is inserted as c++ code in the testdriver and will be executed before each test # -MACRO(MITK_CREATE_MODULE_TESTS) +macro(MITK_CREATE_MODULE_TESTS) MACRO_PARSE_ARGUMENTS(MODULE_TEST "EXTRA_DRIVER_INIT;EXTRA_DRIVER_INCLUDE" "" ${ARGN}) - IF(BUILD_TESTING AND MODULE_IS_ENABLED) - SET(OLD_MOC_H_FILES ${MOC_H_FILES}) - SET(MOC_H_FILES) - INCLUDE(files.cmake) - INCLUDE_DIRECTORIES(.) + if(BUILD_TESTING AND MODULE_IS_ENABLED) + set(OLD_MOC_H_FILES ${MOC_H_FILES}) + set(MOC_H_FILES) + include(files.cmake) + include_directories(.) - IF(DEFINED MOC_H_FILES) + if(DEFINED MOC_H_FILES) QT4_WRAP_CPP(MODULE_TEST_GENERATED_MOC_CPP ${MOC_H_FILES}) - ENDIF(DEFINED MOC_H_FILES) + endif(DEFINED MOC_H_FILES) - SET(CMAKE_TESTDRIVER_BEFORE_TESTMAIN "mitk::LoggingBackend::Register(); ${MODULE_TEST_EXTRA_DRIVER_INIT};") - SET(CMAKE_TESTDRIVER_AFTER_TESTMAIN "mitk::LoggingBackend::Unregister();") - IF(NOT MODULE_TEST_EXTRA_DRIVER_INCLUDE) + set(CMAKE_TESTDRIVER_BEFORE_TESTMAIN "mitk::LoggingBackend::Register(); ${MODULE_TEST_EXTRA_DRIVER_INIT};") + set(CMAKE_TESTDRIVER_AFTER_TESTMAIN "mitk::LoggingBackend::Unregister();") + if(NOT MODULE_TEST_EXTRA_DRIVER_INCLUDE) # this is necessary to make the LoggingBackend calls available if nothing else is included - SET(MODULE_TEST_EXTRA_DRIVER_INCLUDE "mitkLog.h") - ENDIF(NOT MODULE_TEST_EXTRA_DRIVER_INCLUDE) + set(MODULE_TEST_EXTRA_DRIVER_INCLUDE "mitkLog.h") + endif(NOT MODULE_TEST_EXTRA_DRIVER_INCLUDE) - CREATE_TEST_SOURCELIST(MODULETEST_SOURCE ${MODULE_NAME}TestDriver.cpp + create_test_sourcelist(MODULETEST_SOURCE ${MODULE_NAME}TestDriver.cpp ${MODULE_TESTS} ${MODULE_IMAGE_TESTS} ${MODULE_CUSTOM_TESTS} EXTRA_INCLUDE ${MODULE_TEST_EXTRA_DRIVER_INCLUDE} ) - SET(TESTDRIVER ${MODULE_NAME}TestDriver) - ADD_EXECUTABLE(${TESTDRIVER} ${MODULETEST_SOURCE} ${MODULE_TEST_GENERATED_MOC_CPP} ${TEST_CPP_FILES}) - TARGET_LINK_LIBRARIES(${TESTDRIVER} ${MODULE_PROVIDES} ${ALL_LIBRARIES}) + set(TESTDRIVER ${MODULE_NAME}TestDriver) + add_executable(${TESTDRIVER} ${MODULETEST_SOURCE} ${MODULE_TEST_GENERATED_MOC_CPP} ${TEST_CPP_FILES}) + target_link_libraries(${TESTDRIVER} ${MODULE_PROVIDES} ${ALL_LIBRARIES}) - IF(MODULE_SUBPROJECTS) - FOREACH(subproject ${MODULE_SUBPROJECTS}) - ADD_DEPENDENCIES(${subproject} ${TESTDRIVER}) - ENDFOREACH() - ENDIF() + if(MODULE_SUBPROJECTS) + foreach(subproject ${MODULE_SUBPROJECTS}) + add_dependencies(${subproject} ${TESTDRIVER}) + endforeach() + endif() # # Now tell CMake which tests should be run. This is done automatically # for all tests in ${KITNAME}_TESTS and ${KITNAME}_IMAGE_TESTS. The IMAGE_TESTS # are run for each image in the TESTIMAGES list. # - FOREACH( test ${MODULE_TESTS} ) - GET_FILENAME_COMPONENT(TName ${test} NAME_WE) - ADD_TEST(${TName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} ${TName}) + foreach( test ${MODULE_TESTS} ) + get_filename_component(TName ${test} NAME_WE) + add_test(${TName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} ${TName}) # Add labels for CDash subproject support - IF(MODULE_SUBPROJECTS) - SET_PROPERTY(TEST ${TName} PROPERTY LABELS ${MODULE_SUBPROJECTS} MITK) - ENDIF() - ENDFOREACH( test ) + if(MODULE_SUBPROJECTS) + set_property(TEST ${TName} PROPERTY LABELS ${MODULE_SUBPROJECTS} MITK) + endif() + endforeach( test ) - FOREACH(image ${MODULE_TESTIMAGES} ${ADDITIONAL_TEST_IMAGES} ) - IF(EXISTS ${image}) - SET(IMAGE_FULL_PATH ${image}) - ELSE(EXISTS ${image}) + foreach(image ${MODULE_TESTIMAGES} ${ADDITIONAL_TEST_IMAGES} ) + if(EXISTS ${image}) + set(IMAGE_FULL_PATH ${image}) + else(EXISTS ${image}) # todo: maybe search other paths as well # yes, please in mitk/Testing/Data, too - SET(IMAGE_FULL_PATH ${MITK_DATA_DIR}/${image}) - ENDIF(EXISTS ${image}) + set(IMAGE_FULL_PATH ${MITK_DATA_DIR}/${image}) + endif(EXISTS ${image}) - IF(EXISTS ${IMAGE_FULL_PATH}) - FOREACH( test ${MODULE_IMAGE_TESTS} ) - GET_FILENAME_COMPONENT(TName ${test} NAME_WE) - GET_FILENAME_COMPONENT(ImageName ${IMAGE_FULL_PATH} NAME) - ADD_TEST(${TName}_${ImageName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} ${TName} ${IMAGE_FULL_PATH}) + if(EXISTS ${IMAGE_FULL_PATH}) + foreach( test ${MODULE_IMAGE_TESTS} ) + get_filename_component(TName ${test} NAME_WE) + get_filename_component(ImageName ${IMAGE_FULL_PATH} NAME) + add_test(${TName}_${ImageName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} ${TName} ${IMAGE_FULL_PATH}) # Add labels for CDash subproject support - IF(MODULE_SUBPROJECTS) - SET_PROPERTY(TEST ${TName}_${ImageName} PROPERTY LABELS ${MODULE_SUBPROJECTS} MITK) - ENDIF() - ENDFOREACH( test ) - ELSE(EXISTS ${IMAGE_FULL_PATH}) - MESSAGE("!!!!! No such file: ${IMAGE_FULL_PATH} !!!!!") - ENDIF(EXISTS ${IMAGE_FULL_PATH}) - ENDFOREACH( image ) + if(MODULE_SUBPROJECTS) + set_property(TEST ${TName}_${ImageName} PROPERTY LABELS ${MODULE_SUBPROJECTS} MITK) + endif() + endforeach( test ) + else(EXISTS ${IMAGE_FULL_PATH}) + message("!!!!! No such file: ${IMAGE_FULL_PATH} !!!!!") + endif(EXISTS ${IMAGE_FULL_PATH}) + endforeach( image ) - SET(MOC_H_FILES ${OLD_MOC_H_FILES}) - ENDIF(BUILD_TESTING AND MODULE_IS_ENABLED) + set(MOC_H_FILES ${OLD_MOC_H_FILES}) + endif(BUILD_TESTING AND MODULE_IS_ENABLED) -ENDMACRO(MITK_CREATE_MODULE_TESTS) +endmacro(MITK_CREATE_MODULE_TESTS) diff --git a/CMake/mitkMacroEmptyExternalProject.cmake b/CMake/mitkMacroEmptyExternalProject.cmake index 0a5ad4b14f..8d8fc721fe 100644 --- a/CMake/mitkMacroEmptyExternalProject.cmake +++ b/CMake/mitkMacroEmptyExternalProject.cmake @@ -1,17 +1,17 @@ # # Convenient macro allowing to define a "empty" project in case an external one is provided # using for example _DIR. # Doing so allows to keep the external project dependency system happy. # -MACRO(mitkMacroEmptyExternalProject proj dependencies) +macro(mitkMacroEmptyExternalProject proj dependencies) ExternalProject_Add(${proj} DOWNLOAD_COMMAND "" CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" DEPENDS ${dependencies} ) -ENDMACRO() +endmacro() diff --git a/CMake/mitkMacroGenerateToolsLibrary.cmake b/CMake/mitkMacroGenerateToolsLibrary.cmake index 81dbdd40de..3ea68d1bab 100644 --- a/CMake/mitkMacroGenerateToolsLibrary.cmake +++ b/CMake/mitkMacroGenerateToolsLibrary.cmake @@ -1,96 +1,96 @@ -MACRO(MITK_GENERATE_TOOLS_LIBRARY) +macro(MITK_GENERATE_TOOLS_LIBRARY) - SET(libraryname ${ARGV0}) + set(libraryname ${ARGV0}) - SET(reallycreatelibrary TRUE) + set(reallycreatelibrary TRUE) - IF (${ARGC} EQUAL 2) # this won't work without the ${}, don't understand the cmake documentation - SET(reallycreatelibrary FALSE) - ENDIF (${ARGC} EQUAL 2) + if(${ARGC} EQUAL 2) # this won't work without the ${}, don't understand the cmake documentation + set(reallycreatelibrary FALSE) + endif(${ARGC} EQUAL 2) # if used inside MITK core, we fill variables in files.cmake - INCLUDE(tools.cmake OPTIONAL) + include(tools.cmake OPTIONAL) # GUI-less tools - IF (TOOL_FILES) + if(TOOL_FILES) # TODO these will also get Qmitk includes! Should not be - INCLUDE_DIRECTORIES(${MITK_INCLUDE_DIRS}) + include_directories(${MITK_INCLUDE_DIRS}) - FOREACH( TOOL_FILE ${TOOL_FILES} ) + foreach( TOOL_FILE ${TOOL_FILES} ) # construct tool name from file name - STRING(REGEX REPLACE ".*(^|[/\\])mitk(.+)\\.c(pp|xx)$" "\\2" TOOL_NAME ${TOOL_FILE}) - MESSAGE(STATUS "Adding segmentation tool: ${TOOL_NAME}") + string(REGEX REPLACE ".*(^|[/\\])mitk(.+)\\.c(pp|xx)$" "\\2" TOOL_NAME ${TOOL_FILE}) + message(STATUS "Adding segmentation tool: ${TOOL_NAME}") # source file names for this tool - SET( TOOL_CPPS ${TOOL_FILE} ${TOOL_CPPS} ) + set( TOOL_CPPS ${TOOL_FILE} ${TOOL_CPPS} ) # remember factory name for a central register call - ENDFOREACH( TOOL_FILE ${TOOL_FILES} ) + endforeach( TOOL_FILE ${TOOL_FILES} ) - ENDIF (TOOL_FILES) + endif(TOOL_FILES) # part for Qt widgets - IF (TOOL_QT4GUI_FILES) + if(TOOL_QT4GUI_FILES) # give them Qmitk headers - INCLUDE_DIRECTORIES(${QMITK_INCLUDE_DIRS}) + include_directories(${QMITK_INCLUDE_DIRS}) - FOREACH( TOOL_GUI_FILE ${TOOL_QT4GUI_FILES}) + foreach( TOOL_GUI_FILE ${TOOL_QT4GUI_FILES}) # construct tool name from file name - STRING(REGEX REPLACE "^Qmitk(.+)GUI\\.c(pp|xx)$" "\\1" TOOL_NAME ${TOOL_GUI_FILE}) - STRING(REGEX REPLACE "\\.c(pp|xx)$" ".h" TOOL_GUI_HEADER ${TOOL_GUI_FILE}) - MESSAGE(STATUS "Adding GUI for segmentation tool: ${TOOL_NAME}") + string(REGEX REPLACE "^Qmitk(.+)GUI\\.c(pp|xx)$" "\\1" TOOL_NAME ${TOOL_GUI_FILE}) + string(REGEX REPLACE "\\.c(pp|xx)$" ".h" TOOL_GUI_HEADER ${TOOL_GUI_FILE}) + message(STATUS "Adding GUI for segmentation tool: ${TOOL_NAME}") # source file names for this tool - SET( TOOL_GUI_CPPS ${TOOL_GUI_FILE} ${TOOL_GUI_CPPS} ) - SET( TOOL_GUI_MOC_H ${TOOL_GUI_HEADER} ${TOOL_GUI_MOC_H} ) - ENDFOREACH( TOOL_GUI_FILE ${TOOL_QT4GUI_FILES}) + set( TOOL_GUI_CPPS ${TOOL_GUI_FILE} ${TOOL_GUI_CPPS} ) + set( TOOL_GUI_MOC_H ${TOOL_GUI_HEADER} ${TOOL_GUI_MOC_H} ) + endforeach( TOOL_GUI_FILE ${TOOL_QT4GUI_FILES}) - QT_WRAP_CPP(${libraryname} TOOL_GUI_CPPS ${TOOL_GUI_MOC_H}) - ENDIF (TOOL_QT4GUI_FILES) + qt_wrap_cpp(${libraryname} TOOL_GUI_CPPS ${TOOL_GUI_MOC_H}) + endif(TOOL_QT4GUI_FILES) # care for additional files (should be used only with MITK external extensions) - IF (TOOL_ADDITIONAL_CPPS) - SET( TOOL_CPPS ${TOOL_ADDITIONAL_CPPS} ${TOOL_CPPS} ) - ENDIF (TOOL_ADDITIONAL_CPPS) + if(TOOL_ADDITIONAL_CPPS) + set( TOOL_CPPS ${TOOL_ADDITIONAL_CPPS} ${TOOL_CPPS} ) + endif(TOOL_ADDITIONAL_CPPS) - IF (TOOL_ADDITIONAL_MOC_H) - QT_WRAP_CPP(${libraryname} TOOL_GUI_CPPS ${TOOL_ADDITIONAL_MOC_H}) - ENDIF (TOOL_ADDITIONAL_MOC_H) + if(TOOL_ADDITIONAL_MOC_H) + qt_wrap_cpp(${libraryname} TOOL_GUI_CPPS ${TOOL_ADDITIONAL_MOC_H}) + endif(TOOL_ADDITIONAL_MOC_H) # in any case (GUI or non-GUI), create a shared library - IF (TOOL_FILES OR TOOL_QT4GUI_FILES) - IF (libraryname AND reallycreatelibrary) + if(TOOL_FILES OR TOOL_QT4GUI_FILES) + if(libraryname AND reallycreatelibrary) # configure one file with the itkLoad method - CONFIGURE_FILE( ${MITK_DIR}/ToolExtensionITKFactoryLoader.cpp.in + configure_file( ${MITK_DIR}/ToolExtensionITKFactoryLoader.cpp.in ${PROJECT_BINARY_DIR}/mitkToolExtensionITKFactoryLoader.cpp @ONLY ) # also mark this file for compilation - SET( TOOL_CPPS ${PROJECT_BINARY_DIR}/mitkToolExtensionITKFactoryLoader.cpp ${TOOL_CPPS} ) - MESSAGE(STATUS "Creating itkLoad for external library " ${libraryname}) + set( TOOL_CPPS ${PROJECT_BINARY_DIR}/mitkToolExtensionITKFactoryLoader.cpp ${TOOL_CPPS} ) + message(STATUS "Creating itkLoad for external library " ${libraryname}) - MESSAGE(STATUS "Adding library " ${libraryname}) + message(STATUS "Adding library " ${libraryname}) # a library to wrap up everything # configure a file that contains an itkObjectFactory for this tool - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) - LINK_DIRECTORIES(${MITK_LINK_DIRECTORIES}) - ADD_LIBRARY(${libraryname} SHARED ${TOOL_CPPS} ${TOOL_GUI_CPPS}) + link_directories(${MITK_LINK_DIRECTORIES}) + add_library(${libraryname} SHARED ${TOOL_CPPS} ${TOOL_GUI_CPPS}) - TARGET_LINK_LIBRARIES(${libraryname} ${QMITK_LIBRARIES}) - ENDIF (libraryname AND reallycreatelibrary) - ENDIF (TOOL_FILES OR TOOL_QT4GUI_FILES) + target_link_libraries(${libraryname} ${QMITK_LIBRARIES}) + endif(libraryname AND reallycreatelibrary) + endif(TOOL_FILES OR TOOL_QT4GUI_FILES) -ENDMACRO(MITK_GENERATE_TOOLS_LIBRARY) +endmacro(MITK_GENERATE_TOOLS_LIBRARY) diff --git a/CMake/mitkMacroGetLinuxDistribution.cmake b/CMake/mitkMacroGetLinuxDistribution.cmake index b79ff1745b..be354b0712 100755 --- a/CMake/mitkMacroGetLinuxDistribution.cmake +++ b/CMake/mitkMacroGetLinuxDistribution.cmake @@ -1,39 +1,39 @@ macro(GetLinuxDistribution) execute_process(COMMAND lsb_release -a OUTPUT_VARIABLE _out ERROR_VARIABLE _err RESULT_VARIABLE _result) string(COMPARE EQUAL "${_out}" "" _ok) if(_ok) string(REGEX REPLACE "\n" ";" _out ${_err}) else() string(REGEX REPLACE "\n" ";" _out ${_out}) endif() foreach(_i ${_out}) if("${_i}" MATCHES "^[Rr][Ee][Ll][Ee][Aa][Ss][Ee].*") string(REGEX REPLACE ":" ";" _i ${_i}) list(GET _i -1 _i) string(STRIP ${_i} _release) endif() if("${_i}" MATCHES "^[Dd][Ii][Ss][Tt][Rr][Ii][Bb][Uu][Tt][Oo][Rr].*") string(REGEX REPLACE ":" ";" _i ${_i}) list(GET _i -1 _i) string(STRIP ${_i} _distrib) endif() endforeach(_i) string(COMPARE EQUAL "${_distrib}" "" _ok1) string(COMPARE EQUAL "${_release}" "" _ok2) if(${_ok1} OR ${_ok2}) message(SEND_ERROR "could not determine linux release!") endif() -SET(LINUX_DISTRIBUTION ${_distrib}) -SET(LINUX_RELEASE ${_release}) +set(LINUX_DISTRIBUTION ${_distrib}) +set(LINUX_RELEASE ${_release}) endmacro() diff --git a/CMake/mitkMacroInstall.cmake b/CMake/mitkMacroInstall.cmake index 99f4d61069..e9c4c7499b 100644 --- a/CMake/mitkMacroInstall.cmake +++ b/CMake/mitkMacroInstall.cmake @@ -1,125 +1,125 @@ # # MITK specific install macro # # On Mac everything is installed for each bundle listed in MACOSX_BUNDLE_NAMES # by replacing the DESTINATION parameter. Everything else is passed to the CMake INSTALL command # # Usage: MITK_INSTALL( ) # -MACRO(MITK_INSTALL) +macro(MITK_INSTALL) - SET(ARGS ${ARGN}) + set(ARGS ${ARGN}) - SET(install_directories "") - LIST(FIND ARGS DESTINATION _destination_index) - # SET(_install_DESTINATION "") - IF(_destination_index GREATER -1) - MESSAGE(SEND_ERROR "MITK_INSTALL macro must not be called with a DESTINATION parameter.") + set(install_directories "") + list(FIND ARGS DESTINATION _destination_index) + # set(_install_DESTINATION "") + if(_destination_index GREATER -1) + message(SEND_ERROR "MITK_INSTALL macro must not be called with a DESTINATION parameter.") ### This code was a try to replace a given DESTINATION - #MATH(EXPR _destination_index ${_destination_index} + 1) - #LIST(GET ARGS ${_destination_index} _install_DESTINATION) - #STRING(REGEX REPLACE ^bin "" _install_DESTINATION ${_install_DESTINATION}) - ELSE() - IF(NOT MACOSX_BUNDLE_NAMES) - INSTALL(${ARGS} DESTINATION bin) - ELSE() - FOREACH(bundle_name ${MACOSX_BUNDLE_NAMES}) - INSTALL(${ARGS} DESTINATION ${bundle_name}.app/Contents/MacOS/${_install_DESTINATION}) - ENDFOREACH() - ENDIF() - ENDIF() + #math(EXPR _destination_index ${_destination_index} + 1) + #list(GET ARGS ${_destination_index} _install_DESTINATION) + #string(REGEX REPLACE ^bin "" _install_DESTINATION ${_install_DESTINATION}) + else() + if(NOT MACOSX_BUNDLE_NAMES) + install(${ARGS} DESTINATION bin) + else() + foreach(bundle_name ${MACOSX_BUNDLE_NAMES}) + install(${ARGS} DESTINATION ${bundle_name}.app/Contents/MacOS/${_install_DESTINATION}) + endforeach() + endif() + endif() -ENDMACRO() +endmacro() # Fix _target_location # This is used in several install macros -MACRO(_fixup_target) +macro(_fixup_target) - INSTALL(CODE " - MACRO(gp_item_default_embedded_path_override item default_embedded_path_var) - GET_FILENAME_COMPONENT(_item_name \"\${item}\" NAME) - GET_FILENAME_COMPONENT(_item_path \"\${item}\" PATH) + install(CODE " + macro(gp_item_default_embedded_path_override item default_embedded_path_var) + get_filename_component(_item_name \"\${item}\" NAME) + get_filename_component(_item_path \"\${item}\" PATH) # We have to fix all path references to build trees for plugins - IF(NOT _item_path MATCHES \"\${CMAKE_INSTALL_PREFIX}/${_bundle_dest_dir}\") + if(NOT _item_path MATCHES \"\${CMAKE_INSTALL_PREFIX}/${_bundle_dest_dir}\") # item with relative path or embedded path pointing to some build dir - SET(full_path \"full_path-NOTFOUND\") - FILE (GLOB_RECURSE full_path \${CMAKE_INSTALL_PREFIX}/${_bundle_dest_dir}/\${_item_name} ) - GET_FILENAME_COMPONENT(_item_path \"\${full_path}\" PATH) - ENDIF() + set(full_path \"full_path-NOTFOUND\") + file(GLOB_RECURSE full_path \${CMAKE_INSTALL_PREFIX}/${_bundle_dest_dir}/\${_item_name} ) + get_filename_component(_item_path \"\${full_path}\" PATH) + endif() - IF(_item_path STREQUAL \"\${CMAKE_INSTALL_PREFIX}/${_bundle_dest_dir}/plugins\" + if(_item_path STREQUAL \"\${CMAKE_INSTALL_PREFIX}/${_bundle_dest_dir}/plugins\" OR _item_name MATCHES \"liborg\" # this is for legacy BlueBerry bundle support ) # Only fix plugins - MESSAGE(\"override: \${item}\") - MESSAGE(\"found file: \${_item_path}/\${_item_name}\") - IF(APPLE) - STRING(REPLACE + message(\"override: \${item}\") + message(\"found file: \${_item_path}/\${_item_name}\") + if(APPLE) + string(REPLACE \${CMAKE_INSTALL_PREFIX}/${_bundle_dest_dir} @executable_path \${default_embedded_path_var} \"\${_item_path}\" ) - ELSE() - SET(\${default_embedded_path_var} \"\${_item_path}\") - ENDIF() - MESSAGE(\"override result: \${\${default_embedded_path_var}}\") - ENDIF() - ENDMACRO(gp_item_default_embedded_path_override) + else() + set(\${default_embedded_path_var} \"\${_item_path}\") + endif() + message(\"override result: \${\${default_embedded_path_var}}\") + endif() + endmacro(gp_item_default_embedded_path_override) - MACRO(gp_resolved_file_type_override file type) - IF(NOT APPLE) - GET_FILENAME_COMPONENT(_file_path \"\${file}\" PATH) - GET_FILENAME_COMPONENT(_file_name \"\${file}\" NAME) - IF(_file_path MATCHES \"^\${CMAKE_INSTALL_PREFIX}\") - SET(\${type} \"local\") - ENDIF() - IF(_file_name MATCHES gdiplus) - SET(\${type} \"system\") - ENDIF(_file_name MATCHES gdiplus) - ENDIF() - ENDMACRO(gp_resolved_file_type_override) + macro(gp_resolved_file_type_override file type) + if(NOT APPLE) + get_filename_component(_file_path \"\${file}\" PATH) + get_filename_component(_file_name \"\${file}\" NAME) + if(_file_path MATCHES \"^\${CMAKE_INSTALL_PREFIX}\") + set(\${type} \"local\") + endif() + if(_file_name MATCHES gdiplus) + set(\${type} \"system\") + endif(_file_name MATCHES gdiplus) + endif() + endmacro(gp_resolved_file_type_override) - IF(NOT APPLE) - IF(UNIX OR MINGW) - MACRO(gp_resolve_item_override context item exepath dirs resolved_item_var resolved_var) - IF(\${item} MATCHES \"blueberry_osgi\") - GET_FILENAME_COMPONENT(_item_name \${item} NAME) - SET(\${resolved_item_var} \"\${exepath}/plugins/\${_item_name}\") - SET(\${resolved_var} 1) - ENDIF() - ENDMACRO() - ENDIF() - ENDIF() + if(NOT APPLE) + if(UNIX OR MINGW) + macro(gp_resolve_item_override context item exepath dirs resolved_item_var resolved_var) + if(\${item} MATCHES \"blueberry_osgi\") + get_filename_component(_item_name \${item} NAME) + set(\${resolved_item_var} \"\${exepath}/plugins/\${_item_name}\") + set(\${resolved_var} 1) + endif() + endmacro() + endif() + endif() - IF(\"${_install_GLOB_PLUGINS}\" STREQUAL \"TRUE\") + if(\"${_install_GLOB_PLUGINS}\" STREQUAL \"TRUE\") file(GLOB_RECURSE GLOBBED_BLUEBERRY_PLUGINS # glob for all blueberry bundles of this application \"\${CMAKE_INSTALL_PREFIX}/${_bundle_dest_dir}/liborg*${CMAKE_SHARED_LIBRARY_SUFFIX}\") - ENDIF() + endif() file(GLOB_RECURSE GLOBBED_QT_PLUGINS # glob for Qt plugins \"\${CMAKE_INSTALL_PREFIX}/${${_target_location}_qt_plugins_install_dir}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\") # use custom version of BundleUtilities message(\"globbed plugins: \${GLOBBED_QT_PLUGINS} \${GLOBBED_BLUEBERRY_PLUGINS}\") - SET(PLUGIN_DIRS) - SET(PLUGINS ${_install_PLUGINS} \${GLOBBED_QT_PLUGINS} \${GLOBBED_BLUEBERRY_PLUGINS}) + set(PLUGIN_DIRS) + set(PLUGINS ${_install_PLUGINS} \${GLOBBED_QT_PLUGINS} \${GLOBBED_BLUEBERRY_PLUGINS}) if(PLUGINS) list(REMOVE_DUPLICATES PLUGINS) endif(PLUGINS) foreach(_plugin \${GLOBBED_BLUEBERRY_PLUGINS}) get_filename_component(_pluginpath \${_plugin} PATH) list(APPEND PLUGIN_DIRS \${_pluginpath}) endforeach(_plugin) set(DIRS ${DIRS}) list(APPEND DIRS \${PLUGIN_DIRS}) list(REMOVE_DUPLICATES DIRS) # use custom version of BundleUtilities - SET(CMAKE_MODULE_PATH ${MITK_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH} ) + set(CMAKE_MODULE_PATH ${MITK_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH} ) include(BundleUtilities) fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/${_target_location}\" \"\${PLUGINS}\" \"\${DIRS}\") ") -ENDMACRO() +endmacro() diff --git a/CMake/mitkMacroInstallHelperApp.cmake b/CMake/mitkMacroInstallHelperApp.cmake index 7e84ab4859..580096d847 100644 --- a/CMake/mitkMacroInstallHelperApp.cmake +++ b/CMake/mitkMacroInstallHelperApp.cmake @@ -1,116 +1,116 @@ #! MITK specific cross plattform install macro #! #! Usage: MITK_INSTALL_HELPER_APP(target1 [target2] ....) #! -MACRO(MITK_INSTALL_HELPER_APP) +macro(MITK_INSTALL_HELPER_APP) MACRO_PARSE_ARGUMENTS(_install "TARGETS;EXECUTABLES;PLUGINS;LIBRARY_DIRS" "GLOB_PLUGINS" ${ARGN}) - LIST(APPEND _install_TARGETS ${_install_DEFAULT_ARGS}) + list(APPEND _install_TARGETS ${_install_DEFAULT_ARGS}) # TODO: how to supply to correct intermediate directory?? - # CMAKE_CFG_INTDIR is not expanded to actual values inside the INSTALL(CODE "...") macro ... - SET(intermediate_dir ) - IF(WIN32 AND NOT MINGW) - SET(intermediate_dir Release) - ENDIF() + # CMAKE_CFG_INTDIR is not expanded to actual values inside the install(CODE "...") macro ... + set(intermediate_dir ) + if(WIN32 AND NOT MINGW) + set(intermediate_dir Release) + endif() - SET(DIRS + set(DIRS ${VTK_RUNTIME_LIBRARY_DIRS}/${intermediate_dir} ${ITK_LIBRARY_DIRS}/${intermediate_dir} ${QT_LIBRARY_DIR} ${QT_LIBRARY_DIR}/../bin ${MITK_BINARY_DIR}/bin/${intermediate_dir} ${_install_LIBRARY_DIRS} ) - IF(APPLE) - LIST(APPEND DIRS "/usr/lib") - ENDIF(APPLE) + if(APPLE) + list(APPEND DIRS "/usr/lib") + endif(APPLE) if(QT_LIBRARY_DIR MATCHES "^(/lib/|/lib32/|/lib64/|/usr/lib/|/usr/lib32/|/usr/lib64/|/usr/X11R6/)") set(_qt_is_system_qt 1) endif() - FOREACH(_target ${_install_EXECUTABLES}) + foreach(_target ${_install_EXECUTABLES}) - SET(_qt_plugins_install_dirs "") - SET(_qt_conf_install_dirs "") - SET(_target_locations "") + set(_qt_plugins_install_dirs "") + set(_qt_conf_install_dirs "") + set(_target_locations "") - GET_FILENAME_COMPONENT(_target_name ${_target} NAME) + get_filename_component(_target_name ${_target} NAME) - IF(APPLE) - IF(NOT MACOSX_BUNDLE_NAMES) - SET(_qt_conf_install_dirs bin) - SET(_target_locations bin/${_target_name}) - SET(${_target_locations}_qt_plugins_install_dir bin) - INSTALL(PROGRAMS ${_target} DESTINATION bin) - ELSE() - FOREACH(bundle_name ${MACOSX_BUNDLE_NAMES}) - LIST(APPEND _qt_conf_install_dirs ${bundle_name}.app/Contents/Resources) - SET(_current_target_location ${bundle_name}.app/Contents/MacOS/${_target_name}) - LIST(APPEND _target_locations ${_current_target_location}) - SET(${_current_target_location}_qt_plugins_install_dir ${bundle_name}.app/Contents/MacOS) + if(APPLE) + if(NOT MACOSX_BUNDLE_NAMES) + set(_qt_conf_install_dirs bin) + set(_target_locations bin/${_target_name}) + set(${_target_locations}_qt_plugins_install_dir bin) + install(PROGRAMS ${_target} DESTINATION bin) + else() + foreach(bundle_name ${MACOSX_BUNDLE_NAMES}) + list(APPEND _qt_conf_install_dirs ${bundle_name}.app/Contents/Resources) + set(_current_target_location ${bundle_name}.app/Contents/MacOS/${_target_name}) + list(APPEND _target_locations ${_current_target_location}) + set(${_current_target_location}_qt_plugins_install_dir ${bundle_name}.app/Contents/MacOS) - INSTALL(PROGRAMS ${_target} DESTINATION ${bundle_name}.app/Contents/MacOS/) - ENDFOREACH() - ENDIF(NOT MACOSX_BUNDLE_NAMES) - ELSE() - SET(_target_locations bin/${_target_name}) - SET(${_target_locations}_qt_plugins_install_dir bin) - SET(_qt_conf_install_dirs bin) - INSTALL(PROGRAMS ${_target} DESTINATION bin) - IF(UNIX AND NOT WIN32) + install(PROGRAMS ${_target} DESTINATION ${bundle_name}.app/Contents/MacOS/) + endforeach() + endif(NOT MACOSX_BUNDLE_NAMES) + else() + set(_target_locations bin/${_target_name}) + set(${_target_locations}_qt_plugins_install_dir bin) + set(_qt_conf_install_dirs bin) + install(PROGRAMS ${_target} DESTINATION bin) + if(UNIX AND NOT WIN32) # Remove the rpath from helper applications. We assume that all dependencies # are installed into the same location as the helper application. - INSTALL(CODE "FILE(RPATH_REMOVE + install(CODE "file(RPATH_REMOVE FILE \"\${CMAKE_INSTALL_PREFIX}/${_target_location}\")") - ENDIF() - ENDIF() + endif() + endif() - FOREACH(_target_location ${_target_locations}) - IF(NOT _qt_is_system_qt) - IF(QT_PLUGINS_DIR) - IF(WIN32) - INSTALL(DIRECTORY "${QT_PLUGINS_DIR}" + foreach(_target_location ${_target_locations}) + if(NOT _qt_is_system_qt) + if(QT_PLUGINS_DIR) + if(WIN32) + install(DIRECTORY "${QT_PLUGINS_DIR}" DESTINATION ${${_target_location}_qt_plugins_install_dir} CONFIGURATIONS Release FILES_MATCHING REGEX "[^4d]4?${CMAKE_SHARED_LIBRARY_SUFFIX}" ) - INSTALL(DIRECTORY "${QT_PLUGINS_DIR}" + install(DIRECTORY "${QT_PLUGINS_DIR}" DESTINATION ${${_target_location}_qt_plugins_install_dir} CONFIGURATIONS Debug FILES_MATCHING REGEX "d4?${CMAKE_SHARED_LIBRARY_SUFFIX}" ) - ELSE(WIN32) + else(WIN32) # install everything, see bug 7143 - INSTALL(DIRECTORY "${QT_PLUGINS_DIR}" + install(DIRECTORY "${QT_PLUGINS_DIR}" DESTINATION ${${_target_location}_qt_plugins_install_dir} FILES_MATCHING REGEX "${CMAKE_SHARED_LIBRARY_SUFFIX}" ) - ENDIF(WIN32) - ENDIF() - ENDIF() + endif(WIN32) + endif() + endif() _fixup_target() - ENDFOREACH(_target_location) + endforeach(_target_location) - IF(NOT _qt_is_system_qt) + if(NOT _qt_is_system_qt) #-------------------------------------------------------------------------------- # install a qt.conf file # this inserts some cmake code into the install script to write the file - SET(_qt_conf_plugin_install_prefix .) - IF(APPLE) - SET(_qt_conf_plugin_install_prefix ./MacOS) - ENDIF() - FOREACH(_qt_conf_install_dir ${_qt_conf_install_dirs}) - INSTALL(CODE "file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${_qt_conf_install_dir}/qt.conf\" \" + set(_qt_conf_plugin_install_prefix .) + if(APPLE) + set(_qt_conf_plugin_install_prefix ./MacOS) + endif() + foreach(_qt_conf_install_dir ${_qt_conf_install_dirs}) + install(CODE "file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${_qt_conf_install_dir}/qt.conf\" \" [Paths] Prefix=${_qt_conf_plugin_install_prefix} \")") - ENDFOREACH() - ENDIF() + endforeach() + endif() - ENDFOREACH() + endforeach() -ENDMACRO(MITK_INSTALL_HELPER_APP) +endmacro(MITK_INSTALL_HELPER_APP) diff --git a/CMake/mitkMacroInstallTargets.cmake b/CMake/mitkMacroInstallTargets.cmake index 3c4454a509..da2f531b96 100644 --- a/CMake/mitkMacroInstallTargets.cmake +++ b/CMake/mitkMacroInstallTargets.cmake @@ -1,141 +1,141 @@ # # MITK specific cross plattform install macro # # Usage: MITK_INSTALL_TARGETS(target1 [target2] ....) # -MACRO(MITK_INSTALL_TARGETS) +macro(MITK_INSTALL_TARGETS) MACRO_PARSE_ARGUMENTS(_install "TARGETS;EXECUTABLES;PLUGINS;LIBRARY_DIRS" "GLOB_PLUGINS" ${ARGN}) - LIST(APPEND _install_TARGETS ${_install_DEFAULT_ARGS}) + list(APPEND _install_TARGETS ${_install_DEFAULT_ARGS}) # TODO: how to supply the correct intermediate directory?? - # CMAKE_CFG_INTDIR is not expanded to actual values inside the INSTALL(CODE "...") macro ... - SET(intermediate_dir ) - IF(WIN32 AND NOT MINGW) - SET(intermediate_dir Release) - ENDIF() + # CMAKE_CFG_INTDIR is not expanded to actual values inside the install(CODE "...") macro ... + set(intermediate_dir ) + if(WIN32 AND NOT MINGW) + set(intermediate_dir Release) + endif() - SET(DIRS + set(DIRS ${MITK_VTK_LIBRARY_DIRS}/${intermediate_dir} ${MITK_ITK_LIBRARY_DIRS}/${intermediate_dir} ${QT_LIBRARY_DIR} ${QT_LIBRARY_DIR}/../bin ${MITK_BINARY_DIR}/bin/${intermediate_dir} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${intermediate_dir} ) - FOREACH(_lib_dir ${_install_LIBRARY_DIRS}) - LIST(APPEND DIRS ${_lib_dir}/${intermediate_dir}) - ENDFOREACH() + foreach(_lib_dir ${_install_LIBRARY_DIRS}) + list(APPEND DIRS ${_lib_dir}/${intermediate_dir}) + endforeach() - IF(MITK_USE_Boost AND MITK_USE_Boost_LIBRARIES AND NOT MITK_USE_SYSTEM_Boost) - LIST(APPEND DIRS ${Boost_LIBRARY_DIRS}) - ENDIF() - IF(GDCM_DIR) - LIST(APPEND DIRS ${GDCM_DIR}/bin/${intermediate_dir}) - ENDIF() - IF(OpenCV_DIR) - LIST(APPEND DIRS ${OpenCV_DIR}/bin/${intermediate_dir}) - ENDIF() - IF(MITK_USE_BLUEBERRY) - LIST(APPEND DIRS ${CTK_RUNTIME_LIBRARY_DIRS}/${intermediate_dir}) - ENDIF() - - LIST(REMOVE_DUPLICATES DIRS) + if(MITK_USE_Boost AND MITK_USE_Boost_LIBRARIES AND NOT MITK_USE_SYSTEM_Boost) + list(APPEND DIRS ${Boost_LIBRARY_DIRS}) + endif() + if(GDCM_DIR) + list(APPEND DIRS ${GDCM_DIR}/bin/${intermediate_dir}) + endif() + if(OpenCV_DIR) + list(APPEND DIRS ${OpenCV_DIR}/bin/${intermediate_dir}) + endif() + if(MITK_USE_BLUEBERRY) + list(APPEND DIRS ${CTK_RUNTIME_LIBRARY_DIRS}/${intermediate_dir}) + endif() + + list(REMOVE_DUPLICATES DIRS) if(QT_LIBRARY_DIR MATCHES "^(/lib/|/lib32/|/lib64/|/usr/lib/|/usr/lib32/|/usr/lib64/|/usr/X11R6/)") set(_qt_is_system_qt 1) endif() - FOREACH(_target ${_install_EXECUTABLES}) - - GET_TARGET_PROPERTY(_is_bundle ${_target} MACOSX_BUNDLE) - - SET(_qt_plugins_install_dirs "") - SET(_qt_conf_install_dirs "") - SET(_target_locations "") - - IF(APPLE) - IF(_is_bundle) - SET(_target_locations ${_target}.app) - SET(${_target_locations}_qt_plugins_install_dir ${_target}.app/Contents/MacOS) - SET(_bundle_dest_dir ${_target}.app/Contents/MacOS) - SET(_qt_plugins_for_current_bundle ${_target}.app/Contents/MacOS) - SET(_qt_conf_install_dirs ${_target}.app/Contents/Resources) - INSTALL(TARGETS ${_target} BUNDLE DESTINATION . ) - ELSE() - IF(NOT MACOSX_BUNDLE_NAMES) - SET(_qt_conf_install_dirs bin) - SET(_target_locations bin/${_target}) - SET(${_target_locations}_qt_plugins_install_dir bin) - INSTALL(TARGETS ${_target} RUNTIME DESTINATION bin) - ELSE() - FOREACH(bundle_name ${MACOSX_BUNDLE_NAMES}) - LIST(APPEND _qt_conf_install_dirs ${bundle_name}.app/Contents/Resources) - SET(_current_target_location ${bundle_name}.app/Contents/MacOS/${_target}) - LIST(APPEND _target_locations ${_current_target_location}) - SET(${_current_target_location}_qt_plugins_install_dir ${bundle_name}.app/Contents/MacOS) - MESSAGE( " SET(${_current_target_location}_qt_plugins_install_dir ${bundle_name}.app/Contents/MacOS) ") - - INSTALL(TARGETS ${_target} RUNTIME DESTINATION ${bundle_name}.app/Contents/MacOS/) - ENDFOREACH() - ENDIF() - ENDIF() - ELSE() - SET(_target_locations bin/${_target}${CMAKE_EXECUTABLE_SUFFIX}) - SET(${_target_locations}_qt_plugins_install_dir bin) - SET(_qt_conf_install_dirs bin) - INSTALL(TARGETS ${_target} RUNTIME DESTINATION bin) - ENDIF() - - FOREACH(_target_location ${_target_locations}) - IF(NOT _qt_is_system_qt) - - IF(QT_PLUGINS_DIR) - IF(WIN32) - INSTALL(DIRECTORY "${QT_PLUGINS_DIR}" + foreach(_target ${_install_EXECUTABLES}) + + get_target_property(_is_bundle ${_target} MACOSX_BUNDLE) + + set(_qt_plugins_install_dirs "") + set(_qt_conf_install_dirs "") + set(_target_locations "") + + if(APPLE) + if(_is_bundle) + set(_target_locations ${_target}.app) + set(${_target_locations}_qt_plugins_install_dir ${_target}.app/Contents/MacOS) + set(_bundle_dest_dir ${_target}.app/Contents/MacOS) + set(_qt_plugins_for_current_bundle ${_target}.app/Contents/MacOS) + set(_qt_conf_install_dirs ${_target}.app/Contents/Resources) + install(TARGETS ${_target} BUNDLE DESTINATION . ) + else() + if(NOT MACOSX_BUNDLE_NAMES) + set(_qt_conf_install_dirs bin) + set(_target_locations bin/${_target}) + set(${_target_locations}_qt_plugins_install_dir bin) + install(TARGETS ${_target} RUNTIME DESTINATION bin) + else() + foreach(bundle_name ${MACOSX_BUNDLE_NAMES}) + list(APPEND _qt_conf_install_dirs ${bundle_name}.app/Contents/Resources) + set(_current_target_location ${bundle_name}.app/Contents/MacOS/${_target}) + list(APPEND _target_locations ${_current_target_location}) + set(${_current_target_location}_qt_plugins_install_dir ${bundle_name}.app/Contents/MacOS) + message( " set(${_current_target_location}_qt_plugins_install_dir ${bundle_name}.app/Contents/MacOS) ") + + install(TARGETS ${_target} RUNTIME DESTINATION ${bundle_name}.app/Contents/MacOS/) + endforeach() + endif() + endif() + else() + set(_target_locations bin/${_target}${CMAKE_EXECUTABLE_SUFFIX}) + set(${_target_locations}_qt_plugins_install_dir bin) + set(_qt_conf_install_dirs bin) + install(TARGETS ${_target} RUNTIME DESTINATION bin) + endif() + + foreach(_target_location ${_target_locations}) + if(NOT _qt_is_system_qt) + + if(QT_PLUGINS_DIR) + if(WIN32) + install(DIRECTORY "${QT_PLUGINS_DIR}" DESTINATION ${${_target_location}_qt_plugins_install_dir} CONFIGURATIONS Release FILES_MATCHING REGEX "[^4d]4?${CMAKE_SHARED_LIBRARY_SUFFIX}" ) - INSTALL(DIRECTORY "${QT_PLUGINS_DIR}" + install(DIRECTORY "${QT_PLUGINS_DIR}" DESTINATION ${${_target_location}_qt_plugins_install_dir} CONFIGURATIONS Debug FILES_MATCHING REGEX "d4?${CMAKE_SHARED_LIBRARY_SUFFIX}" ) - ELSE(WIN32) + else(WIN32) # install everything, see bug 7143 - INSTALL(DIRECTORY "${QT_PLUGINS_DIR}" + install(DIRECTORY "${QT_PLUGINS_DIR}" DESTINATION ${${_target_location}_qt_plugins_install_dir} FILES_MATCHING REGEX "${CMAKE_SHARED_LIBRARY_SUFFIX}" ) - ENDIF(WIN32) + endif(WIN32) - ENDIF() - ENDIF() + endif() + endif() _fixup_target() - ENDFOREACH() + endforeach() - IF(NOT _qt_is_system_qt) + if(NOT _qt_is_system_qt) #-------------------------------------------------------------------------------- # install a qt.conf file # this inserts some cmake code into the install script to write the file - SET(_qt_conf_plugin_install_prefix .) - IF(APPLE) - SET(_qt_conf_plugin_install_prefix ./MacOS) - ENDIF() + set(_qt_conf_plugin_install_prefix .) + if(APPLE) + set(_qt_conf_plugin_install_prefix ./MacOS) + endif() - FOREACH(_qt_conf_install_dir ${_qt_conf_install_dirs}) - INSTALL(CODE "file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${_qt_conf_install_dir}/qt.conf\" \" + foreach(_qt_conf_install_dir ${_qt_conf_install_dirs}) + install(CODE "file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${_qt_conf_install_dir}/qt.conf\" \" [Paths] Prefix=${_qt_conf_plugin_install_prefix} \")") - ENDFOREACH() + endforeach() - ENDIF() + endif() - ENDFOREACH() + endforeach() -ENDMACRO() +endmacro() diff --git a/CMake/mitkMacroMultiplexPicType.cmake b/CMake/mitkMacroMultiplexPicType.cmake index 9d192fbc78..ce29793503 100644 --- a/CMake/mitkMacroMultiplexPicType.cmake +++ b/CMake/mitkMacroMultiplexPicType.cmake @@ -1,20 +1,20 @@ # # MITK_MULTIPLEX_PICTYPE: generate separated source files for different # data types to reduce memory consumption of compiler during template # instantiation # # Param "file" should be named like mitkMyAlgo-TYPE.cpp # in the file, every occurence of @TYPE@ is replaced by the # datatype. For each datatype, a new file mitkMyAlgo-datatype.cpp # is generated and added to CPP_FILES_GENERATED. # -MACRO(MITK_MULTIPLEX_PICTYPE file) - STRING(REPLACE "," ";" TYPES "${MITK_ACCESSBYITK_PIXEL_TYPES}") - FOREACH(TYPE ${TYPES}) +macro(MITK_MULTIPLEX_PICTYPE file) + string(REPLACE "," ";" TYPES "${MITK_ACCESSBYITK_PIXEL_TYPES}") + foreach(TYPE ${TYPES}) # create filename for destination - STRING(REPLACE " " "_" quoted_type "${TYPE}") - STRING(REPLACE TYPE ${quoted_type} quoted_file ${file}) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR}/${quoted_file} @ONLY) - SET(CPP_FILES_GENERATED ${CPP_FILES_GENERATED} ${CMAKE_CURRENT_BINARY_DIR}/${quoted_file}) - ENDFOREACH(TYPE) -ENDMACRO(MITK_MULTIPLEX_PICTYPE) + string(REPLACE " " "_" quoted_type "${TYPE}") + string(REPLACE TYPE ${quoted_type} quoted_file ${file}) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR}/${quoted_file} @ONLY) + set(CPP_FILES_GENERATED ${CPP_FILES_GENERATED} ${CMAKE_CURRENT_BINARY_DIR}/${quoted_file}) + endforeach(TYPE) +endmacro(MITK_MULTIPLEX_PICTYPE) diff --git a/CMake/mitkMacroUseModule.cmake b/CMake/mitkMacroUseModule.cmake index 212310c7a0..644b244b78 100644 --- a/CMake/mitkMacroUseModule.cmake +++ b/CMake/mitkMacroUseModule.cmake @@ -1,64 +1,64 @@ -MACRO(MITK_USE_MODULE) - SET(DEPENDS "") - SET(DEPENDS_BEFORE "not initialized") +macro(MITK_USE_MODULE) + set(DEPENDS "") + set(DEPENDS_BEFORE "not initialized") # check for each parameter if it is a package (3rd party) - FOREACH(package ${ARGN}) - SET(is_package) - FOREACH(dir ${MODULES_PACKAGE_DEPENDS_DIRS}) - IF(EXISTS "${dir}/MITK_${package}_Config.cmake") - LIST(APPEND PACKAGE_DEPENDS ${package}) - SET(is_package 1) - BREAK() - ENDIF() - ENDFOREACH() - IF(NOT is_package) - LIST(APPEND DEPENDS ${package}) - ENDIF() - ENDFOREACH(package) - WHILE(NOT "${DEPENDS}" STREQUAL "${DEPENDS_BEFORE}") - SET(DEPENDS_BEFORE ${DEPENDS}) - FOREACH(dependency ${DEPENDS}) - IF(NOT ${dependency}_CONFIG_FILE) - MESSAGE(SEND_ERROR "Missing module: ${dependency}") - ENDIF() - INCLUDE(${${dependency}_CONFIG_FILE}) - LIST(APPEND DEPENDS ${${dependency}_DEPENDS}) - LIST(APPEND PACKAGE_DEPENDS ${${dependency}_PACKAGE_DEPENDS}) - ENDFOREACH(dependency) - IF(DEPENDS) - LIST(REMOVE_DUPLICATES DEPENDS) - LIST(SORT DEPENDS) - ENDIF(DEPENDS) - IF(PACKAGE_DEPENDS) - LIST(REMOVE_DUPLICATES PACKAGE_DEPENDS) - LIST(SORT PACKAGE_DEPENDS) - ENDIF(PACKAGE_DEPENDS) - ENDWHILE() + foreach(package ${ARGN}) + set(is_package) + foreach(dir ${MODULES_PACKAGE_DEPENDS_DIRS}) + if(EXISTS "${dir}/MITK_${package}_Config.cmake") + list(APPEND PACKAGE_DEPENDS ${package}) + set(is_package 1) + break() + endif() + endforeach() + if(NOT is_package) + list(APPEND DEPENDS ${package}) + endif() + endforeach(package) + while(NOT "${DEPENDS}" STREQUAL "${DEPENDS_BEFORE}") + set(DEPENDS_BEFORE ${DEPENDS}) + foreach(dependency ${DEPENDS}) + if(NOT ${dependency}_CONFIG_FILE) + message(SEND_ERROR "Missing module: ${dependency}") + endif() + include(${${dependency}_CONFIG_FILE}) + list(APPEND DEPENDS ${${dependency}_DEPENDS}) + list(APPEND PACKAGE_DEPENDS ${${dependency}_PACKAGE_DEPENDS}) + endforeach(dependency) + if(DEPENDS) + list(REMOVE_DUPLICATES DEPENDS) + list(SORT DEPENDS) + endif(DEPENDS) + if(PACKAGE_DEPENDS) + list(REMOVE_DUPLICATES PACKAGE_DEPENDS) + list(SORT PACKAGE_DEPENDS) + endif(PACKAGE_DEPENDS) + endwhile() # CMake Debug - FOREACH(dependency ${DEPENDS} ${MODULE_DEPENDS_INTERNAL}) - IF(NOT ${dependency}_CONFIG_FILE) - MESSAGE(SEND_ERROR "Missing module ${dependency}") - ENDIF() - INCLUDE(${${dependency}_CONFIG_FILE}) - SET(ALL_INCLUDE_DIRECTORIES ${ALL_INCLUDE_DIRECTORIES} ${${dependency}_INCLUDE_DIRS}) - SET(ALL_LIBRARIES ${ALL_LIBRARIES} ${${dependency}_PROVIDES}) - SET(ALL_LIBRARY_DIRS ${ALL_LIBRARY_DIRS} ${${dependency}_LIBRARY_DIRS}) - ENDFOREACH(dependency) + foreach(dependency ${DEPENDS} ${MODULE_DEPENDS_INTERNAL}) + if(NOT ${dependency}_CONFIG_FILE) + message(SEND_ERROR "Missing module ${dependency}") + endif() + include(${${dependency}_CONFIG_FILE}) + set(ALL_INCLUDE_DIRECTORIES ${ALL_INCLUDE_DIRECTORIES} ${${dependency}_INCLUDE_DIRS}) + set(ALL_LIBRARIES ${ALL_LIBRARIES} ${${dependency}_PROVIDES}) + set(ALL_LIBRARY_DIRS ${ALL_LIBRARY_DIRS} ${${dependency}_LIBRARY_DIRS}) + endforeach(dependency) - FOREACH(package ${PACKAGE_DEPENDS}) - FOREACH(dir ${MODULES_PACKAGE_DEPENDS_DIRS}) - IF(EXISTS "${dir}/MITK_${package}_Config.cmake") - INCLUDE("${dir}/MITK_${package}_Config.cmake") - BREAK() - ENDIF() - ENDFOREACH() - #SET(ALL_INCLUDE_DIRECTORIES ${ALL_INCLUDE_DIRECTORIES} ${${package}_INCLUDE_DIRS}) - # SET(ALL_LIBRARIES ${ALL_LIBRARIES} ${${package}_LIBRARIES}) - ENDFOREACH(package) - SET(ALL_LIBRARIES ${ALL_LIBRARIES} ${MODULE_ADDITIONAL_LIBS}) - SET(ALL_INCLUDE_DIRECTORIES ${ALL_INCLUDE_DIRECTORIES} ${MODULE_INCLUDE_DIRS} ${MODULE_INTERNAL_INCLUDE_DIRS} ${MODULES_CONF_DIRS}) - IF(ALL_LIBRARY_DIRS) - LIST(REMOVE_DUPLICATES ALL_LIBRARY_DIRS) - ENDIF(ALL_LIBRARY_DIRS) + foreach(package ${PACKAGE_DEPENDS}) + foreach(dir ${MODULES_PACKAGE_DEPENDS_DIRS}) + if(EXISTS "${dir}/MITK_${package}_Config.cmake") + include("${dir}/MITK_${package}_Config.cmake") + break() + endif() + endforeach() + #set(ALL_INCLUDE_DIRECTORIES ${ALL_INCLUDE_DIRECTORIES} ${${package}_INCLUDE_DIRS}) + # set(ALL_LIBRARIES ${ALL_LIBRARIES} ${${package}_LIBRARIES}) + endforeach(package) + set(ALL_LIBRARIES ${ALL_LIBRARIES} ${MODULE_ADDITIONAL_LIBS}) + set(ALL_INCLUDE_DIRECTORIES ${ALL_INCLUDE_DIRECTORIES} ${MODULE_INCLUDE_DIRS} ${MODULE_INTERNAL_INCLUDE_DIRS} ${MODULES_CONF_DIRS}) + if(ALL_LIBRARY_DIRS) + list(REMOVE_DUPLICATES ALL_LIBRARY_DIRS) + endif(ALL_LIBRARY_DIRS) -ENDMACRO(MITK_USE_MODULE) +endmacro(MITK_USE_MODULE) diff --git a/CMake/mitkSetupCPack.cmake b/CMake/mitkSetupCPack.cmake index 968fb0274d..199eb85181 100644 --- a/CMake/mitkSetupCPack.cmake +++ b/CMake/mitkSetupCPack.cmake @@ -1,58 +1,58 @@ # # First, set the generator variable # -IF(NOT CPACK_GENERATOR) - IF(WIN32) - FIND_PROGRAM(NSIS_MAKENSIS NAMES makensis +if(NOT CPACK_GENERATOR) + if(WIN32) + find_program(NSIS_MAKENSIS NAMES makensis PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS] DOC "Where is makensis.exe located" ) - IF(NOT NSIS_MAKENSIS) - SET(CPACK_GENERATOR ZIP) - ELSE() - SET(CPACK_GENERATOR "NSIS;ZIP") + if(NOT NSIS_MAKENSIS) + set(CPACK_GENERATOR ZIP) + else() + set(CPACK_GENERATOR "NSIS;ZIP") - ENDIF(NOT NSIS_MAKENSIS) - ELSE() - IF(APPLE) - SET(CPACK_GENERATOR DragNDrop) - ELSE() - SET(CPACK_GENERATOR TGZ) - ENDIF() - ENDIF() -ENDIF(NOT CPACK_GENERATOR) + endif(NOT NSIS_MAKENSIS) + else() + if(APPLE) + set(CPACK_GENERATOR DragNDrop) + else() + set(CPACK_GENERATOR TGZ) + endif() + endif() +endif(NOT CPACK_GENERATOR) # include required mfc libraries -INCLUDE(InstallRequiredSystemLibraries) +include(InstallRequiredSystemLibraries) -SET(CPACK_PACKAGE_NAME "MITK") -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MITK is a medical image processing tool") -SET(CPACK_PACKAGE_VENDOR "German Cancer Research Center (DKFZ)") -SET(CPACK_CREATE_DESKTOP_LINKS "ExtApp") -SET(CPACK_PACKAGE_DESCRIPTION_FILE "${MITK_SOURCE_DIR}/MITKCopyright.txt") -SET(CPACK_RESOURCE_FILE_LICENSE "${MITK_SOURCE_DIR}/MITKCopyright.txt") -SET(CPACK_PACKAGE_VERSION_MAJOR "${MITK_VERSION_MAJOR}") -SET(CPACK_PACKAGE_VERSION_MINOR "${MITK_VERSION_MINOR}") +set(CPACK_PACKAGE_NAME "MITK") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MITK is a medical image processing tool") +set(CPACK_PACKAGE_VENDOR "German Cancer Research Center (DKFZ)") +set(CPACK_CREATE_DESKTOP_LINKS "ExtApp") +set(CPACK_PACKAGE_DESCRIPTION_FILE "${MITK_SOURCE_DIR}/MITKCopyright.txt") +set(CPACK_RESOURCE_FILE_LICENSE "${MITK_SOURCE_DIR}/MITKCopyright.txt") +set(CPACK_PACKAGE_VERSION_MAJOR "${MITK_VERSION_MAJOR}") +set(CPACK_PACKAGE_VERSION_MINOR "${MITK_VERSION_MINOR}") # tell cpack to strip all debug symbols from all files -SET(CPACK_STRIP_FILES ON) +set(CPACK_STRIP_FILES ON) # append revision number if available -IF(MITK_REVISION_ID) - IF(MITK_WC_TYPE STREQUAL "git") - SET(git_hash ${MITK_REVISION_ID}) - STRING(LENGTH "${git_hash}" hash_length) - IF(hash_length GREATER 6) - STRING(SUBSTRING ${git_hash} 0 6 git_hash) - ENDIF() - SET(CPACK_PACKAGE_VERSION_PATCH "${MITK_VERSION_PATCH}_r${git_hash}") - ELSE() - SET(CPACK_PACKAGE_VERSION_PATCH "${MITK_VERSION_PATCH}_r${MITK_REVISION_ID}") - ENDIF() -ELSE() - SET(CPACK_PACKAGE_VERSION_PATCH "${MITK_VERSION_PATCH}") -ENDIF() +if(MITK_REVISION_ID) + if(MITK_WC_TYPE STREQUAL "git") + set(git_hash ${MITK_REVISION_ID}) + string(LENGTH "${git_hash}" hash_length) + if(hash_length GREATER 6) + string(SUBSTRING ${git_hash} 0 6 git_hash) + endif() + set(CPACK_PACKAGE_VERSION_PATCH "${MITK_VERSION_PATCH}_r${git_hash}") + else() + set(CPACK_PACKAGE_VERSION_PATCH "${MITK_VERSION_PATCH}_r${MITK_REVISION_ID}") + endif() +else() + set(CPACK_PACKAGE_VERSION_PATCH "${MITK_VERSION_PATCH}") +endif() diff --git a/CMake/moduleConf.cmake.in b/CMake/moduleConf.cmake.in index e3e4b5773c..e25ed8c860 100644 --- a/CMake/moduleConf.cmake.in +++ b/CMake/moduleConf.cmake.in @@ -1,9 +1,9 @@ -SET(@MODULE_NAME@_IS_ENABLED "@MODULE_IS_ENABLED@") -IF(@MODULE_NAME@_IS_ENABLED) - SET(@MODULE_NAME@_INCLUDE_DIRS "@MODULE_INCLUDE_DIRS@") - SET(@MODULE_NAME@_PROVIDES "@MODULE_PROVIDES@") - SET(@MODULE_NAME@_DEPENDS "@MODULE_DEPENDS@") - SET(@MODULE_NAME@_PACKAGE_DEPENDS "@MODULE_PACKAGE_DEPENDS@") - SET(@MODULE_NAME@_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") -ENDIF(@MODULE_NAME@_IS_ENABLED) +set(@MODULE_NAME@_IS_ENABLED "@MODULE_IS_ENABLED@") +if(@MODULE_NAME@_IS_ENABLED) + set(@MODULE_NAME@_INCLUDE_DIRS "@MODULE_INCLUDE_DIRS@") + set(@MODULE_NAME@_PROVIDES "@MODULE_PROVIDES@") + set(@MODULE_NAME@_DEPENDS "@MODULE_DEPENDS@") + set(@MODULE_NAME@_PACKAGE_DEPENDS "@MODULE_PACKAGE_DEPENDS@") + set(@MODULE_NAME@_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") +endif(@MODULE_NAME@_IS_ENABLED) diff --git a/CMakeExternals/Boost.cmake b/CMakeExternals/Boost.cmake index 28d41dfd55..2462752130 100644 --- a/CMakeExternals/Boost.cmake +++ b/CMakeExternals/Boost.cmake @@ -1,71 +1,71 @@ #----------------------------------------------------------------------------- # Boost #----------------------------------------------------------------------------- -IF(MITK_USE_Boost) +if(MITK_USE_Boost) # Sanity checks - IF(DEFINED BOOST_ROOT AND NOT EXISTS ${BOOST_ROOT}) - MESSAGE(FATAL_ERROR "BOOST_ROOT variable is defined but corresponds to non-existing directory") - ENDIF() + if(DEFINED BOOST_ROOT AND NOT EXISTS ${BOOST_ROOT}) + message(FATAL_ERROR "BOOST_ROOT variable is defined but corresponds to non-existing directory") + endif() - SET(proj Boost) - SET(proj_DEPENDENCIES ) - SET(Boost_DEPENDS ${proj}) + set(proj Boost) + set(proj_DEPENDENCIES ) + set(Boost_DEPENDS ${proj}) - IF(NOT DEFINED BOOST_ROOT AND NOT MITK_USE_SYSTEM_Boost) + if(NOT DEFINED BOOST_ROOT AND NOT MITK_USE_SYSTEM_Boost) - SET(_boost_libs ) + set(_boost_libs ) - IF(MITK_USE_Boost_LIBRARIES) + if(MITK_USE_Boost_LIBRARIES) # We need binary boost libraries - FOREACH(_boost_lib ${MITK_USE_Boost_LIBRARIES}) - SET(_boost_libs ${_boost_libs} --with-${_boost_lib}) - ENDFOREACH() + foreach(_boost_lib ${MITK_USE_Boost_LIBRARIES}) + set(_boost_libs ${_boost_libs} --with-${_boost_lib}) + endforeach() - IF(WIN32) - SET(_boost_variant "") - SET(_shell_extension .bat) - ELSE() - IF(CMAKE_BUILD_TYPE STREQUAL "Debug") - SET(_boost_variant "variant=debug") - ELSE() - SET(_boost_variant "variant=release") - ENDIF() - SET(_shell_extension .sh) - ENDIF() + if(WIN32) + set(_boost_variant "") + set(_shell_extension .bat) + else() + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(_boost_variant "variant=debug") + else() + set(_boost_variant "variant=release") + endif() + set(_shell_extension .sh) + endif() - SET(_boost_cfg_cmd ${CMAKE_CURRENT_BINARY_DIR}/${proj}-src/bootstrap${_shell_extension}) - SET(_boost_build_cmd ${CMAKE_CURRENT_BINARY_DIR}/${proj}-src/bjam --build-dir=${CMAKE_CURRENT_BINARY_DIR}/${proj}-build --prefix=${CMAKE_CURRENT_BINARY_DIR}/${proj}-install ${_boost_variant} ${_boost_libs} link=shared,static threading=multi runtime-link=shared -q install) - ELSE() - SET(_boost_cfg_cmd ) - SET(_boost_build_cmd ) - ENDIF() + set(_boost_cfg_cmd ${CMAKE_CURRENT_BINARY_DIR}/${proj}-src/bootstrap${_shell_extension}) + set(_boost_build_cmd ${CMAKE_CURRENT_BINARY_DIR}/${proj}-src/bjam --build-dir=${CMAKE_CURRENT_BINARY_DIR}/${proj}-build --prefix=${CMAKE_CURRENT_BINARY_DIR}/${proj}-install ${_boost_variant} ${_boost_libs} link=shared,static threading=multi runtime-link=shared -q install) + else() + set(_boost_cfg_cmd ) + set(_boost_build_cmd ) + endif() ExternalProject_Add(${proj} SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src # Boost needs in-source builds BINARY_DIR ${proj}-src PREFIX ${proj}-cmake URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/boost_1_45_0.tar.bz2 URL_MD5 d405c606354789d0426bc07bea617e58 INSTALL_DIR ${proj}-install CONFIGURE_COMMAND "${_boost_cfg_cmd}" BUILD_COMMAND "${_boost_build_cmd}" INSTALL_COMMAND "" DEPENDS ${proj_DEPENDENCIES} ) - IF(MITK_USE_Boost_LIBRARIES) - SET(BOOST_ROOT "${CMAKE_CURRENT_BINARY_DIR}/${proj}-install") - ELSE() - SET(BOOST_ROOT "${CMAKE_CURRENT_BINARY_DIR}/${proj}-src") - ENDIF() + if(MITK_USE_Boost_LIBRARIES) + set(BOOST_ROOT "${CMAKE_CURRENT_BINARY_DIR}/${proj}-install") + else() + set(BOOST_ROOT "${CMAKE_CURRENT_BINARY_DIR}/${proj}-src") + endif() - ELSE() + else() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") - ENDIF() + endif() -ENDIF() +endif() diff --git a/CMakeExternals/CTK.cmake b/CMakeExternals/CTK.cmake index e3ec2df8ee..2e2aa3409f 100644 --- a/CMakeExternals/CTK.cmake +++ b/CMakeExternals/CTK.cmake @@ -1,67 +1,67 @@ #----------------------------------------------------------------------------- # CTK #----------------------------------------------------------------------------- -IF(MITK_USE_CTK) +if(MITK_USE_CTK) # Sanity checks - IF(DEFINED CTK_DIR AND NOT EXISTS ${CTK_DIR}) - MESSAGE(FATAL_ERROR "CTK_DIR variable is defined but corresponds to non-existing directory") - ENDIF() + if(DEFINED CTK_DIR AND NOT EXISTS ${CTK_DIR}) + message(FATAL_ERROR "CTK_DIR variable is defined but corresponds to non-existing directory") + endif() - SET(proj CTK) - SET(proj_DEPENDENCIES ) - SET(CTK_DEPENDS ${proj}) + set(proj CTK) + set(proj_DEPENDENCIES ) + set(CTK_DEPENDS ${proj}) - IF(NOT DEFINED CTK_DIR) + if(NOT DEFINED CTK_DIR) - SET(revision_tag de466419) - #IF(${proj}_REVISION_TAG) - # SET(revision_tag ${${proj}_REVISION_TAG}) - #ENDIF() + set(revision_tag de466419) + #if(${proj}_REVISION_TAG) + # set(revision_tag ${${proj}_REVISION_TAG}) + #endif() - SET(ctk_optional_cache_args ) - IF(MITK_USE_Python) - LIST(APPEND ctk_optional_cache_args + set(ctk_optional_cache_args ) + if(MITK_USE_Python) + list(APPEND ctk_optional_cache_args -DCTK_LIB_Scripting/Python/Widgets:BOOL=ON ) - ENDIF() - FOREACH(type RUNTIME ARCHIVE LIBRARY) - IF(DEFINED CTK_PLUGIN_${type}_OUTPUT_DIRECTORY) - LIST(APPEND mitk_optional_cache_args -DCTK_PLUGIN_${type}_OUTPUT_DIRECTORY:PATH=${CTK_PLUGIN_${type}_OUTPUT_DIRECTORY}) - ENDIF() - ENDFOREACH() + endif() + foreach(type RUNTIME ARCHIVE LIBRARY) + if(DEFINED CTK_PLUGIN_${type}_OUTPUT_DIRECTORY) + list(APPEND mitk_optional_cache_args -DCTK_PLUGIN_${type}_OUTPUT_DIRECTORY:PATH=${CTK_PLUGIN_${type}_OUTPUT_DIRECTORY}) + endif() + endforeach() ExternalProject_Add(${proj} SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src BINARY_DIR ${proj}-build PREFIX ${proj}-cmake URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/CTK_${revision_tag}.tar.gz URL_MD5 29d075daa07dbc5618158e4f81d5f431 UPDATE_COMMAND "" INSTALL_COMMAND "" CMAKE_GENERATOR ${gen} CMAKE_ARGS ${ep_common_args} ${ctk_optional_cache_args} -DDESIRED_QT_VERSION:STRING=4 -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -DGit_EXECUTABLE:FILEPATH=${GIT_EXECUTABLE} -DGIT_EXECUTABLE:FILEPATH=${GIT_EXECUTABLE} -DCTK_LIB_PluginFramework:BOOL=ON -DCTK_LIB_DICOM/Widgets:BOOL=ON -DCTK_PLUGIN_org.commontk.eventadmin:BOOL=ON -DCTK_PLUGIN_org.commontk.configadmin:BOOL=ON -DCTK_USE_GIT_PROTOCOL:BOOL=OFF -DDCMTK_URL:STRING=${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/CTK_DCMTK_085525e6.tar.gz DEPENDS ${proj_DEPENDENCIES} ) - SET(CTK_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build) + set(CTK_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build) - ELSE() + else() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") - ENDIF() + endif() -ENDIF() +endif() diff --git a/CMakeExternals/CableSwig.cmake b/CMakeExternals/CableSwig.cmake index fd43bee8eb..f328afd125 100644 --- a/CMakeExternals/CableSwig.cmake +++ b/CMakeExternals/CableSwig.cmake @@ -1,44 +1,44 @@ #----------------------------------------------------------------------------- # CableSwig #----------------------------------------------------------------------------- -IF(MITK_USE_Python) +if(MITK_USE_Python) # Sanity checks -IF(DEFINED CableSwig_DIR AND NOT EXISTS ${CableSwig_DIR}) - MESSAGE(FATAL_ERROR "CableSwig_DIR variable is defined but corresponds to non-existing directory") -ENDIF() +if(DEFINED CableSwig_DIR AND NOT EXISTS ${CableSwig_DIR}) + message(FATAL_ERROR "CableSwig_DIR variable is defined but corresponds to non-existing directory") +endif() -SET(proj CableSwig) -SET(proj_DEPENDENCIES ) -SET(CableSwig_DEPENDS ${proj}) +set(proj CableSwig) +set(proj_DEPENDENCIES ) +set(CableSwig_DEPENDS ${proj}) -IF(NOT DEFINED CableSwig_DIR) +if(NOT DEFINED CableSwig_DIR) - SET(additional_cmake_args ) + set(additional_cmake_args ) ExternalProject_Add(${proj} SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src BINARY_DIR ${proj}-build PREFIX ${proj}-cmake URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/CableSwig-ITK-3.20.0.tar.gz URL_MD5 893882bf8b4fbfbae3fe8c747a75f7a0 INSTALL_COMMAND "" CMAKE_GENERATOR ${gen} CMAKE_ARGS ${ep_common_args} ${additional_cmake_args} -DBUILD_TESTING:BOOL=OFF -DSWIG_BUILD_EXAMPLES:BOOL=OFF DEPENDS ${proj_DEPENDENCIES} ) - SET(CableSwig_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build) + set(CableSwig_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build) -ELSE() +else() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") -ENDIF() +endif() -ENDIF() +endif() diff --git a/CMakeExternals/DCMTK.cmake b/CMakeExternals/DCMTK.cmake index 3486a1a565..7673a2066e 100644 --- a/CMakeExternals/DCMTK.cmake +++ b/CMakeExternals/DCMTK.cmake @@ -1,56 +1,56 @@ #----------------------------------------------------------------------------- # DCMTK #----------------------------------------------------------------------------- -IF(MITK_USE_DCMTK) +if(MITK_USE_DCMTK) # Sanity checks - IF(DEFINED DCMTK_DIR AND NOT EXISTS ${DCMTK_DIR}) - MESSAGE(FATAL_ERROR "DCMTK_DIR variable is defined but corresponds to non-existing directory") - ENDIF() + if(DEFINED DCMTK_DIR AND NOT EXISTS ${DCMTK_DIR}) + message(FATAL_ERROR "DCMTK_DIR variable is defined but corresponds to non-existing directory") + endif() - SET(proj DCMTK) - SET(proj_DEPENDENCIES ) - SET(DCMTK_DEPENDS ${proj}) + set(proj DCMTK) + set(proj_DEPENDENCIES ) + set(DCMTK_DEPENDS ${proj}) - IF(NOT DEFINED DCMTK_DIR) - IF(UNIX) - SET(DCMTK_CXX_FLAGS "-fPIC") - SET(DCMTK_C_FLAGS "-fPIC") - ENDIF(UNIX) - IF(DCMTK_DICOM_ROOT_ID) - SET(DCMTK_CXX_FLAGS "${DCMTK_CXX_FLAGS} -DSITE_UID_ROOT=\\\"${DCMTK_DICOM_ROOT_ID}\\\"") - SET(DCMTK_C_FLAGS "${DCMTK_CXX_FLAGS} -DSITE_UID_ROOT=\\\"${DCMTK_DICOM_ROOT_ID}\\\"") - ENDIF() + if(NOT DEFINED DCMTK_DIR) + if(UNIX) + set(DCMTK_CXX_FLAGS "-fPIC") + set(DCMTK_C_FLAGS "-fPIC") + endif(UNIX) + if(DCMTK_DICOM_ROOT_ID) + set(DCMTK_CXX_FLAGS "${DCMTK_CXX_FLAGS} -DSITE_UID_ROOT=\\\"${DCMTK_DICOM_ROOT_ID}\\\"") + set(DCMTK_C_FLAGS "${DCMTK_CXX_FLAGS} -DSITE_UID_ROOT=\\\"${DCMTK_DICOM_ROOT_ID}\\\"") + endif() ExternalProject_Add(${proj} SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src BINARY_DIR ${proj}-build PREFIX ${proj}-cmake URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/dcmtk-3.6.0.tar.gz URL_MD5 19409e039e29a330893caea98715390e INSTALL_DIR ${proj}-install PATCH_COMMAND ${CMAKE_COMMAND} -DTEMPLATE_FILE:FILEPATH=${MITK_SOURCE_DIR}/CMakeExternals/EmptyFileForPatching.dummy -P ${MITK_SOURCE_DIR}/CMakeExternals/PatchDCMTK-3.6.cmake CMAKE_GENERATOR ${gen} CMAKE_ARGS ${ep_common_args} -DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF "-DCMAKE_CXX_FLAGS:STRING=${ep_common_CXX_FLAGS} ${DCMTK_CXX_FLAGS}" "-DCMAKE_C_FLAGS:STRING=${ep_common_C_FLAGS} ${DCMTK_C_FLAGS}" -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/${proj}-install -DDCMTK_WITH_ZLIB:BOOL=OFF # see bug #9894 -DDCMTK_WITH_OPENSSL:BOOL=OFF # see bug #9894 -DDCMTK_WITH_PNG:BOOL=OFF # see bug #9894 -DDCMTK_WITH_TIFF:BOOL=OFF # see bug #9894 -DDCMTK_WITH_XML:BOOL=OFF # see bug #9894 -DDCMTK_FORCE_FPIC_ON_UNIX:BOOL=ON DEPENDS ${proj_DEPENDENCIES} ) - SET(DCMTK_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-install) + set(DCMTK_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-install) - ELSE() + else() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") - ENDIF() -ENDIF() + endif() +endif() diff --git a/CMakeExternals/GDCM.cmake b/CMakeExternals/GDCM.cmake index 495924635f..7bdc467c6c 100644 --- a/CMakeExternals/GDCM.cmake +++ b/CMakeExternals/GDCM.cmake @@ -1,58 +1,58 @@ #----------------------------------------------------------------------------- # GDCM #----------------------------------------------------------------------------- # Sanity checks -IF(DEFINED GDCM_DIR AND NOT EXISTS ${GDCM_DIR}) - MESSAGE(FATAL_ERROR "GDCM_DIR variable is defined but corresponds to non-existing directory") -ENDIF() +if(DEFINED GDCM_DIR AND NOT EXISTS ${GDCM_DIR}) + message(FATAL_ERROR "GDCM_DIR variable is defined but corresponds to non-existing directory") +endif() # Check if an external ITK build tree was specified. # If yes, use the GDCM from ITK, otherwise ITK will complain if(ITK_DIR) find_package(ITK) if(ITK_GDCM_DIR) set(GDCM_DIR ${ITK_GDCM_DIR}) endif() endif() -SET(proj GDCM) -SET(proj_DEPENDENCIES ) -SET(GDCM_DEPENDS ${proj}) +set(proj GDCM) +set(proj_DEPENDENCIES ) +set(GDCM_DEPENDS ${proj}) -IF(NOT DEFINED GDCM_DIR) +if(NOT DEFINED GDCM_DIR) ExternalProject_Add(${proj} SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src BINARY_DIR ${proj}-build PREFIX ${proj}-cmake URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/gdcm-2.0.18.tar.gz URL_MD5 3c431bac0fe4da166f2b71c78f0d37a6 INSTALL_COMMAND "" PATCH_COMMAND ${CMAKE_COMMAND} -DTEMPLATE_FILE:FILEPATH=${MITK_SOURCE_DIR}/CMakeExternals/EmptyFileForPatching.dummy -P ${MITK_SOURCE_DIR}/CMakeExternals/PatchGDCM-2.0.18.cmake CMAKE_GENERATOR ${gen} CMAKE_ARGS ${ep_common_args} -DBUILD_SHARED_LIBS:BOOL=ON -DGDCM_BUILD_SHARED_LIBS:BOOL=ON -DBUILD_TESTING:BOOL=OFF -DBUILD_EXAMPLES:BOOL=OFF DEPENDS ${proj_DEPENDENCIES} ) - SET(GDCM_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build) + set(GDCM_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build) - SET(GDCM_IS_2_0_18 TRUE) -ELSE() + set(GDCM_IS_2_0_18 TRUE) +else() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") - FIND_PACKAGE(GDCM) + find_package(GDCM) - IF( GDCM_BUILD_VERSION EQUAL "18") - SET(GDCM_IS_2_0_18 TRUE) - ELSE() - SET(GDCM_IS_2_0_18 FALSE) - ENDIF() + if( GDCM_BUILD_VERSION EQUAL "18") + set(GDCM_IS_2_0_18 TRUE) + else() + set(GDCM_IS_2_0_18 FALSE) + endif() -ENDIF() +endif() diff --git a/CMakeExternals/ITK.cmake b/CMakeExternals/ITK.cmake index d2b8991467..3b099de8ab 100644 --- a/CMakeExternals/ITK.cmake +++ b/CMakeExternals/ITK.cmake @@ -1,66 +1,66 @@ #----------------------------------------------------------------------------- # ITK #----------------------------------------------------------------------------- # Sanity checks -IF(DEFINED ITK_DIR AND NOT EXISTS ${ITK_DIR}) - MESSAGE(FATAL_ERROR "ITK_DIR variable is defined but corresponds to non-existing directory") -ENDIF() +if(DEFINED ITK_DIR AND NOT EXISTS ${ITK_DIR}) + message(FATAL_ERROR "ITK_DIR variable is defined but corresponds to non-existing directory") +endif() -SET(proj ITK) -SET(proj_DEPENDENCIES GDCM) -IF(MITK_USE_Python) - LIST(APPEND proj_DEPENDENCIES CableSwig) -ENDIF() +set(proj ITK) +set(proj_DEPENDENCIES GDCM) +if(MITK_USE_Python) + list(APPEND proj_DEPENDENCIES CableSwig) +endif() -SET(ITK_DEPENDS ${proj}) +set(ITK_DEPENDS ${proj}) -IF(NOT DEFINED ITK_DIR) +if(NOT DEFINED ITK_DIR) - SET(additional_cmake_args ) - IF(MINGW) - SET(additional_cmake_args + set(additional_cmake_args ) + if(MINGW) + set(additional_cmake_args -DCMAKE_USE_WIN32_THREADS:BOOL=ON -DCMAKE_USE_PTHREADS:BOOL=OFF) - ENDIF() + endif() - IF(MITK_USE_Python) - LIST(APPEND additional_cmake_args + if(MITK_USE_Python) + list(APPEND additional_cmake_args -DUSE_WRAP_ITK:BOOL=ON -DITK_USE_REVIEW:BOOL=ON -DCableSwig_DIR:PATH=${CableSwig_DIR} -DWRAP_ITK_JAVA:BOOL=OFF -DWRAP_ITK_TCL:BOOL=OFF ) - ENDIF() + endif() - IF(GDCM_IS_2_0_18) - SET(ITK_PATCH_COMMAND ${CMAKE_COMMAND} -DTEMPLATE_FILE:FILEPATH=${MITK_SOURCE_DIR}/CMakeExternals/EmptyFileForPatching.dummy -P ${MITK_SOURCE_DIR}/CMakeExternals/PatchITK-3.20.cmake) - ENDIF() + if(GDCM_IS_2_0_18) + set(ITK_PATCH_COMMAND ${CMAKE_COMMAND} -DTEMPLATE_FILE:FILEPATH=${MITK_SOURCE_DIR}/CMakeExternals/EmptyFileForPatching.dummy -P ${MITK_SOURCE_DIR}/CMakeExternals/PatchITK-3.20.cmake) + endif() ExternalProject_Add(${proj} SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src BINARY_DIR ${proj}-build PREFIX ${proj}-cmake URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/InsightToolkit-3.20.1.tar.gz URL_MD5 90342ffa78bd88ae48b3f62866fbf050 INSTALL_COMMAND "" PATCH_COMMAND ${ITK_PATCH_COMMAND} CMAKE_GENERATOR ${gen} CMAKE_ARGS ${ep_common_args} ${additional_cmake_args} -DBUILD_TESTING:BOOL=OFF -DBUILD_EXAMPLES:BOOL=OFF -DITK_USE_SYSTEM_GDCM:BOOL=ON -DGDCM_DIR:PATH=${GDCM_DIR} DEPENDS ${proj_DEPENDENCIES} ) - SET(ITK_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build) + set(ITK_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build) -ELSE() +else() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") -ENDIF() +endif() diff --git a/CMakeExternals/MITKData.cmake b/CMakeExternals/MITKData.cmake index 83b975495d..8648242a19 100644 --- a/CMakeExternals/MITKData.cmake +++ b/CMakeExternals/MITKData.cmake @@ -1,39 +1,39 @@ #----------------------------------------------------------------------------- # MITK Data #----------------------------------------------------------------------------- # Sanity checks -IF(DEFINED MITK_DATA_DIR AND NOT EXISTS ${MITK_DATA_DIR}) - MESSAGE(FATAL_ERROR "MITK_DATA_DIR variable is defined but corresponds to non-existing directory") -ENDIF() +if(DEFINED MITK_DATA_DIR AND NOT EXISTS ${MITK_DATA_DIR}) + message(FATAL_ERROR "MITK_DATA_DIR variable is defined but corresponds to non-existing directory") +endif() -SET(proj MITK-Data) -SET(proj_DEPENDENCIES) -SET(MITK-Data_DEPENDS ${proj}) +set(proj MITK-Data) +set(proj_DEPENDENCIES) +set(MITK-Data_DEPENDS ${proj}) -IF(BUILD_TESTING) +if(BUILD_TESTING) + + set(revision_tag 9cb5f967) + #if(${proj}_REVISION_TAG) + # set(revision_tag ${${proj}_REVISION_TAG}) + #endif() - SET(revision_tag 9cb5f967) - #IF(${proj}_REVISION_TAG) - # SET(revision_tag ${${proj}_REVISION_TAG}) - #ENDIF() - ExternalProject_Add(${proj} URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/MITK-Data_${revision_tag}.tar.gz URL_MD5 f0e1128618c59f7f69f9c79c9673b51b UPDATE_COMMAND "" CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" DEPENDS ${proj_DEPENDENCIES} ) - SET(MITK_DATA_DIR ${ep_source_dir}/${proj}) + set(MITK_DATA_DIR ${ep_source_dir}/${proj}) -ELSE() +else() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") -ENDIF(BUILD_TESTING) +endif(BUILD_TESTING) diff --git a/CMakeExternals/OpenCV.cmake b/CMakeExternals/OpenCV.cmake index 698456381d..3ac3824748 100644 --- a/CMakeExternals/OpenCV.cmake +++ b/CMakeExternals/OpenCV.cmake @@ -1,54 +1,54 @@ #----------------------------------------------------------------------------- # OpenCV #----------------------------------------------------------------------------- -IF(MITK_USE_OpenCV) +if(MITK_USE_OpenCV) # Sanity checks - IF(DEFINED OpenCV_DIR AND NOT EXISTS ${OpenCV_DIR}) - MESSAGE(FATAL_ERROR "OpenCV_DIR variable is defined but corresponds to non-existing directory") - ENDIF() + if(DEFINED OpenCV_DIR AND NOT EXISTS ${OpenCV_DIR}) + message(FATAL_ERROR "OpenCV_DIR variable is defined but corresponds to non-existing directory") + endif() - SET(proj OpenCV) - SET(proj_DEPENDENCIES) - SET(OpenCV_DEPENDS ${proj}) + set(proj OpenCV) + set(proj_DEPENDENCIES) + set(OpenCV_DEPENDS ${proj}) - IF(NOT DEFINED OpenCV_DIR) + if(NOT DEFINED OpenCV_DIR) - SET(additional_cmake_args ) - IF(MITK_USE_Python) - LIST(APPEND additional_cmake_args + set(additional_cmake_args ) + if(MITK_USE_Python) + list(APPEND additional_cmake_args -DBUILD_NEW_PYTHON_SUPPORT:BOOL=ON ) - ENDIF() + endif() - SET(opencv_url ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/OpenCV-2.3.0.tar.bz2) - SET(opencv_url_md5 4e353dfb04b53bea37407f397aabf069) + set(opencv_url ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/OpenCV-2.3.0.tar.bz2) + set(opencv_url_md5 4e353dfb04b53bea37407f397aabf069) ExternalProject_Add(${proj} SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src BINARY_DIR ${proj}-build PREFIX ${proj}-cmake URL ${opencv_url} URL_MD5 ${opencv_url_md5} INSTALL_COMMAND "" CMAKE_GENERATOR ${gen} CMAKE_ARGS ${ep_common_args} -DBUILD_DOCS:BOOL=OFF -DBUILD_TESTS:BOOL=OFF -DBUILD_EXAMPLES:BOOL=OFF -DBUILD_DOXYGEN_DOCS:BOOL=OFF ${additional_cmake_args} DEPENDS ${proj_DEPENDENCIES} ) - SET(OpenCV_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build) + set(OpenCV_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build) - ELSE() + else() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") - ENDIF() + endif() -ENDIF() +endif() diff --git a/CMakeExternals/PatchDCMTK-3.6.cmake b/CMakeExternals/PatchDCMTK-3.6.cmake index 88a21613de..775251978f 100644 --- a/CMakeExternals/PatchDCMTK-3.6.cmake +++ b/CMakeExternals/PatchDCMTK-3.6.cmake @@ -1,15 +1,15 @@ # Called by DCMTK.cmake (ExternalProject_Add) as a patch for DCMTK. # Makes pdf2dcm use "DOC" as modality for Encapsulated PDFs -#message ("Patching dcmdata/apps/pdf2dcm.cc to use modality 'DOC'. Using template ${TEMPLATE_FILE}") +#message("Patching dcmdata/apps/pdf2dcm.cc to use modality 'DOC'. Using template ${TEMPLATE_FILE}") # read whole file file(STRINGS dcmdata/apps/pdf2dcm.cc sourceCode NEWLINE_CONSUME) # substitute "OT" for "DOC" (only single occurence where modality tag is set) string(REGEX REPLACE "\"OT\"" "\"DOC\"" sourceCode ${sourceCode}) # set variable CONTENTS, which is substituted in TEMPLATE_FILE set(CONTENTS ${sourceCode}) configure_file(${TEMPLATE_FILE} dcmdata/apps/pdf2dcm.cc @ONLY) diff --git a/CMakeExternals/VTK.cmake b/CMakeExternals/VTK.cmake index 10cd934fdc..0853cf384f 100644 --- a/CMakeExternals/VTK.cmake +++ b/CMakeExternals/VTK.cmake @@ -1,87 +1,87 @@ #----------------------------------------------------------------------------- # VTK #----------------------------------------------------------------------------- -IF(WIN32) - OPTION(VTK_USE_SYSTEM_FREETYPE OFF) -ELSE(WIN32) - OPTION(VTK_USE_SYSTEM_FREETYPE ON) -ENDIF(WIN32) +if(WIN32) + option(VTK_USE_SYSTEM_FREETYPE OFF) +else(WIN32) + option(VTK_USE_SYSTEM_FREETYPE ON) +endif(WIN32) # Sanity checks -IF(DEFINED VTK_DIR AND NOT EXISTS ${VTK_DIR}) - MESSAGE(FATAL_ERROR "VTK_DIR variable is defined but corresponds to non-existing directory") -ENDIF() +if(DEFINED VTK_DIR AND NOT EXISTS ${VTK_DIR}) + message(FATAL_ERROR "VTK_DIR variable is defined but corresponds to non-existing directory") +endif() -SET(proj VTK) -SET(proj_DEPENDENCIES ) -SET(VTK_DEPENDS ${proj}) +set(proj VTK) +set(proj_DEPENDENCIES ) +set(VTK_DEPENDS ${proj}) -IF(NOT DEFINED VTK_DIR) +if(NOT DEFINED VTK_DIR) - SET(additional_cmake_args ) - IF(MINGW) - SET(additional_cmake_args + set(additional_cmake_args ) + if(MINGW) + set(additional_cmake_args -DCMAKE_USE_WIN32_THREADS:BOOL=ON -DCMAKE_USE_PTHREADS:BOOL=OFF -DVTK_USE_VIDEO4WINDOWS:BOOL=OFF # no header files provided by MinGW ) - ENDIF() + endif() - IF(MITK_USE_Python) - LIST(APPEND additional_cmake_args + if(MITK_USE_Python) + list(APPEND additional_cmake_args -DVTK_WRAP_PYTHON:BOOL=ON -DVTK_USE_TK:BOOL=OFF -DVTK_WINDOWS_PYTHON_DEBUGGABLE:BOOL=OFF ) - ENDIF() + endif() - IF(MITK_USE_QT) - LIST(APPEND additional_cmake_args + if(MITK_USE_QT) + list(APPEND additional_cmake_args -DDESIRED_QT_VERSION:STRING=4 -DVTK_USE_GUISUPPORT:BOOL=ON -DVTK_USE_QVTK_QTOPENGL:BOOL=ON -DVTK_USE_QT:BOOL=ON -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} ) - ENDIF() + endif() - OPTION(MITK_USE_VTK_5_8_IN_SUPERBUILD OFF) - IF(MITK_USE_VTK_5_8_IN_SUPERBUILD) - SET(VTK_URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/vtk-5.8.0.tar.gz) - SET(VTK_URL_MD5 37b7297d02d647cc6ca95b38174cb41f) - ELSE() - SET(VTK_URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/vtk-5.6.1.tar.gz) - SET(VTK_URL_MD5 b80a76435207c5d0f74dfcab15b75181) - ENDIF() + option(MITK_USE_VTK_5_8_IN_SUPERBUILD OFF) + if(MITK_USE_VTK_5_8_IN_SUPERBUILD) + set(VTK_URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/vtk-5.8.0.tar.gz) + set(VTK_URL_MD5 37b7297d02d647cc6ca95b38174cb41f) + else() + set(VTK_URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/vtk-5.6.1.tar.gz) + set(VTK_URL_MD5 b80a76435207c5d0f74dfcab15b75181) + endif() ExternalProject_Add(${proj} SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src BINARY_DIR ${proj}-build PREFIX ${proj}-cmake URL ${VTK_URL} URL_MD5 ${VTK_URL_MD5} INSTALL_COMMAND "" CMAKE_GENERATOR ${gen} CMAKE_ARGS ${ep_common_args} -DVTK_WRAP_TCL:BOOL=OFF -DVTK_WRAP_PYTHON:BOOL=OFF -DVTK_WRAP_JAVA:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=ON -DVTK_USE_PARALLEL:BOOL=ON -DVTK_USE_CHARTS:BOOL=OFF -DVTK_USE_QTCHARTS:BOOL=ON -DVTK_USE_GEOVIS:BOOL=OFF -DVTK_USE_SYSTEM_FREETYPE:BOOL=${VTK_USE_SYSTEM_FREETYPE} -DVTK_USE_QVTK_QTOPENGL:BOOL=OFF ${additional_cmake_args} DEPENDS ${proj_DEPENDENCIES} ) - SET(VTK_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build) + set(VTK_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build) -ELSE() +else() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") -ENDIF() +endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index 516d580b6e..30bcb4a02f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,804 +1,804 @@ cmake_minimum_required(VERSION 2.8.4) #----------------------------------------------------------------------------- # Set a default build type if none was specified #----------------------------------------------------------------------------- if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) message(STATUS "Setting build type to 'Debug' as none was specified.") set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE) # Set the possible values of build type for cmake-gui set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") endif() #----------------------------------------------------------------------------- # Superbuild Option - Enabled by default #----------------------------------------------------------------------------- option(MITK_USE_SUPERBUILD "Build MITK and the projects it depends on via SuperBuild.cmake." ON) if(MITK_USE_SUPERBUILD) project(MITK-superbuild) set(MITK_SOURCE_DIR ${PROJECT_SOURCE_DIR}) set(MITK_BINARY_DIR ${PROJECT_BINARY_DIR}) else() project(MITK) endif() #----------------------------------------------------------------------------- # Warn if source or build path is too long #----------------------------------------------------------------------------- if(WIN32) set(_src_dir_length_max 50) set(_bin_dir_length_max 50) if(MITK_USE_SUPERBUILD) set(_src_dir_length_max 43) # _src_dir_length_max - strlen(ITK-src) set(_bin_dir_length_max 40) # _bin_dir_length_max - strlen(MITK-build) endif() string(LENGTH "${MITK_SOURCE_DIR}" _src_n) string(LENGTH "${MITK_BINARY_DIR}" _bin_n) # The warnings should be converted to errors if(_src_n GREATER _src_dir_length_max) message(WARNING "MITK source code directory path length is too long (${_src_n} > ${_src_dir_length_max})." "Please move the MITK source code directory to a directory with a shorter path." ) endif() if(_bin_n GREATER _bin_dir_length_max) message(WARNING "MITK build directory path length is too long (${_bin_n} > ${_bin_dir_length_max})." "Please move the MITK build directory to a directory with a shorter path." ) endif() endif() #----------------------------------------------------------------------------- # See http://cmake.org/cmake/help/cmake-2-8-docs.html#section_Policies for details #----------------------------------------------------------------------------- set(project_policies CMP0001 # NEW: CMAKE_BACKWARDS_COMPATIBILITY should no longer be used. CMP0002 # NEW: Logical target names must be globally unique. CMP0003 # NEW: Libraries linked via full path no longer produce linker search paths. CMP0004 # NEW: Libraries linked may NOT have leading or trailing whitespace. CMP0005 # NEW: Preprocessor definition values are now escaped automatically. CMP0006 # NEW: Installing MACOSX_BUNDLE targets requires a BUNDLE DESTINATION. CMP0007 # NEW: List command no longer ignores empty elements. CMP0008 # NEW: Libraries linked by full-path must have a valid library file name. CMP0009 # NEW: FILE GLOB_RECURSE calls should not follow symlinks by default. CMP0010 # NEW: Bad variable reference syntax is an error. CMP0011 # NEW: Included scripts do automatic cmake_policy PUSH and POP. CMP0012 # NEW: if() recognizes numbers and boolean constants. CMP0013 # NEW: Duplicate binary directories are not allowed. CMP0014 # NEW: Input directories must have CMakeLists.txt ) foreach(policy ${project_policies}) if(POLICY ${policy}) cmake_policy(SET ${policy} NEW) endif() endforeach() #----------------------------------------------------------------------------- # Update CMake module path #------------------------------------------------------------------------------ set(CMAKE_MODULE_PATH ${MITK_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH} ) #----------------------------------------------------------------------------- -# CMake Function(s) and Macro(s) +# CMake function(s) and macro(s) #----------------------------------------------------------------------------- include(mitkMacroEmptyExternalProject) include(mitkFunctionGenerateProjectXml) include(mitkFunctionSuppressWarnings) SUPPRESS_VC_DEPRECATED_WARNINGS() #----------------------------------------------------------------------------- # Output directories. #----------------------------------------------------------------------------- foreach(type LIBRARY RUNTIME ARCHIVE) # Make sure the directory exists if(DEFINED MITK_CMAKE_${type}_OUTPUT_DIRECTORY AND NOT EXISTS ${MITK_CMAKE_${type}_OUTPUT_DIRECTORY}) message("Creating directory MITK_CMAKE_${type}_OUTPUT_DIRECTORY: ${MITK_CMAKE_${type}_OUTPUT_DIRECTORY}") file(MAKE_DIRECTORY "${MITK_CMAKE_${type}_OUTPUT_DIRECTORY}") endif() if(MITK_USE_SUPERBUILD) set(output_dir ${MITK_BINARY_DIR}/bin) if(NOT DEFINED MITK_CMAKE_${type}_OUTPUT_DIRECTORY) set(MITK_CMAKE_${type}_OUTPUT_DIRECTORY ${MITK_BINARY_DIR}/MITK-build/bin) endif() else() if(NOT DEFINED MITK_CMAKE_${type}_OUTPUT_DIRECTORY) - SET(output_dir ${MITK_BINARY_DIR}/bin) + set(output_dir ${MITK_BINARY_DIR}/bin) else() - SET(output_dir ${MITK_CMAKE_${type}_OUTPUT_DIRECTORY}) + set(output_dir ${MITK_CMAKE_${type}_OUTPUT_DIRECTORY}) endif() endif() set(CMAKE_${type}_OUTPUT_DIRECTORY ${output_dir} CACHE INTERNAL "Single output directory for building all libraries.") mark_as_advanced(CMAKE_${type}_OUTPUT_DIRECTORY) endforeach() #----------------------------------------------------------------------------- # Additional MITK Options (also shown during superbuild) #----------------------------------------------------------------------------- option(BUILD_SHARED_LIBS "Build MITK with shared libraries" ON) option(WITH_COVERAGE "Enable/Disable coverage" OFF) option(BUILD_TESTING "Test the project" ON) option(MITK_BUILD_ALL_APPS "Build all MITK applications" OFF) option(MITK_BUILD_TUTORIAL "Build the MITK tutorial" ON) option(MITK_USE_Boost "Use the Boost C++ library" OFF) option(MITK_USE_BLUEBERRY "Build the BlueBerry platform" ON) option(MITK_USE_CTK "Use CTK in MITK" ${MITK_USE_BLUEBERRY}) option(MITK_USE_QT "Use Nokia's Qt library" ${MITK_USE_CTK}) option(MITK_USE_DCMTK "EXEPERIMENTAL, superbuild only: Use DCMTK in MITK" OFF) option(MITK_USE_OpenCV "Use Intel's OpenCV library" OFF) option(MITK_USE_Python "Use Python wrapping in MITK" OFF) set(MITK_USE_CableSwig ${MITK_USE_Python}) mark_as_advanced(MITK_BUILD_ALL_APPS MITK_USE_CTK MITK_USE_DCMTK ) if(MITK_USE_Boost) option(MITK_USE_SYSTEM_Boost "Use the system Boost" OFF) set(MITK_USE_Boost_LIBRARIES "" CACHE STRING "A semi-colon separated list of required Boost libraries") endif() if(MITK_USE_BLUEBERRY) option(MITK_BUILD_ALL_PLUGINS "Build all MITK plugins" OFF) mark_as_advanced(MITK_BUILD_ALL_PLUGINS) if(NOT MITK_USE_CTK) message("Forcing MITK_USE_CTK to ON because of MITK_USE_BLUEBERRY") set(MITK_USE_CTK ON CACHE BOOL "Use CTK in MITK" FORCE) endif() endif() if(MITK_USE_CTK AND NOT MITK_USE_QT) message("Forcing MITK_USE_QT to ON because of MITK_USE_CTK") set(MITK_USE_QT ON CACHE BOOL "Use Nokia's Qt library in MITK" FORCE) endif() if(MITK_USE_QT) # find the package at the very beginning, so that QT4_FOUND is available find_package(Qt4 4.6.2 REQUIRED) endif() # Customize the default pixel types for multiplex macros set(MITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES "int, unsigned int, short, unsigned short, char, unsigned char" CACHE STRING "List of integral pixel types used in AccessByItk and InstantiateAccessFunction macros") set(MITK_ACCESSBYITK_FLOATING_PIXEL_TYPES "double, float" CACHE STRING "List of floating pixel types used in AccessByItk and InstantiateAccessFunction macros") set(MITK_ACCESSBYITK_COMPOSITE_PIXEL_TYPES "" CACHE STRING "List of composite pixel types used in AccessByItk and InstantiateAccessFunction macros") set(MITK_ACCESSBYITK_DIMENSIONS "2,3" CACHE STRING "List of dimensions used in AccessByItk and InstantiateAccessFunction macros") mark_as_advanced(MITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES MITK_ACCESSBYITK_FLOATING_PIXEL_TYPES MITK_ACCESSBYITK_COMPOSITE_PIXEL_TYPES MITK_ACCESSBYITK_DIMENSIONS ) # consistency checks if(NOT MITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES) set(MITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES "int, unsigned int, short, unsigned short, char, unsigned char" CACHE STRING "List of integral pixel types used in AccessByItk and InstantiateAccessFunction macros" FORCE) endif() if(NOT MITK_ACCESSBYITK_FLOATING_PIXEL_TYPES) set(MITK_ACCESSBYITK_FLOATING_PIXEL_TYPES "double, float" CACHE STRING "List of floating pixel types used in AccessByItk and InstantiateAccessFunction macros" FORCE) endif() if(NOT MITK_ACCESSBYITK_DIMENSIONS) set(MITK_ACCESSBYITK_DIMENSIONS "2,3" CACHE STRING "List of dimensions used in AccessByItk and InstantiateAccessFunction macros") endif() #----------------------------------------------------------------------------- # Additional CXX/C Flags #----------------------------------------------------------------------------- set(ADDITIONAL_C_FLAGS "" CACHE STRING "Additional C Flags") mark_as_advanced(ADDITIONAL_C_FLAGS) set(ADDITIONAL_CXX_FLAGS "" CACHE STRING "Additional CXX Flags") mark_as_advanced(ADDITIONAL_CXX_FLAGS) #----------------------------------------------------------------------------- # Project.xml #----------------------------------------------------------------------------- # A list of topologically ordered targets set(CTEST_PROJECT_SUBPROJECTS) if(MITK_USE_BLUEBERRY) list(APPEND CTEST_PROJECT_SUBPROJECTS BlueBerry) endif() list(APPEND CTEST_PROJECT_SUBPROJECTS MITK-Core MITK-CoreUI MITK-IGT MITK-ToF MITK-DTI MITK-Registration MITK-Modules # all modules not contained in a specific subproject MITK-Plugins # all plugins not contained in a specific subproject Unlabeled # special "subproject" catching all unlabeled targets and tests ) # Configure CTestConfigSubProject.cmake that could be used by CTest scripts configure_file(${MITK_SOURCE_DIR}/CTestConfigSubProject.cmake.in ${MITK_BINARY_DIR}/CTestConfigSubProject.cmake) if(CTEST_PROJECT_ADDITIONAL_TARGETS) # those targets will be executed at the end of the ctest driver script # and they also get their own subproject label set(subproject_list "${CTEST_PROJECT_SUBPROJECTS};${CTEST_PROJECT_ADDITIONAL_TARGETS}") else() set(subproject_list "${CTEST_PROJECT_SUBPROJECTS}") endif() # Generate Project.xml file expected by the CTest driver script mitkFunctionGenerateProjectXml(${MITK_BINARY_DIR} MITK "${subproject_list}" ${MITK_USE_SUPERBUILD}) #----------------------------------------------------------------------------- # Superbuild script #----------------------------------------------------------------------------- if(MITK_USE_SUPERBUILD) include("${CMAKE_CURRENT_SOURCE_DIR}/SuperBuild.cmake") return() endif() #***************************************************************************** #**************************** END OF SUPERBUILD **************************** #***************************************************************************** #----------------------------------------------------------------------------- -# CMake Function(s) and Macro(s) +# CMake function(s) and macro(s) #----------------------------------------------------------------------------- include(CheckCXXSourceCompiles) include(mitkFunctionCheckCompilerFlags) include(mitkFunctionGetGccVersion) include(MacroParseArguments) include(mitkFunctionSuppressWarnings) # includes several functions include(mitkFunctionOrganizeSources) include(mitkFunctionGetVersion) include(mitkFunctionCreateWindowsBatchScript) include(mitkFunctionInstallProvisioningFiles) include(mitkFunctionCompileSnippets) include(mitkMacroCreateModuleConf) include(mitkMacroCreateModule) include(mitkMacroCheckModule) include(mitkMacroCreateModuleTests) include(mitkFunctionAddCustomModuleTest) include(mitkMacroUseModule) include(mitkMacroMultiplexPicType) include(mitkMacroInstall) include(mitkMacroInstallHelperApp) include(mitkMacroInstallTargets) include(mitkMacroGenerateToolsLibrary) include(mitkMacroGetLinuxDistribution) #----------------------------------------------------------------------------- # Prerequesites #----------------------------------------------------------------------------- find_package(ITK REQUIRED) find_package(VTK REQUIRED) if(ITK_USE_SYSTEM_GDCM) find_package(GDCM PATHS ${ITK_GDCM_DIR} REQUIRED) endif() #----------------------------------------------------------------------------- # Set MITK specific options and variables (NOT available during superbuild) #----------------------------------------------------------------------------- # ASK THE USER TO SHOW THE CONSOLE WINDOW FOR CoreApp and ExtApp option(MITK_SHOW_CONSOLE_WINDOW "Use this to enable or disable the console window when starting MITK GUI Applications" ON) mark_as_advanced(MITK_SHOW_CONSOLE_WINDOW) # TODO: check if necessary option(USE_ITKZLIB "Use the ITK zlib for pic compression." ON) mark_as_advanced(USE_ITKZLIB) if(NOT MITK_FAST_TESTING) if(DEFINED MITK_CTEST_SCRIPT_MODE AND (MITK_CTEST_SCRIPT_MODE STREQUAL "continuous" OR MITK_CTEST_SCRIPT_MODE STREQUAL "experimental") ) set(MITK_FAST_TESTING 1) endif() endif() #----------------------------------------------------------------------------- # Get MITK version info #----------------------------------------------------------------------------- mitkFunctionGetVersion(${MITK_SOURCE_DIR} MITK) #----------------------------------------------------------------------------- # Installation preparation # # These should be set before any MITK install macros are used #----------------------------------------------------------------------------- # on Mac OSX all BlueBerry plugins get copied into every # application bundle (.app directory) specified here if(APPLE) if(MITK_BUILD_org.mitk.gui.qt.extapplication) set(MACOSX_BUNDLE_NAMES ${MACOSX_BUNDLE_NAMES} ExtApp) endif() if(MITK_BUILD_org.mitk.gui.qt.application) set(MACOSX_BUNDLE_NAMES ${MACOSX_BUNDLE_NAMES} CoreApp) endif() endif(APPLE) #----------------------------------------------------------------------------- # Set symbol visibility Flags #----------------------------------------------------------------------------- # MinGW does not export all symbols automatically, so no need to set flags if(CMAKE_COMPILER_IS_GNUCXX AND NOT MINGW) set(VISIBILITY_CXX_FLAGS ) #"-fvisibility=hidden -fvisibility-inlines-hidden") endif() #----------------------------------------------------------------------------- # Set coverage Flags #----------------------------------------------------------------------------- if(WITH_COVERAGE) if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") set(coverage_flags "-g -fprofile-arcs -ftest-coverage -O0 -DNDEBUG") set(COVERAGE_CXX_FLAGS ${coverage_flags}) set(COVERAGE_C_FLAGS ${coverage_flags}) endif() endif() #----------------------------------------------------------------------------- # MITK C/CXX Flags #----------------------------------------------------------------------------- set(MITK_C_FLAGS "${COVERAGE_C_FLAGS} ${ADDITIONAL_C_FLAGS}") set(MITK_CXX_FLAGS "${VISIBILITY_CXX_FLAGS} ${COVERAGE_CXX_FLAGS} ${ADDITIONAL_CXX_FLAGS}") include(mitkSetupC++0xVariables) set(cflags ) if(WIN32) set(cflags "${cflags} -DPOCO_NO_UNWINDOWS -DWIN32_LEAN_AND_MEAN") endif() if(CMAKE_COMPILER_IS_GNUCXX) set(cflags "${cflags} -Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align -Wwrite-strings -D_FORTIFY_SOURCE=2") mitkFunctionCheckCompilerFlags("-fdiagnostics-show-option" cflags) mitkFunctionCheckCompilerFlags("-Wl,--no-undefined" cflags) mitkFunctionCheckCompilerFlags("-Wl,--as-needed" cflags) if(MITK_USE_C++0x) mitkFunctionCheckCompilerFlags("-std=c++0x" MITK_CXX_FLAGS) endif() mitkFunctionGetGccVersion(${CMAKE_CXX_COMPILER} GCC_VERSION) # With older version of gcc supporting the flag -fstack-protector-all, an extra dependency to libssp.so # is introduced. If gcc is smaller than 4.4.0 and the build type is Release let's not include the flag. # Doing so should allow to build package made for distribution using older linux distro. if(${GCC_VERSION} VERSION_GREATER "4.4.0" OR (CMAKE_BUILD_TYPE STREQUAL "Debug" AND ${GCC_VERSION} VERSION_LESS "4.4.0")) mitkFunctionCheckCompilerFlags("-fstack-protector-all" cflags) endif() if(MINGW) # suppress warnings about auto imported symbols set(MITK_CXX_FLAGS "-Wl,--enable-auto-import ${MITK_CXX_FLAGS}") # we need to define a Windows version set(MITK_CXX_FLAGS "-D_WIN32_WINNT=0x0500 ${MITK_CXX_FLAGS}") endif() #set(MITK_CXX_FLAGS "-Woverloaded-virtual -Wold-style-cast -Wstrict-null-sentinel -Wsign-promo ${MITK_CXX_FLAGS}") set(MITK_CXX_FLAGS "-Woverloaded-virtual -Wstrict-null-sentinel ${MITK_CXX_FLAGS}") endif() set(MITK_C_FLAGS "${cflags} ${MITK_C_FLAGS}") set(MITK_CXX_FLAGS "${cflags} ${MITK_CXX_FLAGS}") #----------------------------------------------------------------------------- # MITK Packages #----------------------------------------------------------------------------- set(MITK_MODULES_PACKAGE_DEPENDS_DIR ${MITK_SOURCE_DIR}/CMake/PackageDepends) set(MODULES_PACKAGE_DEPENDS_DIRS ${MITK_MODULES_PACKAGE_DEPENDS_DIR}) #----------------------------------------------------------------------------- # Testing #----------------------------------------------------------------------------- if(BUILD_TESTING) enable_testing() include(CTest) mark_as_advanced(TCL_TCLSH DART_ROOT) option(MITK_ENABLE_GUI_TESTING OFF "Enable the MITK GUI tests") # Setup file for setting custom ctest vars configure_file( CMake/CTestCustom.cmake.in ${MITK_BINARY_DIR}/CTestCustom.cmake @ONLY ) # Configuration for the CMake-generated test driver set(CMAKE_TESTDRIVER_EXTRA_INCLUDES "#include ") set(CMAKE_TESTDRIVER_BEFORE_TESTMAIN " try {") set(CMAKE_TESTDRIVER_AFTER_TESTMAIN " } catch( std::exception & excp ) { fprintf(stderr,\"%s\\n\",excp.what()); return EXIT_FAILURE; } catch( ... ) { printf(\"Exception caught in the test driver\\n\"); return EXIT_FAILURE; } ") set(MITK_TEST_OUTPUT_DIR "${MITK_BINARY_DIR}/test_output") if(NOT EXISTS ${MITK_TEST_OUTPUT_DIR}) file(MAKE_DIRECTORY ${MITK_TEST_OUTPUT_DIR}) endif() # Test the external project template if(MITK_USE_BLUEBERRY) include(mitkTestProjectTemplate) endif() # Test the package target include(mitkPackageTest) endif() configure_file(mitkTestingConfig.h.in ${MITK_BINARY_DIR}/mitkTestingConfig.h) #----------------------------------------------------------------------------- # MITK_SUPERBUILD_BINARY_DIR #----------------------------------------------------------------------------- # If MITK_SUPERBUILD_BINARY_DIR isn't defined, it means MITK is *NOT* build using Superbuild. # In that specific case, MITK_SUPERBUILD_BINARY_DIR should default to MITK_BINARY_DIR if(NOT DEFINED MITK_SUPERBUILD_BINARY_DIR) set(MITK_SUPERBUILD_BINARY_DIR ${MITK_BINARY_DIR}) endif() #----------------------------------------------------------------------------- # Compile Utilities and set-up MITK variables #----------------------------------------------------------------------------- include(mitkSetupVariables) #----------------------------------------------------------------------------- # Cleanup #----------------------------------------------------------------------------- file(GLOB _MODULES_CONF_FILES ${PROJECT_BINARY_DIR}/${MODULES_CONF_DIRNAME}/*.cmake) if(_MODULES_CONF_FILES) file(REMOVE ${_MODULES_CONF_FILES}) endif() add_subdirectory(Utilities) if(MITK_USE_BLUEBERRY) # We need to hack a little bit because MITK applications may need # to enable certain BlueBerry plug-ins. However, these plug-ins # are validated separately from the MITK plug-ins and know nothing # about potential MITK plug-in dependencies of the applications. Hence # we cannot pass the MITK application list to the BlueBerry # ctkMacroSetupPlugins call but need to extract the BlueBerry dependencies # from the applications and set them explicitly. include("${CMAKE_CURRENT_SOURCE_DIR}/Applications/AppList.cmake") foreach(mitk_app ${MITK_APPS}) # extract target_dir and option_name string(REPLACE "^^" "\\;" target_info ${mitk_app}) set(target_info_list ${target_info}) list(GET target_info_list 0 target_dir) list(GET target_info_list 1 option_name) # check if the application is enabled and if target_libraries.cmake exists - if (${option_name} AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Applications/${target_dir}/target_libraries.cmake") + if(${option_name} AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Applications/${target_dir}/target_libraries.cmake") include("${CMAKE_CURRENT_SOURCE_DIR}/Applications/${target_dir}/target_libraries.cmake") foreach(_target_dep ${target_libraries}) if(_target_dep MATCHES org_blueberry_) string(REPLACE _ . _app_bb_dep ${_target_dep}) # explicitly set the build option for the BlueBerry plug-in set(BLUEBERRY_BUILD_${_app_bb_dep} ON CACHE BOOL "Build the ${_app_bb_dep} plug-in") endif() endforeach() endif() endforeach() set(mbilog_DIR "${mbilog_BINARY_DIR}") if(MITK_BUILD_ALL_PLUGINS) set(BLUEBERRY_BUILD_ALL_PLUGINS ON) endif() add_subdirectory(BlueBerry) set(BlueBerry_DIR ${CMAKE_CURRENT_BINARY_DIR}/BlueBerry CACHE PATH "The directory containing a CMake configuration file for BlueBerry" FORCE) include(mitkMacroCreateCTKPlugin) endif() #----------------------------------------------------------------------------- # Set C/CXX Flags for MITK code #----------------------------------------------------------------------------- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MITK_CXX_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MITK_C_FLAGS}") if(MITK_USE_QT) add_definitions(-DQWT_DLL) endif() #----------------------------------------------------------------------------- # Add custom targets representing CDash subprojects #----------------------------------------------------------------------------- foreach(subproject ${CTEST_PROJECT_SUBPROJECTS}) if(NOT TARGET ${subproject} AND NOT subproject MATCHES "Unlabeled") add_custom_target(${subproject}) endif() endforeach() #----------------------------------------------------------------------------- # Add subdirectories #----------------------------------------------------------------------------- link_directories(${MITK_LINK_DIRECTORIES}) add_subdirectory(Core) add_subdirectory(Modules) if(MITK_USE_BLUEBERRY) find_package(BlueBerry REQUIRED) set(MITK_DEFAULT_SUBPROJECTS MITK-Plugins) # Plug-in testing (needs some work to be enabled again) if(BUILD_TESTING) include(berryTestingHelpers) set(BLUEBERRY_UI_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/CoreApp") get_target_property(_is_macosx_bundle CoreApp MACOSX_BUNDLE) if(APPLE AND _is_macosx_bundle) set(BLUEBERRY_UI_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/CoreApp.app/Contents/MacOS/CoreApp") endif() set(BLUEBERRY_TEST_APP_ID "org.mitk.qt.coreapplication") endif() include("${CMAKE_CURRENT_SOURCE_DIR}/Plugins/PluginList.cmake") set(mitk_plugins_fullpath ) foreach(mitk_plugin ${MITK_EXT_PLUGINS}) list(APPEND mitk_plugins_fullpath Plugins/${mitk_plugin}) endforeach() if(EXISTS ${MITK_PRIVATE_MODULES}/PluginList.cmake) include(${MITK_PRIVATE_MODULES}/PluginList.cmake) foreach(mitk_plugin ${MITK_PRIVATE_PLUGINS}) list(APPEND mitk_plugins_fullpath ${MITK_PRIVATE_MODULES}/${mitk_plugin}) endforeach() endif() # Specify which plug-ins belong to this project - MACRO(GetMyTargetLibraries all_target_libraries varname) - SET(re_ctkplugin_mitk "^org_mitk_[a-zA-Z0-9_]+$") - SET(re_ctkplugin_bb "^org_blueberry_[a-zA-Z0-9_]+$") - SET(_tmp_list) - LIST(APPEND _tmp_list ${all_target_libraries}) + macro(GetMyTargetLibraries all_target_libraries varname) + set(re_ctkplugin_mitk "^org_mitk_[a-zA-Z0-9_]+$") + set(re_ctkplugin_bb "^org_blueberry_[a-zA-Z0-9_]+$") + set(_tmp_list) + list(APPEND _tmp_list ${all_target_libraries}) ctkMacroListFilter(_tmp_list re_ctkplugin_mitk re_ctkplugin_bb OUTPUT_VARIABLE ${varname}) - ENDMACRO() + endmacro() # Get infos about application directories and build options include("${CMAKE_CURRENT_SOURCE_DIR}/Applications/AppList.cmake") set(mitk_apps_fullpath ) foreach(mitk_app ${MITK_APPS}) list(APPEND mitk_apps_fullpath "${CMAKE_CURRENT_SOURCE_DIR}/Applications/${mitk_app}") endforeach() ctkMacroSetupPlugins(${mitk_plugins_fullpath} BUILD_OPTION_PREFIX MITK_BUILD_ APPS ${mitk_apps_fullpath} BUILD_ALL ${MITK_BUILD_ALL_PLUGINS} COMPACT_OPTIONS) set(MITK_PLUGIN_USE_FILE "${MITK_BINARY_DIR}/MitkPluginUseFile.cmake") if(${PROJECT_NAME}_PLUGIN_LIBRARIES) ctkFunctionGeneratePluginUseFile(${MITK_PLUGIN_USE_FILE}) else() file(REMOVE ${MITK_PLUGIN_USE_FILE}) set(MITK_PLUGIN_USE_FILE ) endif() endif() # Construct a list of paths containing runtime directories # for MITK applications on Windows set(MITK_RUNTIME_PATH "${VTK_LIBRARY_DIRS}/%VS_BUILD_TYPE%;${ITK_LIBRARY_DIRS}/%VS_BUILD_TYPE%;${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/%VS_BUILD_TYPE%" ) if(QT4_FOUND) set(MITK_RUNTIME_PATH "${MITK_RUNTIME_PATH};${QT_LIBRARY_DIR}/../bin") endif() if(MITK_USE_BLUEBERRY) set(MITK_RUNTIME_PATH "${MITK_RUNTIME_PATH};${CTK_RUNTIME_LIBRARY_DIRS}/%VS_BUILD_TYPE%") if(DEFINED CTK_PLUGIN_RUNTIME_OUTPUT_DIRECTORY) if(IS_ABSOLUTE "${CTK_PLUGIN_RUNTIME_OUTPUT_DIRECTORY}") set(MITK_RUNTIME_PATH "${MITK_RUNTIME_PATH};${CTK_PLUGIN_RUNTIME_OUTPUT_DIRECTORY}/%VS_BUILD_TYPE%") else() set(MITK_RUNTIME_PATH "${MITK_RUNTIME_PATH};${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CTK_PLUGIN_RUNTIME_OUTPUT_DIRECTORY}/%VS_BUILD_TYPE%") endif() else() set(MITK_RUNTIME_PATH "${MITK_RUNTIME_PATH};${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/plugins/%VS_BUILD_TYPE%") endif() endif() if(GDCM_DIR) set(MITK_RUNTIME_PATH "${MITK_RUNTIME_PATH};${GDCM_DIR}/bin/%VS_BUILD_TYPE%") endif() if(OpenCV_DIR) set(MITK_RUNTIME_PATH "${MITK_RUNTIME_PATH};${OpenCV_DIR}/bin/%VS_BUILD_TYPE%") endif() # DCMTK is statically build #if(DCMTK_DIR) # set(MITK_RUNTIME_PATH "${MITK_RUNTIME_PATH};${DCMTK_DIR}/bin/%VS_BUILD_TYPE%") #endif() if(MITK_USE_Boost AND MITK_USE_Boost_LIBRARIES AND NOT MITK_USE_SYSTEM_Boost) set(MITK_RUNTIME_PATH "${MITK_RUNTIME_PATH};${Boost_LIBRARY_DIRS}") endif() #----------------------------------------------------------------------------- # Python Wrapping #----------------------------------------------------------------------------- set(MITK_WRAPPING_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Wrapping) set(MITK_WRAPPING_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Wrapping) option(MITK_USE_Python "Build cswig Python wrapper support (requires CableSwig)." OFF) if(MITK_USE_Python) add_subdirectory(Wrapping) endif() #----------------------------------------------------------------------------- # Documentation #----------------------------------------------------------------------------- add_subdirectory(Documentation) #----------------------------------------------------------------------------- # Installation #----------------------------------------------------------------------------- # set MITK cpack variables include(mitkSetupCPack) if(MITK_BUILD_org.mitk.gui.qt.application) list(APPEND CPACK_CREATE_DESKTOP_LINKS "CoreApp") endif() if(MITK_BUILD_org.mitk.gui.qt.extapplication) list(APPEND CPACK_CREATE_DESKTOP_LINKS "ExtApp") endif() configure_file(${MITK_SOURCE_DIR}/MITKCPackOptions.cmake.in ${MITK_BINARY_DIR}/MITKCPackOptions.cmake @ONLY) set(CPACK_PROJECT_CONFIG_FILE "${MITK_BINARY_DIR}/MITKCPackOptions.cmake") # include CPack model once all variables are set include(CPack) # Additional installation rules include(mitkInstallRules) #----------------------------------------------------------------------------- # Last configuration steps #----------------------------------------------------------------------------- set(MITK_EXPORTS_FILE "${MITK_BINARY_DIR}/MitkExports.cmake") file(REMOVE ${MITK_EXPORTS_FILE}) if(MITK_USE_BLUEBERRY) # This is for installation support of external projects depending on # MITK plugins. The export file should not be used for linking to MITK # libraries without using LINK_DIRECTORIES, since the exports are incomplete # yet(depending libraries are not exported). if(MITK_PLUGIN_LIBRARIES) export(TARGETS ${MITK_PLUGIN_LIBRARIES} APPEND FILE ${MITK_EXPORTS_FILE}) endif() endif() configure_file(${MITK_SOURCE_DIR}/CMake/ToolExtensionITKFactory.cpp.in ${MITK_BINARY_DIR}/ToolExtensionITKFactory.cpp.in COPYONLY) configure_file(${MITK_SOURCE_DIR}/CMake/ToolExtensionITKFactoryLoader.cpp.in ${MITK_BINARY_DIR}/ToolExtensionITKFactoryLoader.cpp.in COPYONLY) configure_file(${MITK_SOURCE_DIR}/CMake/ToolGUIExtensionITKFactory.cpp.in ${MITK_BINARY_DIR}/ToolGUIExtensionITKFactory.cpp.in COPYONLY) configure_file(mitkVersion.h.in ${MITK_BINARY_DIR}/mitkVersion.h) configure_file(mitkConfig.h.in ${MITK_BINARY_DIR}/mitkConfig.h) set(VECMATH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Utilities/vecmath) set(IPFUNC_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Utilities/ipFunc) set(UTILITIES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Utilities) file(GLOB _MODULES_CONF_FILES RELATIVE ${PROJECT_BINARY_DIR}/${MODULES_CONF_DIRNAME} ${PROJECT_BINARY_DIR}/${MODULES_CONF_DIRNAME}/*.cmake) -SET(MITK_MODULE_NAMES) +set(MITK_MODULE_NAMES) foreach(_module ${_MODULES_CONF_FILES}) string(REPLACE Config.cmake "" _module_name ${_module}) list(APPEND MITK_MODULE_NAMES ${_module_name}) endforeach() configure_file(mitkConfig.h.in ${MITK_BINARY_DIR}/mitkConfig.h) configure_file(MITKConfig.cmake.in ${MITK_BINARY_DIR}/MITKConfig.cmake @ONLY) # If we are under Windows, create two batch files which correctly # set up the environment for the application and for Visual Studio if(WIN32) include(mitkFunctionCreateWindowsBatchScript) set(VS_SOLUTION_FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.sln") foreach(VS_BUILD_TYPE debug release) mitkFunctionCreateWindowsBatchScript("${MITK_SOURCE_DIR}/CMake/StartVS.bat.in" ${PROJECT_BINARY_DIR}/StartVS_${VS_BUILD_TYPE}.bat ${VS_BUILD_TYPE}) endforeach() endif(WIN32) #----------------------------------------------------------------------------- # MITK Applications #----------------------------------------------------------------------------- # This must come after MITKConfig.h was generated, since applications # might do a find_package(MITK REQUIRED). add_subdirectory(Applications) diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt index 3ba203af54..4f0042017b 100644 --- a/Core/CMakeLists.txt +++ b/Core/CMakeLists.txt @@ -1,4 +1,4 @@ -SET(MITK_DEFAULT_SUBPROJECTS MITK-Core) +set(MITK_DEFAULT_SUBPROJECTS MITK-Core) -ADD_SUBDIRECTORY(Code) +add_subdirectory(Code) diff --git a/Core/Code/CMakeLists.txt b/Core/Code/CMakeLists.txt index a4891e4f82..ecddfa4002 100644 --- a/Core/Code/CMakeLists.txt +++ b/Core/Code/CMakeLists.txt @@ -1,80 +1,80 @@ -FIND_PACKAGE(OpenGL) -IF(NOT OPENGL_FOUND) - MESSAGE("GL is required for MITK rendering") -ENDIF(NOT OPENGL_FOUND ) +find_package(OpenGL) +if(NOT OPENGL_FOUND) + message("GL is required for MITK rendering") +endif(NOT OPENGL_FOUND ) # Configure the C++ Micro Services Code for MITK find_package(ITK REQUIRED) include(${ITK_USE_FILE}) set(US_NAMESPACE "mitk") set(US_HEADER_PREFIX "mitk") set(US_BASECLASS_NAME "itk::LightObject") set(US_BASECLASS_HEADER "itkLightObject.h") set(US_BASECLASS_PACKAGE "ITK") set(US_ENABLE_THREADING_SUPPORT 1) set(US_EMBEDDING_LIBRARY Mitk) set(US_BUILD_TESTING ${BUILD_TESTING}) if(BUILD_TESTING) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Testing) set(US_BASECLASS_HEADER "uServicesBaseObject.h") set(US_TEST_LABELS MITK-Core) endif() add_subdirectory(CppMicroServices) include(${CMAKE_CURRENT_BINARY_DIR}/CppMicroServices/CppMicroServicesConfig.cmake) -SET(TOOL_CPPS "") +set(TOOL_CPPS "") MITK_CREATE_MODULE( Mitk INCLUDE_DIRS ${CppMicroServices_INCLUDE_DIRS} Algorithms DataManagement Controllers Interactions Interfaces IO Rendering ${MITK_BINARY_DIR} INTERNAL_INCLUDE_DIRS ${OPENGL_INCLUDE_DIR} ${IPSEGMENTATION_INCLUDE_DIR} ${ANN_INCLUDE_DIR} ${CppMicroServices_INTERNAL_INCLUDE_DIRS} DEPENDS mbilog tinyxml DEPENDS_INTERNAL IIL4MITK pic2vtk PACKAGE_DEPENDS ITK VTK EXPORT_DEFINE MITK_CORE_EXPORT ) # this is needed for libraries which link to Mitk and need # symbols from explicitly instantiated templates like # mitk::SurfaceVtkWriter which is referenced in # QmitkCommonFunctionality in the QmitkExt library. -IF(MINGW) - GET_TARGET_PROPERTY(_mitkCore_MINGW_linkflags Mitk LINK_FLAGS) - IF(NOT _mitkCore_MINGW_linkflags) - SET(_mitkCore_MINGW_linkflags "") - ENDIF(NOT _mitkCore_MINGW_linkflags) - SET_TARGET_PROPERTIES(Mitk PROPERTIES LINK_FLAGS "${_mitkCore_MINGW_linkflags} -Wl,--export-all-symbols") -ENDIF(MINGW) +if(MINGW) + get_target_property(_mitkCore_MINGW_linkflags Mitk LINK_FLAGS) + if(NOT _mitkCore_MINGW_linkflags) + set(_mitkCore_MINGW_linkflags "") + endif(NOT _mitkCore_MINGW_linkflags) + set_target_properties(Mitk PROPERTIES LINK_FLAGS "${_mitkCore_MINGW_linkflags} -Wl,--export-all-symbols") +endif(MINGW) # replacing Mitk by Mitk [due to removing the PROVIDES macro -TARGET_LINK_LIBRARIES(Mitk ${LIBRARIES_FOR_${KITNAME}_CORE} ${IPFUNC_LIBRARY} ipSegmentation ann) -TARGET_LINK_LIBRARIES(Mitk ${OPENGL_LIBRARIES} ) -TARGET_LINK_LIBRARIES(Mitk gdcmCommon gdcmIOD gdcmDSED) +target_link_libraries(Mitk ${LIBRARIES_FOR_${KITNAME}_CORE} ${IPFUNC_LIBRARY} ipSegmentation ann) +target_link_libraries(Mitk ${OPENGL_LIBRARIES} ) +target_link_libraries(Mitk gdcmCommon gdcmIOD gdcmDSED) -IF(MSVC_IDE OR MSVC_VERSION OR MINGW) - TARGET_LINK_LIBRARIES(Mitk psapi.lib) -ENDIF(MSVC_IDE OR MSVC_VERSION OR MINGW) +if(MSVC_IDE OR MSVC_VERSION OR MINGW) + target_link_libraries(Mitk psapi.lib) +endif(MSVC_IDE OR MSVC_VERSION OR MINGW) # verify ITK has been built with GDCM >= 2.0.14 set(GDCM_FULL_VERSION "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}") set(MITK_REQUIRED_GDCM_VERSION "2.0.14") if(GDCM_FULL_VERSION VERSION_LESS MITK_REQUIRED_GDCM_VERSION) message(SEND_ERROR "Mitk: MITK requires ITK with at least GDCM version ${MITK_REQUIRED_GDCM_VERSION}.\nFound version ${GDCM_FULL_VERSION} (GDCM NOT found if you don't see a version here)") else(GDCM_FULL_VERSION VERSION_LESS MITK_REQUIRED_GDCM_VERSION) message(STATUS "Mitk: Found GDCM version ${GDCM_FULL_VERSION}") endif(GDCM_FULL_VERSION VERSION_LESS MITK_REQUIRED_GDCM_VERSION) # build tests? -OPTION(BUILD_TESTING "Build the MITK Core tests." ON) -IF(BUILD_TESTING) -ENABLE_TESTING() -ADD_SUBDIRECTORY(Testing) -ENDIF(BUILD_TESTING) +option(BUILD_TESTING "Build the MITK Core tests." ON) +if(BUILD_TESTING) +enable_testing() +add_subdirectory(Testing) +endif(BUILD_TESTING) diff --git a/Core/Code/CppMicroServices/CMake/MacroParseArguments.cmake b/Core/Code/CppMicroServices/CMake/MacroParseArguments.cmake index 6519d014c2..8f61fdc704 100644 --- a/Core/Code/CppMicroServices/CMake/MacroParseArguments.cmake +++ b/Core/Code/CppMicroServices/CMake/MacroParseArguments.cmake @@ -1,79 +1,79 @@ -# MACRO (MACRO_PARSE_ARGUMENTS prefix arg_names option_names) +# macro(MACRO_PARSE_ARGUMENTS prefix arg_names option_names) # # From http://www.cmake.org/Wiki/CMakeMacroParseArguments: # # The MACRO_PARSE_ARGUMENTS macro will take the arguments of another macro and # define several variables: # # 1) The first argument to is a prefix to put on all variables it creates. # 2) The second argument is a quoted list of names, # 3) and the third argument is a quoted list of options. # # The rest of MACRO_PARSE_ARGUMENTS are arguments from another macro to be # parsed. # # MACRO_PARSE_ARGUMENTS(prefix arg_names options arg1 arg2...) # # For each item in options, MACRO_PARSE_ARGUMENTS will create a variable # with that name, prefixed with prefix_. So, for example, if prefix is # MY_MACRO and options is OPTION1;OPTION2, then PARSE_ARGUMENTS will create # the variables MY_MACRO_OPTION1 and MY_MACRO_OPTION2. These variables will # be set to true if the option exists in the command line or false otherwise. # # For each item in arg_names, MACRO_PARSE_ARGUMENTS will create a variable # with that name, prefixed with prefix_. Each variable will be filled with the # arguments that occur after the given arg_name is encountered up to the next # arg_name or the end of the arguments. All options are removed from these # lists. # # MACRO_PARSE_ARGUMENTS also creates a prefix_DEFAULT_ARGS variable containing # the list of all arguments up to the first arg_name encountered. -IF(NOT COMMAND MACRO_PARSE_ARGUMENTS) +if(NOT COMMAND MACRO_PARSE_ARGUMENTS) -MACRO (MACRO_PARSE_ARGUMENTS prefix arg_names option_names) +macro(MACRO_PARSE_ARGUMENTS prefix arg_names option_names) - SET(DEFAULT_ARGS) + set(DEFAULT_ARGS) - FOREACH (arg_name ${arg_names}) - SET(${prefix}_${arg_name}) - ENDFOREACH (arg_name) + foreach(arg_name ${arg_names}) + set(${prefix}_${arg_name}) + endforeach(arg_name) - FOREACH (option ${option_names}) - SET(${prefix}_${option} FALSE) - ENDFOREACH (option) + foreach(option ${option_names}) + set(${prefix}_${option} FALSE) + endforeach(option) - SET(current_arg_name DEFAULT_ARGS) - SET(current_arg_list) + set(current_arg_name DEFAULT_ARGS) + set(current_arg_list) - FOREACH (arg ${ARGN}) + foreach(arg ${ARGN}) - SET(larg_names ${arg_names}) - LIST(FIND larg_names "${arg}" is_arg_name) + set(larg_names ${arg_names}) + list(FIND larg_names "${arg}" is_arg_name) - IF (is_arg_name GREATER -1) + if(is_arg_name GREATER -1) - SET(${prefix}_${current_arg_name} ${current_arg_list}) - SET(current_arg_name "${arg}") - SET(current_arg_list) + set(${prefix}_${current_arg_name} ${current_arg_list}) + set(current_arg_name "${arg}") + set(current_arg_list) - ELSE (is_arg_name GREATER -1) + else(is_arg_name GREATER -1) - SET(loption_names ${option_names}) - LIST(FIND loption_names "${arg}" is_option) + set(loption_names ${option_names}) + list(FIND loption_names "${arg}" is_option) - IF (is_option GREATER -1) - SET(${prefix}_${arg} TRUE) - ELSE (is_option GREATER -1) - SET(current_arg_list ${current_arg_list} "${arg}") - ENDIF (is_option GREATER -1) + if(is_option GREATER -1) + set(${prefix}_${arg} TRUE) + else(is_option GREATER -1) + set(current_arg_list ${current_arg_list} "${arg}") + endif(is_option GREATER -1) - ENDIF (is_arg_name GREATER -1) + endif(is_arg_name GREATER -1) - ENDFOREACH (arg ${ARGN}) + endforeach(arg ${ARGN}) - SET(${prefix}_${current_arg_name} ${current_arg_list}) + set(${prefix}_${current_arg_name} ${current_arg_list}) -ENDMACRO (MACRO_PARSE_ARGUMENTS) +endmacro(MACRO_PARSE_ARGUMENTS) -ENDIF(NOT COMMAND MACRO_PARSE_ARGUMENTS) +endif(NOT COMMAND MACRO_PARSE_ARGUMENTS) diff --git a/Core/Code/CppMicroServices/CMake/usFunctionCheckCompilerFlags.cmake b/Core/Code/CppMicroServices/CMake/usFunctionCheckCompilerFlags.cmake index 01b77bc054..9211f29df9 100644 --- a/Core/Code/CppMicroServices/CMake/usFunctionCheckCompilerFlags.cmake +++ b/Core/Code/CppMicroServices/CMake/usFunctionCheckCompilerFlags.cmake @@ -1,47 +1,47 @@ # # Helper macro allowing to check if the given flags are supported # by the underlying build tool # # If the flag(s) is/are supported, they will be appended to the string identified by RESULT_VAR # # Usage: # MITKFunctionCheckCompilerFlags(FLAGS_TO_CHECK VALID_FLAGS_VAR) # # Example: # # set(myflags) # usFunctionCheckCompilerFlags("-fprofile-arcs" myflags) # message(1-myflags:${myflags}) # usFunctionCheckCompilerFlags("-fauto-bugfix" myflags) # message(2-myflags:${myflags}) # usFunctionCheckCompilerFlags("-Wall" myflags) # message(1-myflags:${myflags}) # # The output will be: # 1-myflags: -fprofile-arcs # 2-myflags: -fprofile-arcs # 3-myflags: -fprofile-arcs -Wall -INCLUDE(TestCXXAcceptsFlag) +include(TestCXXAcceptsFlag) -FUNCTION(usFunctionCheckCompilerFlags CXX_FLAG_TO_TEST RESULT_VAR) +function(usFunctionCheckCompilerFlags CXX_FLAG_TO_TEST RESULT_VAR) - IF(CXX_FLAG_TO_TEST STREQUAL "") - MESSAGE(FATAL_ERROR "CXX_FLAG_TO_TEST shouldn't be empty") - ENDIF() + if(CXX_FLAG_TO_TEST STREQUAL "") + message(FATAL_ERROR "CXX_FLAG_TO_TEST shouldn't be empty") + endif() # Internally, the macro CMAKE_CXX_ACCEPTS_FLAG calls TRY_COMPILE. To avoid # the cost of compiling the test each time the project is configured, the variable set by # the macro is added to the cache so that following invocation of the macro with # the same variable name skip the compilation step. # For that same reason, ctkFunctionCheckCompilerFlags function appends a unique suffix to # the HAS_FLAG variable. This suffix is created using a 'clean version' of the flag to test. - STRING(REGEX REPLACE "-\\s\\$\\+\\*\\{\\}\\(\\)\\#" "" suffix ${CXX_FLAG_TO_TEST}) + string(REGEX REPLACE "-\\s\\$\\+\\*\\{\\}\\(\\)\\#" "" suffix ${CXX_FLAG_TO_TEST}) CHECK_CXX_ACCEPTS_FLAG(${CXX_FLAG_TO_TEST} HAS_FLAG_${suffix}) - IF(HAS_FLAG_${suffix}) - SET(${RESULT_VAR} "${${RESULT_VAR}} ${CXX_FLAG_TO_TEST}" PARENT_SCOPE) - ENDIF() + if(HAS_FLAG_${suffix}) + set(${RESULT_VAR} "${${RESULT_VAR}} ${CXX_FLAG_TO_TEST}" PARENT_SCOPE) + endif() -ENDFUNCTION() +endfunction() diff --git a/Core/Code/CppMicroServices/CMake/usFunctionGetGccVersion.cmake b/Core/Code/CppMicroServices/CMake/usFunctionGetGccVersion.cmake index f7d4d5eddb..053ef33b6b 100644 --- a/Core/Code/CppMicroServices/CMake/usFunctionGetGccVersion.cmake +++ b/Core/Code/CppMicroServices/CMake/usFunctionGetGccVersion.cmake @@ -1,19 +1,19 @@ #! \brief Get the gcc version -FUNCTION(usFunctionGetGccVersion path_to_gcc output_var) - IF(CMAKE_COMPILER_IS_GNUCXX) - EXECUTE_PROCESS( +function(usFunctionGetGccVersion path_to_gcc output_var) + if(CMAKE_COMPILER_IS_GNUCXX) + execute_process( COMMAND ${path_to_gcc} -dumpversion RESULT_VARIABLE result OUTPUT_VARIABLE output ERROR_VARIABLE error OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE ) - IF(result) - MESSAGE(FATAL_ERROR "Failed to obtain compiler version running [${path_to_gcc} -dumpversion]: ${error}") - ENDIF() - SET(${output_var} ${output} PARENT_SCOPE) - ENDIF() -ENDFUNCTION() + if(result) + message(FATAL_ERROR "Failed to obtain compiler version running [${path_to_gcc} -dumpversion]: ${error}") + endif() + set(${output_var} ${output} PARENT_SCOPE) + endif() +endfunction() diff --git a/Core/Code/CppMicroServices/CMakeLists.txt b/Core/Code/CppMicroServices/CMakeLists.txt index bd81198afa..365af4f0b3 100644 --- a/Core/Code/CppMicroServices/CMakeLists.txt +++ b/Core/Code/CppMicroServices/CMakeLists.txt @@ -1,316 +1,316 @@ project(CppMicroServices) cmake_minimum_required(VERSION 2.8) #----------------------------------------------------------------------------- # Update CMake module path #------------------------------------------------------------------------------ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH} ) #----------------------------------------------------------------------------- -# CMake Function(s) and Macro(s) +# CMake function(s) and macro(s) #----------------------------------------------------------------------------- include(MacroParseArguments) include(CheckCXXSourceCompiles) include(usFunctionCheckCompilerFlags) include(usFunctionGetGccVersion) include(usFunctionGenerateModuleInit) #----------------------------------------------------------------------------- # Init output directories #----------------------------------------------------------------------------- set(US_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib") set(US_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib") set(US_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") foreach(_type ARCHIVE LIBRARY RUNTIME) if(NOT CMAKE_${_type}_OUTPUT_DIRECTORY) set(CMAKE_${_type}_OUTPUT_DIRECTORY ${US_${_type}_OUTPUT_DIRECTORY}) endif() endforeach() #----------------------------------------------------------------------------- # Set a default build type if none was specified #----------------------------------------------------------------------------- if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) message(STATUS "Setting build type to 'Debug' as none was specified.") set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE) # Set the possible values of build type for cmake-gui set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") endif() #----------------------------------------------------------------------------- # CMake options #----------------------------------------------------------------------------- function(us_cache_var _var_name _var_default _var_type _var_help) set(_advanced 0) set(_force) foreach(_argn ${ARGN}) if(_argn STREQUAL ADVANCED) set(_advanced 1) elseif(_argn STREQUAL FORCE) set(_force FORCE) endif() endforeach() if(US_IS_EMBEDDED) if(NOT DEFINED ${_var_name} OR _force) set(${_var_name} ${_var_default} PARENT_SCOPE) endif() else() set(${_var_name} ${_var_default} CACHE ${_var_type} "${_var_help}" ${_force}) if(_advanced) mark_as_advanced(${_var_name}) endif() endif() endfunction() # Determine if we are being build inside a larger project if(NOT DEFINED US_IS_EMBEDDED) if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) set(US_IS_EMBEDDED 0) else() set(US_IS_EMBEDDED 1) set(CppMicroServices_EXPORTS 1) endif() endif() us_cache_var(US_ENABLE_SERVICE_FACTORY_SUPPORT ON BOOL "Enable Service Factory support" ADVANCED) us_cache_var(US_ENABLE_THREADING_SUPPORT OFF BOOL "Enable threading support") us_cache_var(US_BUILD_SHARED_LIBS ON BOOL "Build shared libraries") us_cache_var(US_BUILD_TESTING OFF BOOL "Build tests") if(MSVC10) # Visual Studio 2010 has support for C++11 enabled by default set(US_USE_C++11 1) else() us_cache_var(US_USE_C++11 OFF BOOL "Enable the use of C++11 features" ADVANCED) endif() us_cache_var(US_NAMESPACE "us" STRING "The namespace for the C++ micro services entities") us_cache_var(US_HEADER_PREFIX "" STRING "The file name prefix for the public C++ micro services header files") us_cache_var(US_BASECLASS_NAME "" STRING "The fully-qualified name of the base class") if(US_ENABLE_SERVICE_FACTORY_SUPPORT) us_cache_var(US_BASECLASS_PACKAGE "" STRING "The name of the package providing the base class definition" ADVANCED) set(bc_inc_d_doc "A list of include directories containing the header files for the base class") us_cache_var(US_BASECLASS_INCLUDE_DIRS "" STRING "${bc_inc_d_doc}" ADVANCED) set(bc_lib_d_doc "A list of library directories for the base class") us_cache_var(US_BASECLASS_LIBRARY_DIRS "" STRING "${bc_lib_d_doc}" ADVANCED) set(bc_lib_doc "A list of libraries needed for the base class") us_cache_var(US_BASECLASS_LIBRARIES "" STRING "${bc_lib_doc}" ADVANCED) us_cache_var(US_BASECLASS_HEADER "" STRING "The name of the header file containing the base class declaration" ADVANCED) endif() set(BUILD_SHARED_LIBS ${US_BUILD_SHARED_LIBS}) # Sanity checks if(US_ENABLE_SERVICE_FACTORY_SUPPORT OR US_BUILD_TESTING) if(US_BASECLASS_PACKAGE) find_package(${US_BASECLASS_PACKAGE} REQUIRED) # Try to get the include dirs foreach(_suffix DIRECTORIES DIRS DIRECTORY DIR) if(${US_BASECLASS_PACKAGE}_INCLUDE_${_suffix} AND NOT US_BASECLASS_INCLUDE_DIRS) us_cache_var(US_BASECLASS_INCLUDE_DIRS ${${US_BASECLASS_PACKAGE}_INCLUDE_${_suffix}} STRING "${bc_inc_d_doc}" FORCE) break() endif() endforeach() # Try to get the library dirs foreach(_suffix DIRECTORIES DIRS DIRECTORY DIR) if(${US_BASECLASS_PACKAGE}_LIBRARY_${_suffix} AND NOT US_BASECLASS_LIBRARY_DIRS) us_cache_var(US_BASECLASS_LIBRARY_DIRS ${${US_BASECLASS_PACKAGE}_LIBRARY_${_suffix}} STRING "${bc_lib_d_doc}" FORCE) break() endif() endforeach() # Try to get the libraries foreach(_suffix LIBRARIES LIBS LIBRARY LIB) if(${US_BASECLASS_PACKAGE}_${_suffix} AND NOT US_BASECLASS_LIBRARIES) us_cache_var(US_BASECLASS_LIBRARIES ${${US_BASECLASS_PACKAGE}_${_suffix}} STRING "${bc_lib_doc}" FORCE) break() endif() endforeach() if(NOT US_BASECLASS_NAME) message(FATAL_ERROR "US_BASECLASS_NAME not set") elseif(NOT US_BASECLASS_HEADER) message(FATAL_ERROR "US_BASECLASS_HEADER not set") endif() endif() if(US_ENABLE_SERVICE_FACTORY_SUPPORT AND US_BASECLASS_NAME AND NOT US_BASECLASS_HEADER) message(FATAL_ERROR "US_ENABLE_SERVICE_FACTORY_SUPPORT requires a US_BASECLASS_HEADER value") endif() endif() set(_us_baseclass_default 0) if(NOT US_BASECLASS_NAME) message(WARNING "Using build in base class \"::${US_NAMESPACE}::Base\"") set(_us_baseclass_default 1) set(US_BASECLASS_NAME "${US_NAMESPACE}::Base") set(US_BASECLASS_HEADER "usBase.h") endif() if(US_BUILD_TESTING AND US_BASECLASS_NAME AND NOT US_BASECLASS_HEADER) message(FATAL_ERROR "US_BUILD_TESTING requires a US_BASECLASS_HEADER value") endif() set(US_BASECLASS_INCLUDE "#include <${US_BASECLASS_HEADER}>") string(REPLACE "::" ";" _bc_token "${US_BASECLASS_NAME}") list(GET _bc_token -1 _bc_name) list(REMOVE_AT _bc_token -1) set(US_BASECLASS_FORWARD_DECLARATION "") foreach(_namespace_tok ${_bc_token}) if(_namespace_tok) set(US_BASECLASS_FORWARD_DECLARATION "${US_BASECLASS_FORWARD_DECLARATION}namespace ${_namespace_tok} { ") endif() endforeach() set(US_BASECLASS_FORWARD_DECLARATION "${US_BASECLASS_FORWARD_DECLARATION}class ${_bc_name}; ") foreach(_namespace_tok ${_bc_token}) if(_namespace_tok) set(US_BASECLASS_FORWARD_DECLARATION "${US_BASECLASS_FORWARD_DECLARATION}}") endif() endforeach() #----------------------------------------------------------------------------- # US C/CXX Flags #----------------------------------------------------------------------------- set(US_C_FLAGS "${COVERAGE_C_FLAGS} ${ADDITIONAL_C_FLAGS}") set(US_CXX_FLAGS "${COVERAGE_CXX_FLAGS} ${ADDITIONAL_CXX_FLAGS}") # This is used as a preprocessor define set(US_USE_CXX11 ${US_USE_C++11}) if(CMAKE_COMPILER_IS_GNUCXX) set(cflags "-Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align -Wwrite-strings -D_FORTIFY_SOURCE=2") usFunctionCheckCompilerFlags("-fdiagnostics-show-option" cflags) usFunctionCheckCompilerFlags("-Wl,--no-undefined" cflags) if(US_USE_C++11) usFunctionCheckCompilerFlags("-std=c++0x" US_CXX_FLAGS) endif() usFunctionGetGccVersion(${CMAKE_CXX_COMPILER} GCC_VERSION) # With older version of gcc supporting the flag -fstack-protector-all, an extra dependency to libssp.so # is introduced. If gcc is smaller than 4.4.0 and the build type is Release let's not include the flag. # Doing so should allow to build package made for distribution using older linux distro. if(${GCC_VERSION} VERSION_GREATER "4.4.0" OR (CMAKE_BUILD_TYPE STREQUAL "Debug" AND ${GCC_VERSION} VERSION_LESS "4.4.0")) usFunctionCheckCompilerFlags("-fstack-protector-all" cflags) endif() if(MINGW) # suppress warnings about auto imported symbols set(US_CXX_FLAGS "-Wl,--enable-auto-import ${US_CXX_FLAGS}") # we need to define a Windows version set(US_CXX_FLAGS "-D_WIN32_WINNT=0x0500 ${US_CXX_FLAGS}") else() # Enable visibility support if(NOT ${GCC_VERSION} VERSION_LESS "4.5") usFunctionCheckCompilerFlags("-fvisibility=hidden -fvisibility-inlines-hidden" US_CXX_FLAGS) endif() endif() set(US_C_FLAGS "${cflags} ${US_C_FLAGS}") set(US_CXX_FLAGS "${cflags} -Woverloaded-virtual -Wold-style-cast -Wstrict-null-sentinel -Wsign-promo ${US_CXX_FLAGS}") elseif(MSVC90 OR MSVC10) set(US_CXX_FLAGS "/MP ${US_CXX_FLAGS}") endif() if(NOT US_IS_EMBEDDED) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${US_CXX_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${US_C_FLAGS}") endif() #----------------------------------------------------------------------------- # US include dirs and libraries #----------------------------------------------------------------------------- set(US_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/include ) set(US_INTERNAL_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/src/util ${CMAKE_CURRENT_SOURCE_DIR}/src/service ${CMAKE_CURRENT_SOURCE_DIR}/src/module ) if(US_ENABLE_SERVICE_FACTORY_SUPPORT) list(APPEND _us_internal_include_dirs ${US_BASECLASS_INCLUDE_DIRS}) endif() # link libraries for third party libs if(US_IS_EMBEDDED) set(US_LINK_LIBRARIES ${US_EMBEDDING_LIBRARY}) else() set(US_LINK_LIBRARIES ${PROJECT_NAME}) endif() # link libraries for the CppMicroServices lib set(_link_libraries ) if(UNIX) list(APPEND _link_libraries dl) endif() list(APPEND US_LINK_LIBRARIES ${_link_libraries}) if(US_ENABLE_SERVICE_FACTORY_SUPPORT) list(APPEND US_LINK_LIBRARIES ${US_BASECLASS_LIBRARIES}) endif() set(US_LINK_DIRS ) if(US_ENABLE_SERVICE_FACTORY_SUPPORT) list(APPEND US_LINK_DIRS ${US_BASECLASS_LIBRARY_DIRS}) endif() #----------------------------------------------------------------------------- # Source directory #----------------------------------------------------------------------------- add_subdirectory(src) #----------------------------------------------------------------------------- # US testing #----------------------------------------------------------------------------- if(US_BUILD_TESTING) enable_testing() add_subdirectory(test) endif() #----------------------------------------------------------------------------- # Documentation #----------------------------------------------------------------------------- add_subdirectory(documentation) #----------------------------------------------------------------------------- # Last configuration steps #----------------------------------------------------------------------------- configure_file(usConfig.h.in ${PROJECT_BINARY_DIR}/include/usConfig.h) configure_file(${PROJECT_NAME}Config.cmake.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake @ONLY) diff --git a/Core/Code/CppMicroServices/src/CMakeLists.txt b/Core/Code/CppMicroServices/src/CMakeLists.txt index faaf5ff2c0..78808ae0e1 100644 --- a/Core/Code/CppMicroServices/src/CMakeLists.txt +++ b/Core/Code/CppMicroServices/src/CMakeLists.txt @@ -1,168 +1,168 @@ #----------------------------------------------------------------------------- # US source files #----------------------------------------------------------------------------- set(_srcs util/usAny.cpp util/usThreads.cpp util/usUtils.cpp service/usLDAPExpr.cpp service/usLDAPFilter.cpp service/usServiceException.cpp service/usServiceEvent.cpp service/usServiceListenerEntry.cpp service/usServiceListenerEntry_p.h service/usServiceListeners.cpp service/usServiceListeners_p.h service/usServiceProperties.cpp service/usServiceReference.cpp service/usServiceReferencePrivate.cpp service/usServiceRegistration.cpp service/usServiceRegistrationPrivate.cpp service/usServiceRegistry.cpp service/usServiceRegistry_p.h module/usCoreModuleContext_p.h module/usCoreModuleContext.cpp module/usModuleContext.cpp module/usModule.cpp module/usModuleEvent.cpp module/usModuleInfo.cpp module/usModulePrivate.cpp module/usModuleRegistry.cpp module/usModuleUtils.cpp module/usModuleVersion.cpp ) set(_private_headers util/usAtomicInt.h util/usExportMacros.h util/usFunctor.h util/usStaticInit.h util/usThreads.h util/usUtils.h service/usServiceTracker.tpp service/usServiceTrackerPrivate.h service/usServiceTrackerPrivate.tpp service/usTrackedService.h service/usTrackedServiceListener.h service/usTrackedService.tpp module/usModuleAbstractTracked.h module/usModuleAbstractTracked.tpp module/usModuleUtils.h ) set(_public_headers util/usAny.h util/usSharedData.h service/usLDAPFilter.h service/usServiceEvent.h service/usServiceException.h service/usServiceInterface.h service/usServiceProperties.h service/usServiceReference.h service/usServiceRegistration.h service/usServiceTracker.h service/usServiceTrackerCustomizer.h module/usGetModuleContext.h module/usModule.h module/usModuleActivator.h module/usModuleContext.h module/usModuleEvent.h module/usModuleInfo.h module/usModuleRegistry.h module/usModuleUtils.h module/usModuleVersion.h ) if(_us_baseclass_default) list(APPEND _public_headers util/usBase.h) endif() if(US_ENABLE_THREADING_SUPPORT) list(APPEND _public_headers util/usThreads.h) endif() if(US_ENABLE_SERVICE_FACTORY_SUPPORT) list(APPEND _public_headers service/usServiceFactory.h) endif() if(US_IS_EMBEDDED) set(US_SOURCES ) get_filename_component(_path_prefix "${PROJECT_SOURCE_DIR}" NAME) set(_path_prefix "${_path_prefix}/src") foreach(_src ${_srcs} ${_public_headers} ${_private_headers}) list(APPEND US_SOURCES ${_path_prefix}/${_src}) endforeach() set(US_SOURCES ${US_SOURCES} PARENT_SCOPE) endif() #----------------------------------------------------------------------------- # Create library (only if not in embedded mode) #----------------------------------------------------------------------------- if(NOT US_IS_EMBEDDED) include_directories(${US_INTERNAL_INCLUDE_DIRS}) if(US_LINK_DIRS) link_directories(${US_LINK_DIRS}) endif() if(US_BUILD_SHARED_LIBS) usFunctionGenerateModuleInit(_srcs NAME ${PROJECT_NAME} VERSION "0.9.0") endif() add_library(${PROJECT_NAME} ${_srcs} ${_public_headers} ${_private_headers}) set_property(TARGET ${PROJECT_NAME} PROPERTY FRAMEWORK 1) if(US_LINK_LIBRARIES) target_link_libraries(${PROJECT_NAME} ${US_LINK_LIBRARIES}) endif() endif() #----------------------------------------------------------------------------- # Configure public header wrappers #----------------------------------------------------------------------------- set(US_PUBLIC_HEADERS ${_public_headers}) -if (US_HEADER_PREFIX) +if(US_HEADER_PREFIX) set(US_PUBLIC_HEADERS ) foreach(_public_header ${_public_headers}) get_filename_component(_public_header_basename ${_public_header} NAME_WE) set(_us_public_header ${_public_header_basename}.h) string(SUBSTRING "${_public_header_basename}" 2 -1 _public_header_basename) set(_header_wrapper "${PROJECT_BINARY_DIR}/include/${US_HEADER_PREFIX}${_public_header_basename}.h") configure_file(${PROJECT_SOURCE_DIR}/CMake/usPublicHeaderWrapper.h.in ${_header_wrapper} @ONLY) list(APPEND US_PUBLIC_HEADERS ${_header_wrapper}) endforeach() endif() foreach(_header ${_public_headers} ${_private_headers}) get_filename_component(_header_name "${_header}" NAME) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_header} "${PROJECT_BINARY_DIR}/include/${_header_name}") endforeach() if(NOT US_IS_EMBEDDED) set_property(TARGET ${PROJECT_NAME} PROPERTY PUBLIC_HEADER ${US_PUBLIC_HEADERS}) set_property(TARGET ${PROJECT_NAME} PROPERTY PRIVATE_HEADER ${_private_headers}) else() set(US_PUBLIC_HEADERS ${US_PUBLIC_HEADERS} PARENT_SCOPE) set(US_PRIVATE_HEADERS ${US_PRIVATE_HEADERS} PARENT_SCOPE) endif() #----------------------------------------------------------------------------- # Install support (only if not in embedded mode) #----------------------------------------------------------------------------- if(NOT US_IS_EMBEDDED) install(TARGETS ${PROJECT_NAME} FRAMEWORK DESTINATION . RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include PRIVATE_HEADER DESTINATION include) endif() diff --git a/Core/Code/Testing/CMakeLists.txt b/Core/Code/Testing/CMakeLists.txt index a7894cbf86..7f5d670ab7 100644 --- a/Core/Code/Testing/CMakeLists.txt +++ b/Core/Code/Testing/CMakeLists.txt @@ -1,44 +1,44 @@ MITK_CREATE_MODULE_TESTS(LABELS MITK-Core) # MITK_INSTALL_TARGETS(EXECUTABLES MitkTestDriver) mitkAddCustomModuleTest(mitkDICOMLocaleTest_spacingOk_CT mitkDICOMLocaleTest ${MITK_DATA_DIR}/spacing-ok-ct.dcm) mitkAddCustomModuleTest(mitkDICOMLocaleTest_spacingOk_MR mitkDICOMLocaleTest ${MITK_DATA_DIR}/spacing-ok-mr.dcm) mitkAddCustomModuleTest(mitkDICOMLocaleTest_spacingOk_SC mitkDICOMLocaleTest ${MITK_DATA_DIR}/spacing-ok-sc.dcm) mitkAddCustomModuleTest(mitkEventMapperTest_Test1And2 mitkEventMapperTest ${MITK_DATA_DIR}/TestStateMachine1.xml ${MITK_DATA_DIR}/TestStateMachine2.xml) #mitkAddCustomModuleTest(mitkNodeDependentPointSetInteractorTest mitkNodeDependentPointSetInteractorTest ${MITK_DATA_DIR}/Pic3D.pic.gz ${MITK_DATA_DIR}/BallBinary30x30x30.pic.gz) mitkAddCustomModuleTest(mitkNodeDependentPointSetInteractorTest mitkNodeDependentPointSetInteractorTest ${MITK_DATA_DIR}/Pic3D.nrrd ${MITK_DATA_DIR}/BallBinary30x30x30.nrrd) mitkAddCustomModuleTest(mitkDataStorageTest_US4DCyl mitkDataStorageTest ${MITK_DATA_DIR}/US4DCyl.nrrd) mitkAddCustomModuleTest(mitkStateMachineFactoryTest_TestStateMachine1_2 mitkStateMachineFactoryTest ${MITK_DATA_DIR}/TestStateMachine1.xml ${MITK_DATA_DIR}/TestStateMachine2.xml) mitkAddCustomModuleTest(mitkDicomSeriesReaderTest_CTImage mitkDicomSeriesReaderTest ${MITK_DATA_DIR}/TinyCTAbdomen) mitkAddCustomModuleTest(mitkPointSetReaderTest mitkPointSetReaderTest ${MITK_DATA_DIR}/PointSetReaderTestData.mps) mitkAddCustomModuleTest(mitkImageTest_4DImageData mitkImageTest ${MITK_DATA_DIR}/US4DCyl.nrrd) mitkAddCustomModuleTest(mitkImageTest_2D+tImageData mitkImageTest ${MITK_DATA_DIR}/Pic2DplusT.nrrd) mitkAddCustomModuleTest(mitkImageTest_3DImageData mitkImageTest ${MITK_DATA_DIR}/Pic3D.nrrd) mitkAddCustomModuleTest(mitkImageTest_brainImage mitkImageTest ${MITK_DATA_DIR}/brain.mhd) #mitkAddCustomModuleTest(mitkImageTest_color2DImage mitkImageTest ${MITK_DATA_DIR}/NrrdWritingTestImage.jpg) -IF(MITK_ENABLE_GUI_TESTING) +if(MITK_ENABLE_GUI_TESTING) mitkAddCustomModuleTest(mitkImageVtkMapper2D_rgbaImage640x480 mitkImageVtkMapper2DTest ${MITK_DATA_DIR}/RenderingTestData/rgbaImage.png #input image to load in data storage -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/rgbaImage640x480REF.png #corresponding reference screenshot ) -ENDIF() +endif() # see bug 9882 -IF(NOT APPLE) -ADD_TEST(mitkPointSetLocaleTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkPointSetLocaleTest ${MITK_DATA_DIR}/pointSet.mps) -SET_PROPERTY(TEST mitkPointSetLocaleTest PROPERTY LABELS MITK-Core) -ENDIF() +if(NOT APPLE) +add_test(mitkPointSetLocaleTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkPointSetLocaleTest ${MITK_DATA_DIR}/pointSet.mps) +set_property(TEST mitkPointSetLocaleTest PROPERTY LABELS MITK-Core) +endif() -ADD_TEST(mitkImageWriterTest_nrrdImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkImageWriterTest ${MITK_DATA_DIR}/NrrdWritingTestImage.jpg) -SET_PROPERTY(TEST mitkImageWriterTest_nrrdImage PROPERTY LABELS MITK-Core) +add_test(mitkImageWriterTest_nrrdImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkImageWriterTest ${MITK_DATA_DIR}/NrrdWritingTestImage.jpg) +set_property(TEST mitkImageWriterTest_nrrdImage PROPERTY LABELS MITK-Core) add_subdirectory(DICOMTesting) diff --git a/Core/Code/Testing/DICOMTesting/CMakeLists.txt b/Core/Code/Testing/DICOMTesting/CMakeLists.txt index 2a0b5b6be7..ab950af0c8 100644 --- a/Core/Code/Testing/DICOMTesting/CMakeLists.txt +++ b/Core/Code/Testing/DICOMTesting/CMakeLists.txt @@ -1,38 +1,38 @@ -if (BUILD_TESTING) -if (GDCM_DIR) +if(BUILD_TESTING) +if(GDCM_DIR) # clear variables from prior files.cmake set(MODULE_TESTS) set(MODULE_IMAGE_TESTS) set(MODULE_TESTIMAGES) set(MODULE_CUSTOM_TESTS) set(H_FILES) set(CPP_FILES) # now create a new module only for testing purposes MITK_CREATE_MODULE( mitkDICOMTesting DEPENDS Mitk # Mitk.so ) MITK_CHECK_MODULE(_RESULT mitkDICOMTesting) -IF(_RESULT) - MESSAGE(STATUS "mitkDICOMTesting application won't be built. Missing: ${_RESULT}") -ELSE(_RESULT) +if(_RESULT) + message(STATUS "mitkDICOMTesting application won't be built. Missing: ${_RESULT}") +else(_RESULT) # add helpful applications MITK_USE_MODULE( mitkDICOMTesting ) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ALL_INCLUDE_DIRECTORIES}) # dumps out image information add_executable(DumpDICOMMitkImage DumpDICOMMitkImage.cpp) target_link_libraries(DumpDICOMMitkImage ${ALL_LIBRARIES}) # compares dumped out image information against reference dump add_executable(VerifyDICOMMitkImageDump VerifyDICOMMitkImageDump.cpp) target_link_libraries(VerifyDICOMMitkImageDump ${ALL_LIBRARIES}) add_subdirectory(Testing) -ENDIF() +endif() endif() endif() diff --git a/Core/Code/Testing/DICOMTesting/Testing/CMakeLists.txt b/Core/Code/Testing/DICOMTesting/Testing/CMakeLists.txt index 269a9aa5e3..50def10d0c 100644 --- a/Core/Code/Testing/DICOMTesting/Testing/CMakeLists.txt +++ b/Core/Code/Testing/DICOMTesting/Testing/CMakeLists.txt @@ -1,67 +1,67 @@ MITK_CREATE_MODULE_TESTS(LABELS MITK-Core) include(mitkFunctionAddTestLabel) # verify minimum expectations: # files are recognized as DICOM # loading files results in a given number of images mitkAddCustomModuleTest(mitkDICOMTestingSanityTest_NoFiles mitkDICOMTestingSanityTest 0) mitkAddCustomModuleTest(mitkDICOMTestingSanityTest_CTImage mitkDICOMTestingSanityTest 1 ${MITK_DATA_DIR}/spacing-ok-ct.dcm) mitkAddCustomModuleTest(mitkDICOMTestingSanityTest_MRImage mitkDICOMTestingSanityTest 1 ${MITK_DATA_DIR}/spacing-ok-mr.dcm) mitkAddCustomModuleTest(mitkDICOMTestingSanityTest_SCImage mitkDICOMTestingSanityTest 1 ${MITK_DATA_DIR}/spacing-ok-sc.dcm) mitkAddCustomModuleTest(mitkDICOMTestingSanityTest_DefectImage mitkDICOMTestingSanityTest 0 ${MITK_DATA_DIR}/spacing-ok-sc-no2032.dcm) #see bug 8108 -IF(NOT APPLE) +if(NOT APPLE) set(VERIFY_DUMP_CMD ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/VerifyDICOMMitkImageDump) set(CT_ABDOMEN_DIR ${MITK_DATA_DIR}/TinyCTAbdomen) # these variables could be passed as parameters to a generic test creation function set(CURRENT_DATASET_DIR ${CT_ABDOMEN_DIR}) set(TESTS_DIR Tests) set(INPUT_LISTNAME input) set(EXPECTED_DUMP expected.dump) # find all test input lists file(GLOB_RECURSE allInputs ${CURRENT_DATASET_DIR}/${TESTS_DIR}/*/${INPUT_LISTNAME}) function(expectFileExists filename) - if (NOT EXISTS ${filename}) + if(NOT EXISTS ${filename}) message(SEND_ERROR "Test case expected file ${filename} which does not exist! Please fix your CMake code or file layout.") - endif (NOT EXISTS ${filename}) + endif(NOT EXISTS ${filename}) endfunction(expectFileExists) foreach(input ${allInputs}) # extract only the name of the directory of this very test case string(REGEX REPLACE ".*${TESTS_DIR}/([^/]+)/.*" "\\1" input ${input}) set(inputfilelist "${CURRENT_DATASET_DIR}/${TESTS_DIR}/${input}/${INPUT_LISTNAME}") set(expecteddump "${CURRENT_DATASET_DIR}/${TESTS_DIR}/${input}/${EXPECTED_DUMP}") set(testname "DICOM_Load_${input}") message(STATUS "DICOM loading test case '${input}'") expectFileExists(${inputfilelist}) expectFileExists(${expecteddump}) # TODO provide error messages if input not valid set(dicomFiles) # clear list # read list of file names from file "input" file(STRINGS ${inputfilelist} rawDicomFiles) foreach(raw ${rawDicomFiles}) # prepend each file with an abosolute path set(fileWithFullPath ${CURRENT_DATASET_DIR}/${raw}) list(APPEND dicomFiles ${fileWithFullPath}) endforeach(raw ${rawDicomFiles}) #message(STATUS " Load ${dicomFiles}") add_test(${testname} ${VERIFY_DUMP_CMD} ${expecteddump} ${dicomFiles}) mitkFunctionAddTestLabel(${testname}) endforeach(input allInputs) -ENDIF() +endif() diff --git a/Core/Code/Testing/DICOMTesting/Testing/files.cmake b/Core/Code/Testing/DICOMTesting/Testing/files.cmake index 0cbf00be06..f96048ef4a 100644 --- a/Core/Code/Testing/DICOMTesting/Testing/files.cmake +++ b/Core/Code/Testing/DICOMTesting/Testing/files.cmake @@ -1,11 +1,11 @@ # tests with no extra command line parameter -SET(MODULE_CUSTOM_TESTS +set(MODULE_CUSTOM_TESTS mitkDICOMTestingSanityTest.cpp ) # this shouldn't be necessary if this variable # would actually be a parameter of the MITK_CREATE_MODULE_TESTS # macro. See bug #10592 -SET(TEST_CPP_FILES "") +set(TEST_CPP_FILES "") diff --git a/Core/Code/Testing/DICOMTesting/files.cmake b/Core/Code/Testing/DICOMTesting/files.cmake index f6fd6ff9d6..1dfc52c4cc 100644 --- a/Core/Code/Testing/DICOMTesting/files.cmake +++ b/Core/Code/Testing/DICOMTesting/files.cmake @@ -1,4 +1,4 @@ -SET(CPP_FILES +set(CPP_FILES mitkTestDICOMLoading.cpp ) diff --git a/Core/Code/Testing/files.cmake b/Core/Code/Testing/files.cmake index 63b160cc10..670542b0a3 100644 --- a/Core/Code/Testing/files.cmake +++ b/Core/Code/Testing/files.cmake @@ -1,109 +1,109 @@ # tests with no extra command line parameter -SET(MODULE_TESTS +set(MODULE_TESTS mitkAccessByItkTest.cpp mitkCoreObjectFactoryTest.cpp mitkMaterialTest.cpp mitkActionTest.cpp mitkEnumerationPropertyTest.cpp mitkEventTest.cpp mitkFocusManagerTest.cpp mitkGenericPropertyTest.cpp mitkGeometry3DTest.cpp mitkGeometryDataToSurfaceFilterTest.cpp mitkGlobalInteractionTest.cpp mitkImageDataItemTest.cpp #mitkImageMapper2DTest.cpp mitkImageGeneratorTest.cpp mitkBaseDataTest.cpp #mitkImageToItkTest.cpp mitkInstantiateAccessFunctionTest.cpp mitkInteractorTest.cpp mitkITKThreadingTest.cpp # mitkLevelWindowManagerTest.cpp mitkLevelWindowTest.cpp mitkMessageTest.cpp #mitkPipelineSmartPointerCorrectnessTest.cpp mitkPixelTypeTest.cpp mitkPlaneGeometryTest.cpp mitkPointSetFileIOTest.cpp mitkPointSetTest.cpp mitkPointSetWriterTest.cpp mitkPointSetReaderTest.cpp mitkPointSetInteractorTest.cpp mitkPropertyTest.cpp mitkPropertyListTest.cpp #mitkRegistrationBaseTest.cpp #mitkSegmentationInterpolationTest.cpp mitkSlicedGeometry3DTest.cpp mitkSliceNavigationControllerTest.cpp mitkStateMachineTest.cpp mitkStateTest.cpp mitkSurfaceTest.cpp mitkSurfaceToSurfaceFilterTest.cpp mitkTimeSlicedGeometryTest.cpp mitkTransitionTest.cpp mitkUndoControllerTest.cpp mitkVtkWidgetRenderingTest.cpp mitkVerboseLimitedLinearUndoTest.cpp mitkWeakPointerTest.cpp mitkTransferFunctionTest.cpp #mitkAbstractTransformGeometryTest.cpp mitkStepperTest.cpp itkTotalVariationDenoisingImageFilterTest.cpp mitkRenderingManagerTest.cpp vtkMitkThickSlicesFilterTest.cpp mitkNodePredicateSourceTest.cpp mitkVectorTest.cpp mitkClippedSurfaceBoundsCalculatorTest.cpp #QmitkRenderingTestHelper.cpp ) # test with image filename as an extra command line parameter -SET(MODULE_IMAGE_TESTS +set(MODULE_IMAGE_TESTS mitkPlanePositionManagerTest.cpp mitkSurfaceVtkWriterTest.cpp #mitkImageSliceSelectorTest.cpp mitkImageTimeSelectorTest.cpp # mitkVtkPropRendererTest.cpp mitkDataNodeFactoryTest.cpp #mitkSTLFileReaderTest.cpp ) # list of images for which the tests are run -SET(MODULE_TESTIMAGES +set(MODULE_TESTIMAGES # Pic-Factory no more available in Core, test images now in .nrrd format US4DCyl.nrrd Pic3D.nrrd Pic2DplusT.nrrd BallBinary30x30x30.nrrd binary.stl ball.stl ) -SET(MODULE_CUSTOM_TESTS +set(MODULE_CUSTOM_TESTS #mitkLabeledImageToSurfaceFilterTest.cpp #mitkExternalToolsTest.cpp mitkDataStorageTest.cpp mitkDataNodeTest.cpp mitkDicomSeriesReaderTest.cpp mitkDICOMLocaleTest.cpp mitkEventMapperTest.cpp mitkNodeDependentPointSetInteractorTest.cpp mitkStateMachineFactoryTest.cpp mitkPointSetLocaleTest.cpp mitkImageTest.cpp mitkImageWriterTest.cpp mitkImageVtkMapper2DTest.cpp ) # Create an artificial module initializing class for # the usServiceListenerTest.cpp usFunctionGenerateModuleInit(testdriver_init_file NAME ${MODULE_NAME}TestDriver DEPENDS "Mitk" VERSION "0.1.0" EXECUTABLE ) -SET(TEST_CPP_FILES ${testdriver_init_file} mitkRenderingTestHelper.cpp) +set(TEST_CPP_FILES ${testdriver_init_file} mitkRenderingTestHelper.cpp) diff --git a/Core/Code/files.cmake b/Core/Code/files.cmake index 9922ea6602..be9c5cfb35 100644 --- a/Core/Code/files.cmake +++ b/Core/Code/files.cmake @@ -1,296 +1,296 @@ -SET(H_FILES +set(H_FILES Algorithms/itkImportMitkImageContainer.h Algorithms/itkImportMitkImageContainer.txx Algorithms/itkLocalVariationImageFilter.h Algorithms/itkLocalVariationImageFilter.txx Algorithms/itkMITKScalarImageToHistogramGenerator.h Algorithms/itkMITKScalarImageToHistogramGenerator.txx Algorithms/itkTotalVariationDenoisingImageFilter.h Algorithms/itkTotalVariationDenoisingImageFilter.txx Algorithms/itkTotalVariationSingleIterationImageFilter.h Algorithms/itkTotalVariationSingleIterationImageFilter.txx Algorithms/mitkBilateralFilter.h Algorithms/mitkBilateralFilter.cpp Algorithms/mitkImageAccessByItk.h Algorithms/mitkImageCast.h Algorithms/mitkImageToItk.h Algorithms/mitkImageToItk.txx Algorithms/mitkInstantiateAccessFunctions.h Algorithms/mitkITKImageImport.h Algorithms/mitkITKImageImport.txx Algorithms/mitkPixelTypeList.h # Preprocessor macros taken from Boost Algorithms/mitkPPArithmeticDec.h Algorithms/mitkPPArgCount.h Algorithms/mitkPPCat.h Algorithms/mitkPPConfig.h Algorithms/mitkPPControlExprIIf.h Algorithms/mitkPPControlIf.h Algorithms/mitkPPControlIIf.h Algorithms/mitkPPDebugError.h Algorithms/mitkPPDetailAutoRec.h Algorithms/mitkPPDetailDMCAutoRec.h Algorithms/mitkPPExpand.h Algorithms/mitkPPFacilitiesEmpty.h Algorithms/mitkPPFacilitiesExpand.h Algorithms/mitkPPLogicalBool.h Algorithms/mitkPPRepetitionDetailDMCFor.h Algorithms/mitkPPRepetitionDetailEDGFor.h Algorithms/mitkPPRepetitionDetailFor.h Algorithms/mitkPPRepetitionDetailMSVCFor.h Algorithms/mitkPPRepetitionFor.h Algorithms/mitkPPSeqElem.h Algorithms/mitkPPSeqForEach.h Algorithms/mitkPPSeqForEachProduct.h Algorithms/mitkPPSeq.h Algorithms/mitkPPSeqEnum.h Algorithms/mitkPPSeqSize.h Algorithms/mitkPPSeqToTuple.h Algorithms/mitkPPStringize.h Algorithms/mitkPPTupleEat.h Algorithms/mitkPPTupleElem.h Algorithms/mitkPPTupleRem.h Algorithms/mitkClippedSurfaceBoundsCalculator.h Interfaces/mitkIDataNodeReader.h IO/mitkPixelTypeTraits.h DataManagement/mitkCommon.h Interactions/mitkEventMapperAddOn.h ) -SET(CPP_FILES +set(CPP_FILES Algorithms/mitkBaseDataSource.cpp Algorithms/mitkBaseProcess.cpp Algorithms/mitkCoreObjectFactoryBase.cpp Algorithms/mitkCoreObjectFactory.cpp Algorithms/mitkDataNodeFactory.cpp Algorithms/mitkDataNodeSource.cpp Algorithms/mitkGeometry2DDataToSurfaceFilter.cpp Algorithms/mitkHistogramGenerator.cpp Algorithms/mitkImageCaster.cpp Algorithms/mitkImageCastPart1.cpp Algorithms/mitkImageCastPart2.cpp Algorithms/mitkImageCastPart3.cpp Algorithms/mitkImageCastPart4.cpp Algorithms/mitkImageChannelSelector.cpp Algorithms/mitkImageSliceSelector.cpp Algorithms/mitkImageSource.cpp Algorithms/mitkImageTimeSelector.cpp Algorithms/mitkImageToImageFilter.cpp Algorithms/mitkPointSetSource.cpp Algorithms/mitkPointSetToPointSetFilter.cpp Algorithms/mitkRGBToRGBACastImageFilter.cpp Algorithms/mitkSubImageSelector.cpp Algorithms/mitkSurfaceSource.cpp Algorithms/mitkSurfaceToSurfaceFilter.cpp Algorithms/mitkUIDGenerator.cpp Algorithms/mitkVolumeCalculator.cpp Algorithms/mitkClippedSurfaceBoundsCalculator.cpp Controllers/mitkBaseController.cpp Controllers/mitkCallbackFromGUIThread.cpp Controllers/mitkCameraController.cpp Controllers/mitkCameraRotationController.cpp Controllers/mitkCoreActivator.cpp Controllers/mitkFocusManager.cpp Controllers/mitkLimitedLinearUndo.cpp Controllers/mitkOperationEvent.cpp Controllers/mitkPlanePositionManager.cpp Controllers/mitkProgressBar.cpp Controllers/mitkRenderingManager.cpp Controllers/mitkSliceNavigationController.cpp Controllers/mitkSlicesCoordinator.cpp Controllers/mitkSlicesRotator.cpp Controllers/mitkSlicesSwiveller.cpp Controllers/mitkStatusBar.cpp Controllers/mitkStepper.cpp Controllers/mitkTestManager.cpp Controllers/mitkUndoController.cpp Controllers/mitkVerboseLimitedLinearUndo.cpp Controllers/mitkVtkInteractorCameraController.cpp Controllers/mitkVtkLayerController.cpp DataManagement/mitkAbstractTransformGeometry.cpp DataManagement/mitkAnnotationProperty.cpp DataManagement/mitkApplicationCursor.cpp DataManagement/mitkBaseData.cpp DataManagement/mitkBaseProperty.cpp DataManagement/mitkClippingProperty.cpp DataManagement/mitkChannelDescriptor.cpp DataManagement/mitkColorProperty.cpp DataManagement/mitkDataStorage.cpp #DataManagement/mitkDataTree.cpp DataManagement/mitkDataNode.cpp #DataManagement/mitkDataTreeStorage.cpp DataManagement/mitkDisplayGeometry.cpp DataManagement/mitkEnumerationProperty.cpp DataManagement/mitkGeometry2D.cpp DataManagement/mitkGeometry2DData.cpp DataManagement/mitkGeometry3D.cpp DataManagement/mitkGeometryData.cpp DataManagement/mitkGroupTagProperty.cpp DataManagement/mitkImage.cpp DataManagement/mitkImageDataItem.cpp DataManagement/mitkImageDescriptor.cpp DataManagement/mitkImageStatisticsHolder.cpp DataManagement/mitkLandmarkBasedCurvedGeometry.cpp DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.cpp DataManagement/mitkLandmarkProjector.cpp DataManagement/mitkLevelWindow.cpp DataManagement/mitkLevelWindowManager.cpp DataManagement/mitkLevelWindowPreset.cpp DataManagement/mitkLevelWindowProperty.cpp DataManagement/mitkLookupTable.cpp DataManagement/mitkLookupTables.cpp # specializations of GenericLookupTable DataManagement/mitkMemoryUtilities.cpp DataManagement/mitkModalityProperty.cpp DataManagement/mitkModeOperation.cpp DataManagement/mitkNodePredicateAnd.cpp DataManagement/mitkNodePredicateBase.cpp DataManagement/mitkNodePredicateCompositeBase.cpp DataManagement/mitkNodePredicateData.cpp DataManagement/mitkNodePredicateDataType.cpp DataManagement/mitkNodePredicateDimension.cpp DataManagement/mitkNodePredicateFirstLevel.cpp DataManagement/mitkNodePredicateNot.cpp DataManagement/mitkNodePredicateOr.cpp DataManagement/mitkNodePredicateProperty.cpp DataManagement/mitkNodePredicateSource.cpp DataManagement/mitkPlaneOrientationProperty.cpp DataManagement/mitkPlaneGeometry.cpp DataManagement/mitkPlaneOperation.cpp DataManagement/mitkPointOperation.cpp DataManagement/mitkPointSet.cpp DataManagement/mitkProperties.cpp DataManagement/mitkPropertyList.cpp DataManagement/mitkRestorePlanePositionOperation.cpp DataManagement/mitkRotationOperation.cpp DataManagement/mitkSlicedData.cpp DataManagement/mitkSlicedGeometry3D.cpp DataManagement/mitkSmartPointerProperty.cpp DataManagement/mitkStandaloneDataStorage.cpp DataManagement/mitkStateTransitionOperation.cpp DataManagement/mitkStringProperty.cpp DataManagement/mitkSurface.cpp DataManagement/mitkSurfaceOperation.cpp DataManagement/mitkThinPlateSplineCurvedGeometry.cpp DataManagement/mitkTimeSlicedGeometry.cpp DataManagement/mitkTransferFunction.cpp DataManagement/mitkTransferFunctionProperty.cpp DataManagement/mitkTransferFunctionInitializer.cpp DataManagement/mitkVector.cpp DataManagement/mitkVtkInterpolationProperty.cpp DataManagement/mitkVtkRepresentationProperty.cpp DataManagement/mitkVtkResliceInterpolationProperty.cpp DataManagement/mitkVtkScalarModeProperty.cpp DataManagement/mitkVtkVolumeRenderingProperty.cpp DataManagement/mitkWeakPointerProperty.cpp DataManagement/mitkShaderProperty.cpp DataManagement/mitkResliceMethodProperty.cpp DataManagement/mitkMaterial.cpp Interactions/mitkAction.cpp Interactions/mitkAffineInteractor.cpp Interactions/mitkCoordinateSupplier.cpp Interactions/mitkDisplayCoordinateOperation.cpp Interactions/mitkDisplayInteractor.cpp Interactions/mitkDisplayPositionEvent.cpp Interactions/mitkDisplayVectorInteractor.cpp Interactions/mitkDisplayVectorInteractorLevelWindow.cpp Interactions/mitkDisplayVectorInteractorScroll.cpp Interactions/mitkEvent.cpp Interactions/mitkEventDescription.cpp Interactions/mitkEventMapper.cpp Interactions/mitkGlobalInteraction.cpp Interactions/mitkInteractor.cpp Interactions/mitkMouseModeSwitcher.cpp Interactions/mitkMouseMovePointSetInteractor.cpp Interactions/mitkMoveSurfaceInteractor.cpp Interactions/mitkNodeDepententPointSetInteractor.cpp Interactions/mitkPointSetInteractor.cpp Interactions/mitkPositionEvent.cpp Interactions/mitkPositionTracker.cpp Interactions/mitkState.cpp Interactions/mitkStateEvent.cpp Interactions/mitkStateMachine.cpp Interactions/mitkStateMachineFactory.cpp Interactions/mitkTransition.cpp Interactions/mitkWheelEvent.cpp Interactions/mitkKeyEvent.cpp Interactions/mitkVtkEventAdapter.cpp Interactions/mitkVtkInteractorStyle.cxx Interactions/mitkCrosshairPositionEvent.cpp IO/mitkBaseDataIOFactory.cpp IO/mitkCoreDataNodeReader.cpp IO/mitkDicomSeriesReader.cpp IO/mitkFileReader.cpp IO/mitkFileSeriesReader.cpp IO/mitkFileWriter.cpp #IO/mitkIpPicGet.c IO/mitkImageGenerator.cpp IO/mitkImageWriter.cpp IO/mitkImageWriterFactory.cpp IO/mitkItkImageFileIOFactory.cpp IO/mitkItkImageFileReader.cpp IO/mitkItkPictureWrite.cpp IO/mitkIOUtil.cpp IO/mitkLookupTableProperty.cpp IO/mitkOperation.cpp #IO/mitkPicFileIOFactory.cpp #IO/mitkPicFileReader.cpp #IO/mitkPicFileWriter.cpp #IO/mitkPicHelper.cpp #IO/mitkPicVolumeTimeSeriesIOFactory.cpp #IO/mitkPicVolumeTimeSeriesReader.cpp IO/mitkPixelType.cpp IO/mitkPointSetIOFactory.cpp IO/mitkPointSetReader.cpp IO/mitkPointSetWriter.cpp IO/mitkPointSetWriterFactory.cpp IO/mitkRawImageFileReader.cpp IO/mitkStandardFileLocations.cpp IO/mitkSTLFileIOFactory.cpp IO/mitkSTLFileReader.cpp IO/mitkSurfaceVtkWriter.cpp IO/mitkSurfaceVtkWriterFactory.cpp IO/mitkVtiFileIOFactory.cpp IO/mitkVtiFileReader.cpp IO/mitkVtkImageIOFactory.cpp IO/mitkVtkImageReader.cpp IO/mitkVtkSurfaceIOFactory.cpp IO/mitkVtkSurfaceReader.cpp IO/vtkPointSetXMLParser.cpp IO/mitkLog.cpp Rendering/mitkBaseRenderer.cpp Rendering/mitkVtkMapper2D.cpp Rendering/mitkVtkMapper3D.cpp Rendering/mitkRenderWindowFrame.cpp Rendering/mitkGeometry2DDataMapper2D.cpp Rendering/mitkGeometry2DDataVtkMapper3D.cpp Rendering/mitkGLMapper2D.cpp Rendering/mitkGradientBackground.cpp Rendering/mitkManufacturerLogo.cpp Rendering/mitkMapper2D.cpp Rendering/mitkMapper3D.cpp Rendering/mitkMapper.cpp Rendering/mitkPointSetGLMapper2D.cpp Rendering/mitkPointSetVtkMapper3D.cpp Rendering/mitkPolyDataGLMapper2D.cpp Rendering/mitkSurfaceGLMapper2D.cpp Rendering/mitkSurfaceVtkMapper3D.cpp Rendering/mitkVolumeDataVtkMapper3D.cpp Rendering/mitkVtkPropRenderer.cpp Rendering/mitkVtkWidgetRendering.cpp Rendering/vtkMitkRectangleProp.cpp Rendering/vtkMitkRenderProp.cpp Rendering/mitkVtkEventProvider.cpp Rendering/mitkRenderWindow.cpp Rendering/mitkRenderWindowBase.cpp Rendering/mitkShaderRepository.cpp Rendering/mitkImageVtkMapper2D.cpp Rendering/vtkMitkThickSlicesFilter.cpp Rendering/vtkMitkApplyLevelWindowToRGBFilter.cpp ) list(APPEND CPP_FILES ${CppMicroServices_SOURCES}) diff --git a/Documentation/CMakeLists.txt b/Documentation/CMakeLists.txt index e450f2ac2a..9ea907bf5a 100644 --- a/Documentation/CMakeLists.txt +++ b/Documentation/CMakeLists.txt @@ -1,175 +1,175 @@ # # Variables: # MITK_DOXYGEN_OUTPUT_DIR: doxygen output directory (optional) # Compile source code snippets #add_subdirectory(Snippets) -FIND_PACKAGE(Doxygen) +find_package(Doxygen) -IF(DOXYGEN_FOUND) +if(DOXYGEN_FOUND) -OPTION(USE_DOT "Use dot program for generating graphical class diagrams with doxygen, if available" ON) -OPTION(MITK_DOXYGEN_BUILD_ALWAYS "Always build the MITK documentation when building the default target" OFF) -OPTION(MITK_DOXYGEN_GENERATE_QCH_FILES "Use doxygen to generate Qt compressed help files for MITK docs" OFF) -MARK_AS_ADVANCED(USE_DOT MITK_DOXYGEN_BUILD_ALWAYS MITK_DOXYGEN_GENERATE_QCH_FILES) +option(USE_DOT "Use dot program for generating graphical class diagrams with doxygen, if available" ON) +option(MITK_DOXYGEN_BUILD_ALWAYS "Always build the MITK documentation when building the default target" OFF) +option(MITK_DOXYGEN_GENERATE_QCH_FILES "Use doxygen to generate Qt compressed help files for MITK docs" OFF) +mark_as_advanced(USE_DOT MITK_DOXYGEN_BUILD_ALWAYS MITK_DOXYGEN_GENERATE_QCH_FILES) -SET(HAVE_DOT "NO") -IF(DOXYGEN_DOT_EXECUTABLE AND USE_DOT) - SET(HAVE_DOT "YES") -ENDIF() +set(HAVE_DOT "NO") +if(DOXYGEN_DOT_EXECUTABLE AND USE_DOT) + set(HAVE_DOT "YES") +endif() -SET(MITK_DOXYGEN_OUTPUT_DIR ${PROJECT_BINARY_DIR}/Documentation/Doxygen CACHE PATH "Output directory for doxygen generated documentation." ) -SET(MITK_DOXYGEN_TAGFILE_NAME ${MITK_DOXYGEN_OUTPUT_DIR}/MITK.tag CACHE INTERNAL "MITK Doxygen tag file") +set(MITK_DOXYGEN_OUTPUT_DIR ${PROJECT_BINARY_DIR}/Documentation/Doxygen CACHE PATH "Output directory for doxygen generated documentation." ) +set(MITK_DOXYGEN_TAGFILE_NAME ${MITK_DOXYGEN_OUTPUT_DIR}/MITK.tag CACHE INTERNAL "MITK Doxygen tag file") # This is relative to the working directory of the doxygen command -SET(MITK_DOXYGEN_STYLESHEET mitk_doxygen.css) -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${MITK_DOXYGEN_STYLESHEET} +set(MITK_DOXYGEN_STYLESHEET mitk_doxygen.css) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${MITK_DOXYGEN_STYLESHEET} ${CMAKE_CURRENT_BINARY_DIR}/${MITK_DOXYGEN_STYLESHEET} @COPYONLY) # Create QCH files for MITK and external projects -SET(MITK_DOXYGEN_GENERATE_QHP "NO") -IF(MITK_DOXYGEN_GENERATE_QCH_FILES) +set(MITK_DOXYGEN_GENERATE_QHP "NO") +if(MITK_DOXYGEN_GENERATE_QCH_FILES) - FIND_PROGRAM(QT_HELPGENERATOR_EXECUTABLE + find_program(QT_HELPGENERATOR_EXECUTABLE NAMES qhelpgenerator qhelpgenerator-qt4 qhelpgenerator4 PATHS ${QT_BINARY_DIR} DOC "The location of the the Qt help generator executable" NO_DEFAULT_PATH ) - MARK_AS_ADVANCED(QT_HELPGENERATOR_EXECUTABLE) + mark_as_advanced(QT_HELPGENERATOR_EXECUTABLE) - IF(NOT QT_HELPGENERATOR_EXECUTABLE) - MESSAGE(SEND_ERROR "The Qt help generator could not be found. Disabling qch generation") - ELSE() - SET(MITK_DOXYGEN_GENERATE_QHP "YES") - ENDIF() + if(NOT QT_HELPGENERATOR_EXECUTABLE) + message(SEND_ERROR "The Qt help generator could not be found. Disabling qch generation") + else() + set(MITK_DOXYGEN_GENERATE_QHP "YES") + endif() # The name of the generated MITK qch file, relative to the # Doxygen HTML output folder - SET(MITK_DOXYGEN_QCH_FILE "${MITK_BINARY_DIR}/MITK-${MITK_REVISION_ID}.qch") + set(MITK_DOXYGEN_QCH_FILE "${MITK_BINARY_DIR}/MITK-${MITK_REVISION_ID}.qch") # Generating ITK and VTK docs it not done yet - #OPTION(MITK_DOXYGEN_GENERATE_VTK_QCH_FILE "Use doxygen to generate a Qt compressed help file for VTK docs" OFF) - #OPTION(MITK_DOXYGEN_GENERATE_ITK_QCH_FILE "Use doxygen to generate a Qt compressed help file for ITK docs" OFF) - #MARK_AS_ADVANCED(MITK_DOXYGEN_GENERATE_VTK_QCH_FILE MITK_DOXYGEN_GENERATE_ITK_QCH_FILE) + #option(MITK_DOXYGEN_GENERATE_VTK_QCH_FILE "Use doxygen to generate a Qt compressed help file for VTK docs" OFF) + #option(MITK_DOXYGEN_GENERATE_ITK_QCH_FILE "Use doxygen to generate a Qt compressed help file for ITK docs" OFF) + #mark_as_advanced(MITK_DOXYGEN_GENERATE_VTK_QCH_FILE MITK_DOXYGEN_GENERATE_ITK_QCH_FILE) -ENDIF() +endif() -IF(MITK_USE_BLUEBERRY) - FILE(RELATIVE_PATH _blueberry_doxygen_path ${MITK_DOXYGEN_OUTPUT_DIR}/html ${BLUEBERRY_DOXYGEN_OUTPUT_DIR}/html) - SET(BLUEBERRY_DOXYGEN_TAGFILE "${BLUEBERRY_DOXYGEN_TAGFILE_NAME}=${_blueberry_doxygen_path}") - SET(BLUEBERRY_DOXYGEN_LINK "BlueBerry Documentation") - SET(MITK_XP_LINK "\\ref mitkExtPointsIndex") - CONFIGURE_FILE(schema.css ${MITK_DOXYGEN_OUTPUT_DIR}/html/schema.css) +if(MITK_USE_BLUEBERRY) + file(RELATIVE_PATH _blueberry_doxygen_path ${MITK_DOXYGEN_OUTPUT_DIR}/html ${BLUEBERRY_DOXYGEN_OUTPUT_DIR}/html) + set(BLUEBERRY_DOXYGEN_TAGFILE "${BLUEBERRY_DOXYGEN_TAGFILE_NAME}=${_blueberry_doxygen_path}") + set(BLUEBERRY_DOXYGEN_LINK "BlueBerry Documentation") + set(MITK_XP_LINK "\\ref mitkExtPointsIndex") + configure_file(schema.css ${MITK_DOXYGEN_OUTPUT_DIR}/html/schema.css) - SET(MITK_DOXYGEN_ENABLED_SECTIONS "${MITK_DOXYGEN_ENABLED_SECTIONS} BLUEBERRY") -ENDIF(MITK_USE_BLUEBERRY) + set(MITK_DOXYGEN_ENABLED_SECTIONS "${MITK_DOXYGEN_ENABLED_SECTIONS} BLUEBERRY") +endif(MITK_USE_BLUEBERRY) # Compile a doxygen input filter for processing CMake scripts -INCLUDE(mitkFunctionCMakeDoxygenFilterCompile) +include(mitkFunctionCMakeDoxygenFilterCompile) mitkFunctionCMakeDoxygenFilterCompile(NAMESPACE "CMake") # Configure some doxygen options -IF(NOT MITK_DOXYGEN_INTERNAL_DOCS) - SET(MITK_DOXYGEN_INTERNAL_DOCS "NO") - SET(MITK_DOXYGEN_HIDE_FRIEND_COMPOUNDS "YES") - SET(MITK_DOXYGEN_EXCLUDE_PATTERNS "*_p.* *Private.h */internal/*") -ELSE() - SET(MITK_DOXYGEN_HIDE_FRIEND_COMPOUNDS "NO") - SET(MITK_DOXYGEN_EXCLUDE_PATTERNS "") -ENDIF() - -IF(NOT MITK_DOXYGEN_GENERATE_TODOLIST) - SET(MITK_DOXYGEN_GENERATE_TODOLIST "NO") -ENDIF() - -IF(NOT MITK_DOXYGEN_GENERATE_BUGLIST) - SET(MITK_DOXYGEN_GENERATE_BUGLIST "NO") -ENDIF() - -IF(NOT MITK_DOXYGEN_HTML_DYNAMIC_SECTIONS) - SET(MITK_DOXYGEN_HTML_DYNAMIC_SECTIONS "NO") -ENDIF() - -IF(NOT MITK_DOXYGEN_UML_LOOK) - SET(MITK_DOXYGEN_UML_LOOK "NO") -ENDIF() - -IF(NOT MITK_DOXYGEN_GENERATE_DEPRECATEDLIST) - SET(MITK_DOXYGEN_GENERATE_DEPRECATEDLIST "YES") -ENDIF() - -IF(NOT DEFINED MITK_DOXYGEN_DOT_NUM_THREADS) - SET(MITK_DOXYGEN_DOT_NUM_THREADS 0) -ENDIF() - -CONFIGURE_FILE(Doxygen/MainPage.dox.in +if(NOT MITK_DOXYGEN_INTERNAL_DOCS) + set(MITK_DOXYGEN_INTERNAL_DOCS "NO") + set(MITK_DOXYGEN_HIDE_FRIEND_COMPOUNDS "YES") + set(MITK_DOXYGEN_EXCLUDE_PATTERNS "*_p.* *Private.h */internal/*") +else() + set(MITK_DOXYGEN_HIDE_FRIEND_COMPOUNDS "NO") + set(MITK_DOXYGEN_EXCLUDE_PATTERNS "") +endif() + +if(NOT MITK_DOXYGEN_GENERATE_TODOLIST) + set(MITK_DOXYGEN_GENERATE_TODOLIST "NO") +endif() + +if(NOT MITK_DOXYGEN_GENERATE_BUGLIST) + set(MITK_DOXYGEN_GENERATE_BUGLIST "NO") +endif() + +if(NOT MITK_DOXYGEN_HTML_DYNAMIC_SECTIONS) + set(MITK_DOXYGEN_HTML_DYNAMIC_SECTIONS "NO") +endif() + +if(NOT MITK_DOXYGEN_UML_LOOK) + set(MITK_DOXYGEN_UML_LOOK "NO") +endif() + +if(NOT MITK_DOXYGEN_GENERATE_DEPRECATEDLIST) + set(MITK_DOXYGEN_GENERATE_DEPRECATEDLIST "YES") +endif() + +if(NOT DEFINED MITK_DOXYGEN_DOT_NUM_THREADS) + set(MITK_DOXYGEN_DOT_NUM_THREADS 0) +endif() + +configure_file(Doxygen/MainPage.dox.in ${CMAKE_CURRENT_BINARY_DIR}/Doxygen/MainPage.dox) -CONFIGURE_FILE(doxygen.conf.in +configure_file(doxygen.conf.in ${CMAKE_CURRENT_BINARY_DIR}/doxygen.conf) -IF(MITK_DOXYGEN_BUILD_ALWAYS) - SET(_doc_in_all "ALL") -ELSE() - SET(_doc_in_all "") -ENDIF() +if(MITK_DOXYGEN_BUILD_ALWAYS) + set(_doc_in_all "ALL") +else() + set(_doc_in_all "") +endif() -ADD_CUSTOM_TARGET(doc ${_doc_in_all} +add_custom_target(doc ${_doc_in_all} ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.conf WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) -IF (MITK_USE_BLUEBERRY) +if(MITK_USE_BLUEBERRY) # convert the extension points schema files into html - FIND_PACKAGE(Ant) - IF(ANT_FOUND AND BLUEBERRY_DOC_TOOLS_DIR) + find_package(Ant) + if(ANT_FOUND AND BLUEBERRY_DOC_TOOLS_DIR) - LIST(APPEND MITK_XP_GLOB_EXPRESSIONS + list(APPEND MITK_XP_GLOB_EXPRESSIONS ${MITK_SOURCE_DIR}/CoreUI/Bundles/plugin.xml ${MITK_SOURCE_DIR}/Modules/Bundles/plugin.xml) - FILE(GLOB_RECURSE _plugin_xmls ${MITK_XP_GLOB_EXPRESSIONS}) + file(GLOB_RECURSE _plugin_xmls ${MITK_XP_GLOB_EXPRESSIONS}) MACRO_CONVERT_SCHEMA(INPUT ${_plugin_xmls} OUTPUT_DIR "${MITK_DOXYGEN_OUTPUT_DIR}/html/extension-points/html" TARGET_NAME mitkXPDoc ) - ADD_DEPENDENCIES(doc mitkXPDoc) - IF(${PROJECT_NAME} STREQUAL "MITK") - ADD_DEPENDENCIES(doc BlueBerryDoc) - ENDIF() - ENDIF(ANT_FOUND AND BLUEBERRY_DOC_TOOLS_DIR) -ENDIF (MITK_USE_BLUEBERRY) + add_dependencies(doc mitkXPDoc) + if(${PROJECT_NAME} STREQUAL "MITK") + add_dependencies(doc BlueBerryDoc) + endif() + endif(ANT_FOUND AND BLUEBERRY_DOC_TOOLS_DIR) +endif(MITK_USE_BLUEBERRY) -#IF(MITK_DOXYGEN_GENERATE_ITK_QCH_FILE) +#if(MITK_DOXYGEN_GENERATE_ITK_QCH_FILE) # # add the command to generate the ITK documantation -# ADD_CUSTOM_TARGET(doc-itk +# add_custom_target(doc-itk # COMMAND ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.itk.conf) -# ADD_DEPENDENCIES(doc doc-itk) -#ENDIF() +# add_dependencies(doc doc-itk) +#endif() -#IF(MITK_DOXYGEN_GENERATE_VTK_QCH_FILE) +#if(MITK_DOXYGEN_GENERATE_VTK_QCH_FILE) # # add the command to generate the VTK documantation -# ADD_CUSTOM_TARGET(doc-vtk +# add_custom_target(doc-vtk # COMMAND ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.vtk.conf) -# ADD_DEPENDENCIES(doc doc-vtk) -#ENDIF() +# add_dependencies(doc doc-vtk) +#endif() -ELSE(DOXYGEN_FOUND) +else(DOXYGEN_FOUND) # copy blank documentation page to prevent QtHelp from being shown # copy the .qhc and .qch files to $MITK_BIN/mitk/bin/ExtBundles/resources/ -CONFIGURE_FILE(pregenerated/MITKBlankPage.qch +configure_file(pregenerated/MITKBlankPage.qch ${MITK_BINARY_DIR}/bin/ExtBundles/org.mitk.gui.qt.extapplication/resources/MITKBlankPage.qch COPYONLY) -CONFIGURE_FILE(pregenerated/MitkExtQtHelpCollection.qhc +configure_file(pregenerated/MitkExtQtHelpCollection.qhc ${MITK_BINARY_DIR}/bin/ExtBundles/org.mitk.gui.qt.extapplication/resources/MitkExtQtHelpCollection.qhc COPYONLY) -ENDIF(DOXYGEN_FOUND) +endif(DOXYGEN_FOUND) diff --git a/Documentation/Doxygen/BuildInstructions.dox b/Documentation/Doxygen/BuildInstructions.dox index 0b66b5fddf..c08c4275f0 100644 --- a/Documentation/Doxygen/BuildInstructions.dox +++ b/Documentation/Doxygen/BuildInstructions.dox @@ -1,201 +1,201 @@ /** \page BuildInstructionsPage Build Instructions \section BIZero Introduction The MITK build system (which is based on CMake) supports a "superbuild" process, meaning that it will download, configure, and build all required third-party libraries (except Qt) automatically. These instructions will show you how to use the MITK superbuild. \note This page explains explicitly how to build MITK itself. If you want to create your own project based on MITK, the process described below is completely automated. Please see Setup a MITK-based project For more advanced users, the last sections explain how to inject custom build libraries into the superbuild process. \section BIOne Prerequisites You need: -# Git from http://git-scm.com (there are also numerous third-party graphical clients available). We recomment using Git, but see below for a way how to get the current source code without using it. -# CMake (version 2.8.4 or higher) -# Qt 4.x if you plan to develop Qt-based applications (version 4.6 or above is recommended, we cannot guarantee compatibility with lower versions) \section BIQt A note about Qt Nokia provides several binary packages for Qt. You must make sure that the package you download matches your toolchain. On Linux, getting Qt by installing the packages provided by your Linux package manager is the preferred way. On Windows, the Nokia provided binaries are compiled for 32bit architectures. You cannot build your own project for a 64bit machine and use the 32bit Qt libraries. You have two options for a 64bit Qt-based application: -# Download an inofficial 64bit installer, for example here. Note that we cannot offer support for problems with MITK due to the usage of this kind of installers. -# Compile Qt yourself. This is shortly described below. To compile Qt on Windows using Visual Studio, follow the steps below: -# Download the Qt sources and unpack them, e.g. to C:/qt-everywhere-opensource-src-4.7.4 -# Open a Visual Studio command prompt. Make sure to use the appropriate command prompt for either a 32 bit or 64 bit build. Note that Visual Studio Express does not come with 64bit compilers out of the box (the Professional version does). -# Configure Qt by executing the configure.exe command in your Qt source directory. The following configure options will build a Qt compatible with MITK: \verbatim configure.exe -prefix C:\Qt\4.7.4_vc9_x64 -debug-and-release -qt-sql-sqlite -no-multimedia -no-audio-backend -no-phonon -no-phonon-backend -no-declarative -mp -nomake examples -nomake demos -nomake docs \endverbatim -# Build and install the Qt libraries \verbatim nmake nmake install \endverbatim After "nmake install" completed successfully, you may delete your Qt source directory. \section BITwo Get a source tree Since MITK is under active development we recommend to use git to get the most recent version. To make sure you get a stable tree, check the MITK dashboard before checking out. If the build tree is not clean, you can specify an older revision for the checkout or get a stable tar ball from www.mitk.org. If you don't want to use Git, you may also download the current source code (or any other older version) as a tar.gz package by clicking on the snapshot link. You can then skip the clone step below. To clone MITK's current git repository do: \code git clone http://git.mitk.org/MITK.git \endcode \section BIThree Build MITK with CMake Create a new directory for the superbuild binary tree, change to it and call CMake: In the shell (assuming you current directory is the same as the one where you issued the git clone command): \code mkdir MITK-superbuild cd MITK-superbuild ccmake ../MITK \endcode If you use Windows, then you just start the CMake GUI and enter the location of the source and of the binary tree, choose a suitable generator and configure the project. CMake will present you a couple of options, these are the most important ones: - MITK_USE_BLUEBERRY Build the BlueBerry application framework - MITK_USE_Boost Build MITK code which depends on Boost (this will download Boost 1.45.0) - MITK_USE_Boost_LIBRARIES If you need binary Boost libraries, specify them here. - MITK_USE_OpenCV Build MITK code which depends on OpenCV (this will download and build OpenCV 2.3) - MITK_USE_Python Enables Python wrapping in MITK. This will also configure ITK, VTK, and OpenCV (if enabled) to build Python wrappers. - MITK_USE_QT Build MITK code which depends on Qt - QT_QMAKE_EXECUTABLE The path to the qmake executable of your Qt installation If you are satisfied with the configuration of your MITK superbuild, generate the project files with CMake by pressing "Generate". Linux users usually just enter "make" (optionally supplying the number threads to be used for a parallel build): \code make -j4 \endcode Windows users using Visual Studio can open the generated MITK-superbuild.sln solution file in the MITK-superbuild directory and start the build by building the BUILD_ALL project. \section BIFour Customize your MITK superbuild The MITK superbuild configured MITK with all needed external libraries. The build directories of these libraries, and of MITK itself are located inside the MITK-superbuild directory. For example, the directory layout may look like: \code MITK-superbuild |- ITK-build |- VTK-build |- MITK-build \endcode To change the configuration of the MITK build, choose the MITK-build directory as the binary directory in the CMake GUI. After generating the project files, build the MITK project by either issuing "make" in the MITK-build directory (Linux), or by opening MITK-build/MITK.sln and building the project with Visual Studio. You may also change the configuration of any project configured via the superbuild process. Make sure to also build the changed project and also the projects which depend on it. \section BIFive Running Applications On Linux, just execute the application you want to run. MITK executables are located in MITK-superbuild/MITK-build/bin On Windows, the PATH environment variable must contain the directories containging third-party libraries. The MITK build system generated Windows Batch files in the MITK-build directory which set up a correct environment and opens the appropriate Visual Studio solution file. Use (and maybe modify/enhance) these Batch files to be able to start and debug MITK applications from inside Visual Studio. \section BISix Documentation If you have the Doxygen documentation tool installed, you get a new project (Visual Studio) or "make" target named "doc". You can build this to generate the HTML documentation of MITK in the Documentation/Doxygen directory of your MITK-build binary tree or in the MITK_DOXYGEN_OUTPUT_DIR CMake variable (if specified). \section BISeven Extend MITK on your own (using the application framework BlueBerry) \ref NewPluginPage \section BIEight Use MITK in your own project (as a toolkit) In the MITK-build binary tree the MITKConfig.cmake file is generated. You can include it in your own project with -FIND_PACKAGE(MITK) +find_package(MITK) On Windows you also need -FIND_PACKAGE(ITK) -FIND_PACKAGE(VTK) +find_package(ITK) +find_package(VTK) to get the library dependencies right. After that you can set your include path with -INCLUDE_DIRECTORIES(${QMITK_INCLUDE_DIRS}) +include_directories(${QMITK_INCLUDE_DIRS}) and create an application: -LINK_DIRECTORIES(${MITK_LINK_DIRECTORIES}) -ADD_EXECUTABLE(MyApp MyApp.cpp) -TARGET_LINK_LIBRARIES(Step1 ${QMITK_LIBRARIES}) +link_directories(${MITK_LINK_DIRECTORIES}) +add_executable(MyApp MyApp.cpp) +target_link_libraries(Step1 ${QMITK_LIBRARIES}) \note IMPORTANT: do not include the ITK_USE_FILE in your project when using MITK. There's a conflict in the ITK and MITK tree classes which will be resolved soon. \section BINine Superbuild Customization You can inject pre-build third-party libraries into the MITK superbuild by setting certain CMake variables before the first configure step. MITK will then use these third-party libraries instead of downloading and building them itself. Note you must take care to configure those libraries with all options MITK requires. The variables listed below are provided for injecting third-party libraries. Their occurrence in the CMake GUI or in ccmake may depend on specific MITK_USE_* options set to ON. You may also use the variable names below without the EXTERNAL_ prefix, for example when providing their values on a command line call to CMake. - EXTERNAL_BOOST_ROOT Set this variable to your custom Boost installation - EXTERNAL_CTK_DIR Set this variable to your CTK binary tree (the directory containing the CTKConfig.cmake file) - EXTERNAL_CableSwig_DIR Set this variable to your CableSwig binary tree for Python wrapping (the directory containing the CableSwigConfig.cmake file) - EXTERNAL_DCMTK_DIR Set this variable to your DCMTK binary tree (the directory containing the DCMTKConfig.cmake file) - EXTERNAL_GDCM_DIR Set this variable to your GDCM binary tree (the directory containing the GDCMConfig.cmake file) - EXTERNAL_ITK_DIR Set this variable to your ITK binary tree (the directory containing the ITKConfig.cmake file) - EXTERNAL_OpenCV_DIR Set this variable to your OpenCV binary tree (the directory containing the OpenCVConfig.cmake file) - EXTERNAL_VTK_DIR Set this variable to your VTK binary tree (the directory containing the VTKConfig.cmake file) To set CMake options before the first configure step is invoked, supply them on the command line, i.e. \code ccmake -DITK_DIR:PATH=/opt/ITK-release ../MITK \endcode See the following link for more information about how to configure third-party libraries: \subpage BuildToolkits "How to build ITK, VTK and QT" */ diff --git a/Documentation/Doxygen/RenderingTests.dox b/Documentation/Doxygen/RenderingTests.dox index 74a63b4a7a..89695ba0ea 100644 --- a/Documentation/Doxygen/RenderingTests.dox +++ b/Documentation/Doxygen/RenderingTests.dox @@ -1,97 +1,97 @@ namespace mitk{ /** \page RenderingTests Automatic Rendering Tests Available sections: -# \ref WhatIsARenderingTest "What is an automatic rendering test?" -# \ref HowToCreateATest "How to create a rendering test" \section WhatIsARenderingTest What is an automatic rendering test? An automatic rendering test is a powerful tool to test rendering results automatically via dashboard. Regarding rendering lots of different sources influence the output on the screen (e.g. different mappers, renderes, camera settings or the algorithm creating the data). Thus, during the rendering process of an image many different classes are involved and can have impact on the output. A minor change in an important class (e.g. mitkVtkPropRenderer) can have major impact on the actual rendering. An automatic rendering test takes an arbitrary object as input (e.g. image, surface, point set), renders this into an mitkRenderWindow, makes a screen shot of that renderwindow and finally compares that screen shot to a given reference. Of course, the reference has to be defined by the user. Internally, a VTK test method is used to compare both screen shots and measure differences. In case of failure, a difference can be generated to show exactly which pixels are rendered incorrectly. Implementing automatic rendering tests for algorithms ensures that algorithms deliver the same output as they used to do in previous version of MITK. \section HowToCreateATest How to create your own automatic rendering test To create an automatic rendering test you should use an existing test as example (e.g. mitkImageVtkMapper2DTest). 1. Adding the test to CMake Like adding any test with parameters to CMake, you have to add a custom test to the files.cmake and the corresponding CMakeLists.txt: For instance a test for the mitkImageVtkMapper2D has to be added like this: files.cmake \code -SET(MODULE_CUSTOM_TESTS +set(MODULE_CUSTOM_TESTS ... mitkImageVtkMapper2D.cpp ) \endcode CMakeLists.txt \code mitkAddCustomModuleTest(mitkImageVtkMapper2D_rgbaImage640x480 mitkImageVtkMapper2D #custom name of the test and executable ${MITK_DATA_DIR}/RenderingTestData/rgbaImage.png #input image to load in data storage -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/rgbaImage640x480REF.png #corresponding reference screenshot ) \endcode The first parameter defines a name for the test on the dashboard. This is a feature to distinguish between tests with different inputs. In this example the test is named mitkImageVtkMapper2D_rgbaImage640x480 to show that this test is using the test image rbgaImage640x480 as input. The next parameters sets test name (i.e. the name of the test class). Here: mitkImageVtkMapper2D. The next parameter(s) are used to pass the input to the test. For instance, it is possible to set multiple objects as input for a test (e.g. /path/to/img1.jpg /path/to/img2.pic /path/to/pointset.mps). All test data for core tests should be placed into the MITK-DATA repository inside the folder: ${MITK_DATA_DIR}/RenderingTestData/ It is possible to create another folders for other modules/bundles. The option -V defines the path to the reference screen shot and is internally used by VTK. The reference screen shot is highly important and has to be triple-checked if is correct!!! The mitkRenderingTestHelper offers means to capture a screen shot of a renderwindow. Capturing a reference screen shot should happen just once and NOT be a permanent part of the test. It is also possible to set the option -T /path/to/directory/. This option is internally used by VTK to save a difference image. This is meant for debugging and should not be used on the dashboard. 2. Coding the test Writing the test code is pretty straight forward. In the example of the mitkImageVtkMapper2DTest the input parameters are added to a datastorage and rendered into a render window via the mitkRenderingTestHelper. Last, the vtkTesting macro is called to compare the given reference to the data rendered in the renderwindow: \code int retVal = vtkRegressionTestImage( renderingHelper.GetVtkRenderWindow() ); //retVal meanings: (see VTK/Rendering/vtkTesting.h) //0 = test failed //1 = test passed //2 = test not run //3 = something with vtkInteraction MITK_TEST_CONDITION( retVal == 1, "VTK test result positive" ); \endcode If the content of the previously filled renderwindow does not equal the reference, the test will fail. Feel free to modify the data before rendering. E.g. create a surface from the loaded image and render that surface afterwards or add compute QBalls for an image and render those. Happy testing! */ } diff --git a/MITKCPackOptions.cmake.in b/MITKCPackOptions.cmake.in index 5c8a6372bc..c4aabcee3d 100644 --- a/MITKCPackOptions.cmake.in +++ b/MITKCPackOptions.cmake.in @@ -1,31 +1,31 @@ if(CPACK_GENERATOR MATCHES "NSIS") # set the package header icon for MUI - SET(CPACK_PACKAGE_ICON "@MITK_SOURCE_DIR@\\mitk.bmp") + set(CPACK_PACKAGE_ICON "@MITK_SOURCE_DIR@\\mitk.bmp") # set the install/unistall icon used for the installer itself # There is a bug in NSIS that does not handle full unix paths properly. - SET(CPACK_NSIS_MUI_ICON "@MITK_SOURCE_DIR@\\mitk.ico") - SET(CPACK_NSIS_MUI_UNIICON "@MITK_SOURCE_DIR@\\mitk.ico") + set(CPACK_NSIS_MUI_ICON "@MITK_SOURCE_DIR@\\mitk.ico") + set(CPACK_NSIS_MUI_UNIICON "@MITK_SOURCE_DIR@\\mitk.ico") - SET(CPACK_NSIS_DISPLAY_NAME "MITK - Medical Imaging and Interaction Toolkit") + set(CPACK_NSIS_DISPLAY_NAME "MITK - Medical Imaging and Interaction Toolkit") # tell cpack to create links to the doc files - SET(CPACK_NSIS_MENU_LINKS + set(CPACK_NSIS_MENU_LINKS "http://www.mitk.org" "MITK Web Site" ) # tell cpack the executables you want in the start menu as links - SET(CPACK_PACKAGE_EXECUTABLES "@MITK_CPACK_PACKAGE_EXECUTABLES@") + set(CPACK_PACKAGE_EXECUTABLES "@MITK_CPACK_PACKAGE_EXECUTABLES@") # tell cpack to create a desktop link to MainApp - SET(CPACK_CREATE_DESKTOP_LINKS "@CPACK_CREATE_DESKTOP_LINKS@") - SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\mitk.ico") - SET(CPACK_NSIS_HELP_LINK "http:\\\\www.mitk.org") - SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\www.mitk.org") - SET(CPACK_NSIS_CONTACT mitk@mitk.org) - SET(CPACK_NSIS_MODIFY_PATH ON) + set(CPACK_CREATE_DESKTOP_LINKS "@CPACK_CREATE_DESKTOP_LINKS@") + set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\mitk.ico") + set(CPACK_NSIS_HELP_LINK "http:\\\\www.mitk.org") + set(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\www.mitk.org") + set(CPACK_NSIS_CONTACT mitk@mitk.org) + set(CPACK_NSIS_MODIFY_PATH ON) endif(CPACK_GENERATOR MATCHES "NSIS") diff --git a/MITKConfig.cmake.in b/MITKConfig.cmake.in index d159c082f3..7bb210de80 100644 --- a/MITKConfig.cmake.in +++ b/MITKConfig.cmake.in @@ -1,143 +1,143 @@ # Update the CMake module path -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "@MITK_SOURCE_DIR@/CMake") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "@MITK_SOURCE_DIR@/CMake") -SET(CppMicroServices_SOURCE_DIR @MITK_SOURCE_DIR@/Core/Code/CppMicroServices) +set(CppMicroServices_SOURCE_DIR @MITK_SOURCE_DIR@/Core/Code/CppMicroServices) # Include MITK macros include(MacroParseArguments) include(@CppMicroServices_SOURCE_DIR@/CMake/usFunctionGenerateModuleInit.cmake) include(mitkFunctionCheckMitkCompatibility) include(mitkFunctionOrganizeSources) include(mitkFunctionCreateWindowsBatchScript) include(mitkFunctionInstallProvisioningFiles) include(mitkMacroCreateModuleConf) include(mitkMacroCreateModule) include(mitkMacroCheckModule) include(mitkMacroCreateModuleTests) include(mitkFunctionAddCustomModuleTest) include(mitkMacroUseModule) include(mitkMacroMultiplexPicType) include(mitkMacroInstall) include(mitkMacroInstallHelperApp) include(mitkMacroInstallTargets) include(mitkMacroGenerateToolsLibrary) include(mitkMacroCreateCTKPlugin) # The MITK version number -SET(MITK_VERSION_MAJOR "@MITK_VERSION_MAJOR@") -SET(MITK_VERSION_MINOR "@MITK_VERSION_MINOR@") -SET(MITK_VERSION_PATCH "@MITK_VERSION_PATCH@") -SET(MITK_VERSION_STRING "@MITK_VERSION_STRING@") +set(MITK_VERSION_MAJOR "@MITK_VERSION_MAJOR@") +set(MITK_VERSION_MINOR "@MITK_VERSION_MINOR@") +set(MITK_VERSION_PATCH "@MITK_VERSION_PATCH@") +set(MITK_VERSION_STRING "@MITK_VERSION_STRING@") # Internal version numbers, used for approximate compatibility checks # of a MITK development version (non-release). -SET(MITK_VERSION_PLUGIN_SYSTEM 2) # dropped legacy BlueBerry plug-in CMake support +set(MITK_VERSION_PLUGIN_SYSTEM 2) # dropped legacy BlueBerry plug-in CMake support # MITK specific variables -SET(MITK_SOURCE_DIR "@MITK_SOURCE_DIR@") -SET(MITK_BINARY_DIR "@MITK_BINARY_DIR@") -SET(UTILITIES_DIR "@UTILITIES_DIR@") -SET(REGISTER_QFUNCTIONALITY_CPP_IN "@REGISTER_QFUNCTIONALITY_CPP_IN@") -SET(MITK_MODULES_PACKAGE_DEPENDS_DIR "@MITK_MODULES_PACKAGE_DEPENDS_DIR@") -SET(MODULES_PACKAGE_DEPENDS_DIRS "@MODULES_PACKAGE_DEPENDS_DIRS@") -SET(MITK_DOXYGEN_TAGFILE_NAME "@MITK_DOXYGEN_TAGFILE_NAME@") -IF(MODULES_CONF_DIRS) - LIST(APPEND MODULES_CONF_DIRS "@MODULES_CONF_DIRS@") - LIST(REMOVE_DUPLICATES MODULES_CONF_DIRS) -ELSE() - SET(MODULES_CONF_DIRS "@MODULES_CONF_DIRS@") -ENDIF() - -SET(MODULES_CONF_DIRNAME "@MODULES_CONF_DIRNAME@") - -FOREACH(_module @MITK_MODULE_NAMES@) - SET(${_module}_CONFIG_FILE "@MITK_BINARY_DIR@/@MODULES_CONF_DIRNAME@/${_module}Config.cmake") -ENDFOREACH() +set(MITK_SOURCE_DIR "@MITK_SOURCE_DIR@") +set(MITK_BINARY_DIR "@MITK_BINARY_DIR@") +set(UTILITIES_DIR "@UTILITIES_DIR@") +set(REGISTER_QFUNCTIONALITY_CPP_IN "@REGISTER_QFUNCTIONALITY_CPP_IN@") +set(MITK_MODULES_PACKAGE_DEPENDS_DIR "@MITK_MODULES_PACKAGE_DEPENDS_DIR@") +set(MODULES_PACKAGE_DEPENDS_DIRS "@MODULES_PACKAGE_DEPENDS_DIRS@") +set(MITK_DOXYGEN_TAGFILE_NAME "@MITK_DOXYGEN_TAGFILE_NAME@") +if(MODULES_CONF_DIRS) + list(APPEND MODULES_CONF_DIRS "@MODULES_CONF_DIRS@") + list(REMOVE_DUPLICATES MODULES_CONF_DIRS) +else() + set(MODULES_CONF_DIRS "@MODULES_CONF_DIRS@") +endif() + +set(MODULES_CONF_DIRNAME "@MODULES_CONF_DIRNAME@") + +foreach(_module @MITK_MODULE_NAMES@) + set(${_module}_CONFIG_FILE "@MITK_BINARY_DIR@/@MODULES_CONF_DIRNAME@/${_module}Config.cmake") +endforeach() # Include directory variables -SET(MITK_INCLUDE_DIRS "@MITK_INCLUDE_DIRS@") -SET(QMITK_INCLUDE_DIRS "@QMITK_INCLUDE_DIRS@") -SET(ANN_INCLUDE_DIR "@ANN_INCLUDE_DIR@") -SET(IPSEGMENTATION_INCLUDE_DIR "@IPSEGMENTATION_INCLUDE_DIR@") -SET(VECMATH_INCLUDE_DIR "@VECMATH_INCLUDE_DIR@") -SET(IPFUNC_INCLUDE_DIR "@IPFUNC_INCLUDE_DIR@") -SET(MITK_IGT_INCLUDE_DIRS "@MITK_IGT_INCLUDE_DIRS@") +set(MITK_INCLUDE_DIRS "@MITK_INCLUDE_DIRS@") +set(QMITK_INCLUDE_DIRS "@QMITK_INCLUDE_DIRS@") +set(ANN_INCLUDE_DIR "@ANN_INCLUDE_DIR@") +set(IPSEGMENTATION_INCLUDE_DIR "@IPSEGMENTATION_INCLUDE_DIR@") +set(VECMATH_INCLUDE_DIR "@VECMATH_INCLUDE_DIR@") +set(IPFUNC_INCLUDE_DIR "@IPFUNC_INCLUDE_DIR@") +set(MITK_IGT_INCLUDE_DIRS "@MITK_IGT_INCLUDE_DIRS@") # Library variables -SET(MITK_LIBRARIES "@MITK_LIBRARIES@") -SET(QMITK_LIBRARIES "@QMITK_LIBRARIES@") +set(MITK_LIBRARIES "@MITK_LIBRARIES@") +set(QMITK_LIBRARIES "@QMITK_LIBRARIES@") # Link directory variables -SET(MITK_LINK_DIRECTORIES "@MITK_LINK_DIRECTORIES@") -SET(QMITK_LINK_DIRECTORIES "@QMITK_LINK_DIRECTORIES@") -SET(MITK_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@" "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@/plugins") -SET(MITK_VTK_LIBRARY_DIRS "@MITK_VTK_LIBRARY_DIRS@") -SET(MITK_ITK_LIBRARY_DIRS "@MITK_ITK_LIBRARY_DIRS@") +set(MITK_LINK_DIRECTORIES "@MITK_LINK_DIRECTORIES@") +set(QMITK_LINK_DIRECTORIES "@QMITK_LINK_DIRECTORIES@") +set(MITK_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@" "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@/plugins") +set(MITK_VTK_LIBRARY_DIRS "@MITK_VTK_LIBRARY_DIRS@") +set(MITK_ITK_LIBRARY_DIRS "@MITK_ITK_LIBRARY_DIRS@") # External projects -SET(ITK_DIR "@ITK_DIR@") -SET(VTK_DIR "@VTK_DIR@") -SET(DCMTK_DIR "@DCMTK_DIR@") -SET(GDCM_DIR "@GDCM_DIR@") -SET(BOOST_ROOT "@BOOST_ROOT@") -SET(OpenCV_DIR "@OpenCV_DIR@") -SET(MITK_QMAKE_EXECUTABLE "@QT_QMAKE_EXECUTABLE@") -SET(MITK_DATA_DIR "@MITK_DATA_DIR@") -SET(MITK_RUNTIME_PATH "@MITK_RUNTIME_PATH@") +set(ITK_DIR "@ITK_DIR@") +set(VTK_DIR "@VTK_DIR@") +set(DCMTK_DIR "@DCMTK_DIR@") +set(GDCM_DIR "@GDCM_DIR@") +set(BOOST_ROOT "@BOOST_ROOT@") +set(OpenCV_DIR "@OpenCV_DIR@") +set(MITK_QMAKE_EXECUTABLE "@QT_QMAKE_EXECUTABLE@") +set(MITK_DATA_DIR "@MITK_DATA_DIR@") +set(MITK_RUNTIME_PATH "@MITK_RUNTIME_PATH@") # MITK use variables -SET(MITK_USE_QT @MITK_USE_QT@) -SET(MITK_USE_BLUEBERRY @MITK_USE_BLUEBERRY@) -SET(MITK_USE_SYSTEM_Boost @MITK_USE_SYSTEM_Boost@) -SET(MITK_USE_Boost @MITK_USE_Boost@) -SET(MITK_USE_Boost_LIBRARIES @MITK_USE_Boost_LIBRARIES@) -SET(MITK_USE_CTK @MITK_USE_CTK@) -SET(MITK_USE_DCMTK @MITK_USE_DCMTK@) -SET(MITK_USE_OpenCV @MITK_USE_OpenCV@) -SET(MITK_USE_Python @MITK_USE_Python@) +set(MITK_USE_QT @MITK_USE_QT@) +set(MITK_USE_BLUEBERRY @MITK_USE_BLUEBERRY@) +set(MITK_USE_SYSTEM_Boost @MITK_USE_SYSTEM_Boost@) +set(MITK_USE_Boost @MITK_USE_Boost@) +set(MITK_USE_Boost_LIBRARIES @MITK_USE_Boost_LIBRARIES@) +set(MITK_USE_CTK @MITK_USE_CTK@) +set(MITK_USE_DCMTK @MITK_USE_DCMTK@) +set(MITK_USE_OpenCV @MITK_USE_OpenCV@) +set(MITK_USE_Python @MITK_USE_Python@) # There is no PocoConfig.cmake, so we set Poco specific CMake variables -# here. This way the call to FIND_PACKAGE(Poco) in BlueBerryConfig.cmake +# here. This way the call to find_package(Poco) in BlueBerryConfig.cmake # finds the Poco distribution supplied by MITK -SET(Poco_INCLUDE_DIR "@MITK_SOURCE_DIR@/Utilities/Poco") -SET(Poco_LIBRARY_DIR "@MITK_BINARY_DIR@/bin") +set(Poco_INCLUDE_DIR "@MITK_SOURCE_DIR@/Utilities/Poco") +set(Poco_LIBRARY_DIR "@MITK_BINARY_DIR@/bin") -IF(MITK_USE_IGT) - #INCLUDE(${MITK_DIR}/mitkIGTConfig.cmake) -ENDIF() +if(MITK_USE_IGT) + #include(${MITK_DIR}/mitkIGTConfig.cmake) +endif() -IF(NOT MITK_EXPORTS_FILE_INCLUDED) - IF(EXISTS "@MITK_EXPORTS_FILE@") - SET(MITK_EXPORTS_FILE_INCLUDED 1) - INCLUDE("@MITK_EXPORTS_FILE@") - ENDIF(EXISTS "@MITK_EXPORTS_FILE@") -ENDIF() +if(NOT MITK_EXPORTS_FILE_INCLUDED) + if(EXISTS "@MITK_EXPORTS_FILE@") + set(MITK_EXPORTS_FILE_INCLUDED 1) + include("@MITK_EXPORTS_FILE@") + endif(EXISTS "@MITK_EXPORTS_FILE@") +endif() # BlueBerry support -IF(MITK_USE_BLUEBERRY) +if(MITK_USE_BLUEBERRY) - SET(BlueBerry_DIR "@MITK_BINARY_DIR@/BlueBerry") + set(BlueBerry_DIR "@MITK_BINARY_DIR@/BlueBerry") # Don't include the BlueBerry exports file, since the targets are # also exported in the MITK exports file - SET(BB_PLUGIN_EXPORTS_FILE_INCLUDED 1) - FIND_PACKAGE(BlueBerry) - - IF(NOT BlueBerry_FOUND) - MESSAGE(SEND_ERROR "MITK does not seem to be configured with BlueBerry support. Set MITK_USE_BLUEBERRY to ON in your MITK build configuration.") - ENDIF(NOT BlueBerry_FOUND) - - SET(MITK_PLUGIN_USE_FILE @MITK_PLUGIN_USE_FILE@) - IF(MITK_PLUGIN_USE_FILE) - IF(EXISTS ${MITK_PLUGIN_USE_FILE}) - INCLUDE(${MITK_PLUGIN_USE_FILE}) - ENDIF() - ENDIF() - - SET(MITK_PLUGIN_PROVISIONING_FILE "@MITK_EXTAPP_PROVISIONING_FILE@") - SET(MITK_PROVISIONING_FILES + set(BB_PLUGIN_EXPORTS_FILE_INCLUDED 1) + find_package(BlueBerry) + + if(NOT BlueBerry_FOUND) + message(SEND_ERROR "MITK does not seem to be configured with BlueBerry support. Set MITK_USE_BLUEBERRY to ON in your MITK build configuration.") + endif(NOT BlueBerry_FOUND) + + set(MITK_PLUGIN_USE_FILE @MITK_PLUGIN_USE_FILE@) + if(MITK_PLUGIN_USE_FILE) + if(EXISTS ${MITK_PLUGIN_USE_FILE}) + include(${MITK_PLUGIN_USE_FILE}) + endif() + endif() + + set(MITK_PLUGIN_PROVISIONING_FILE "@MITK_EXTAPP_PROVISIONING_FILE@") + set(MITK_PROVISIONING_FILES "${BLUEBERRY_PLUGIN_PROVISIONING_FILE}" "${MITK_PLUGIN_PROVISIONING_FILE}") -ENDIF(MITK_USE_BLUEBERRY) +endif(MITK_USE_BLUEBERRY) diff --git a/Modules/CMakeLists.txt b/Modules/CMakeLists.txt index 801a9633db..c9ac643b13 100644 --- a/Modules/CMakeLists.txt +++ b/Modules/CMakeLists.txt @@ -1,52 +1,52 @@ -SET(LIBPOSTFIX "Ext") +set(LIBPOSTFIX "Ext") # Modules must be listed according to their dependencies -SET(module_dirs +set(module_dirs SceneSerializationBase PlanarFigure ImageExtraction ImageStatistics LegacyAdaptors IpPicSupport MitkExt SceneSerialization Qmitk QmitkExt GraphAlgorithms DiffusionImaging GPGPU IGT CameraCalibration IGTUI RigidRegistration RigidRegistrationUI DeformableRegistration DeformableRegistrationUI OpenCVVideoSupport Overlays InputDevices ToFHardware ToFProcessing ToFUI ClippingTools ) -SET(MITK_DEFAULT_SUBPROJECTS MITK-Modules) +set(MITK_DEFAULT_SUBPROJECTS MITK-Modules) -FOREACH(module_dir ${module_dirs}) - ADD_SUBDIRECTORY(${module_dir}) -ENDFOREACH() +foreach(module_dir ${module_dirs}) + add_subdirectory(${module_dir}) +endforeach() -IF(MITK_PRIVATE_MODULES) - FILE(GLOB all_subdirs RELATIVE ${MITK_PRIVATE_MODULES} ${MITK_PRIVATE_MODULES}/*) - FOREACH(subdir ${all_subdirs}) - STRING(FIND ${subdir} "." _result) - IF(_result EQUAL -1) - IF(EXISTS ${MITK_PRIVATE_MODULES}/${subdir}/CMakeLists.txt) - MESSAGE(STATUS "Found private module ${subdir}") - ADD_SUBDIRECTORY(${MITK_PRIVATE_MODULES}/${subdir} private_modules/${subdir}) - ENDIF() - ENDIF() - ENDFOREACH() -ENDIF(MITK_PRIVATE_MODULES) +if(MITK_PRIVATE_MODULES) + file(GLOB all_subdirs RELATIVE ${MITK_PRIVATE_MODULES} ${MITK_PRIVATE_MODULES}/*) + foreach(subdir ${all_subdirs}) + string(FIND ${subdir} "." _result) + if(_result EQUAL -1) + if(EXISTS ${MITK_PRIVATE_MODULES}/${subdir}/CMakeLists.txt) + message(STATUS "Found private module ${subdir}") + add_subdirectory(${MITK_PRIVATE_MODULES}/${subdir} private_modules/${subdir}) + endif() + endif() + endforeach() +endif(MITK_PRIVATE_MODULES) diff --git a/Modules/CameraCalibration/CMakeLists.txt b/Modules/CameraCalibration/CMakeLists.txt index c3ac2c38b7..c6be544da7 100644 --- a/Modules/CameraCalibration/CMakeLists.txt +++ b/Modules/CameraCalibration/CMakeLists.txt @@ -1,7 +1,7 @@ MITK_CREATE_MODULE(mitkCameraCalibration DEPENDS MitkIGT PACKAGE_DEPENDS OpenCV ) # add testing dir -ADD_SUBDIRECTORY(Testing) \ No newline at end of file +add_subdirectory(Testing) \ No newline at end of file diff --git a/Modules/CameraCalibration/Testing/files.cmake b/Modules/CameraCalibration/Testing/files.cmake index f41bedbac5..de3106ecf1 100644 --- a/Modules/CameraCalibration/Testing/files.cmake +++ b/Modules/CameraCalibration/Testing/files.cmake @@ -1,4 +1,4 @@ -SET(MODULE_TESTS +set(MODULE_TESTS mitkCameraIntrinsicsTest.cpp mitkTransformTest.cpp ) \ No newline at end of file diff --git a/Modules/CameraCalibration/files.cmake b/Modules/CameraCalibration/files.cmake index 6d304c26c1..f28170b249 100644 --- a/Modules/CameraCalibration/files.cmake +++ b/Modules/CameraCalibration/files.cmake @@ -1,8 +1,8 @@ -SET(CPP_FILES +set(CPP_FILES mitkEndoDebug.cpp mitkTransform.cpp mitkCameraIntrinsics.cpp mitkXMLSerializable.cpp mitkNavigationDataHandEyeCalibrationFilter.cpp ) diff --git a/Modules/ClippingTools/files.cmake b/Modules/ClippingTools/files.cmake index cc9f52606d..456348b3d6 100644 --- a/Modules/ClippingTools/files.cmake +++ b/Modules/ClippingTools/files.cmake @@ -1,5 +1,5 @@ -SET(CPP_FILES +set(CPP_FILES mitkClippingPlaneTranslationTool.cpp mitkClippingPlaneRotationTool.cpp mitkClippingPlaneDeformationTool.cpp ) diff --git a/Modules/DeformableRegistration/CMakeLists.txt b/Modules/DeformableRegistration/CMakeLists.txt index 1ed6daac9c..a2557c5cc0 100644 --- a/Modules/DeformableRegistration/CMakeLists.txt +++ b/Modules/DeformableRegistration/CMakeLists.txt @@ -1,7 +1,7 @@ MITK_CREATE_MODULE(MitkDeformableRegistration SUBPROJECTS MITK-Registration DEPENDS Mitk MitkRigidRegistration EXPORT_DEFINE MITK_DEFORMABLEREGISTRATION_EXPORT ) -ADD_SUBDIRECTORY(Testing) +add_subdirectory(Testing) diff --git a/Modules/DeformableRegistration/Testing/files.cmake b/Modules/DeformableRegistration/Testing/files.cmake index 330b3920f8..8dab4479ca 100644 --- a/Modules/DeformableRegistration/Testing/files.cmake +++ b/Modules/DeformableRegistration/Testing/files.cmake @@ -1,5 +1,5 @@ -SET(MODULE_TESTS +set(MODULE_TESTS mitkDemonsRegistrationTest.cpp mitkHistogramMatchingTest.cpp mitkSymmetricForcesDemonsRegistrationTest.cpp ) \ No newline at end of file diff --git a/Modules/DeformableRegistration/files.cmake b/Modules/DeformableRegistration/files.cmake index 9a68a74a1f..b466cea186 100644 --- a/Modules/DeformableRegistration/files.cmake +++ b/Modules/DeformableRegistration/files.cmake @@ -1,7 +1,7 @@ -SET(CPP_FILES +set(CPP_FILES mitkBSplineRegistration.cpp mitkDemonsRegistration.cpp mitkSymmetricForcesDemonsRegistration.cpp mitkRegistrationBase.cpp mitkHistogramMatching.cpp ) \ No newline at end of file diff --git a/Modules/DeformableRegistrationUI/files.cmake b/Modules/DeformableRegistrationUI/files.cmake index 0d0482ad8b..24d1c42971 100644 --- a/Modules/DeformableRegistrationUI/files.cmake +++ b/Modules/DeformableRegistrationUI/files.cmake @@ -1,15 +1,15 @@ -SET(CPP_FILES +set(CPP_FILES QmitkDemonsRegistrationView.cpp QmitkBSplineRegistrationView.cpp ) -SET(UI_FILES +set(UI_FILES QmitkDemonsRegistrationViewControls.ui QmitkBSplineRegistrationViewControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES QmitkDemonsRegistrationView.h QmitkBSplineRegistrationView.h ) \ No newline at end of file diff --git a/Modules/DiffusionImaging/CMakeLists.txt b/Modules/DiffusionImaging/CMakeLists.txt index c5e4160b60..d072bc8493 100644 --- a/Modules/DiffusionImaging/CMakeLists.txt +++ b/Modules/DiffusionImaging/CMakeLists.txt @@ -1,28 +1,28 @@ -FIND_PACKAGE(ITK) -IF(ITK_GDCM_DIR) - INCLUDE(${ITK_GDCM_DIR}/GDCMConfig.cmake) - IF(GDCM_MAJOR_VERSION EQUAL 2) - ADD_DEFINITIONS(-DGDCM2) - SET(ITK_USES_GDCM2 1) - ENDIF(GDCM_MAJOR_VERSION EQUAL 2) -ENDIF(ITK_GDCM_DIR) +find_package(ITK) +if(ITK_GDCM_DIR) + include(${ITK_GDCM_DIR}/GDCMConfig.cmake) + if(GDCM_MAJOR_VERSION EQUAL 2) + add_definitions(-DGDCM2) + set(ITK_USES_GDCM2 1) + endif(GDCM_MAJOR_VERSION EQUAL 2) +endif(ITK_GDCM_DIR) MITK_CREATE_MODULE( MitkDiffusionImaging SUBPROJECTS MITK-DTI INCLUDE_DIRS IODataStructures Reconstruction Tractography Rendering Algorithms DicomImport Interactions IODataStructures/DiffusionWeightedImages IODataStructures/QBallImages IODataStructures/TensorImages IODataStructures/FiberBundle IODataStructures/FiberBundleX IODataStructures/PlanarFigureComposite IODataStructures/TbssImages ${CMAKE_CURRENT_BINARY_DIR} DEPENDS MitkExt SceneSerializationBase QmitkExt MitkGraphAlgorithms PACKAGE_DEPENDS Boost ) MITK_USE_MODULE(MitkDiffusionImaging) if(MitkDiffusionImaging_IS_ENABLED) file(DOWNLOAD http://mitk.org/download/data/FibertrackingLUT.tar.gz ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FibertrackingLUT.tar.gz TIMEOUT 10) execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} tar xzf FibertrackingLUT.tar.gz) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Rendering/mitkShaderFiberClipping.xml ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mitkShaderFiberClipping.xml) MITK_INSTALL(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mitkShaderFiberClipping.xml ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FiberTrackingLUTBaryCoords.bin ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FiberTrackingLUTIndices.bin) endif() -ADD_SUBDIRECTORY(Testing) +add_subdirectory(Testing) -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mitkDiffusionImagingConfigure.h.in ${CMAKE_CURRENT_BINARY_DIR}/mitkDiffusionImagingConfigure.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mitkDiffusionImagingConfigure.h.in ${CMAKE_CURRENT_BINARY_DIR}/mitkDiffusionImagingConfigure.h) diff --git a/Modules/DiffusionImaging/Testing/files.cmake b/Modules/DiffusionImaging/Testing/files.cmake index bc045d4100..dad71c0c83 100644 --- a/Modules/DiffusionImaging/Testing/files.cmake +++ b/Modules/DiffusionImaging/Testing/files.cmake @@ -1,3 +1,3 @@ -SET(MODULE_TESTS +set(MODULE_TESTS mitkFactoryRegistrationTest.cpp ) diff --git a/Modules/DiffusionImaging/files.cmake b/Modules/DiffusionImaging/files.cmake index 108c25a809..d3a7484ab7 100644 --- a/Modules/DiffusionImaging/files.cmake +++ b/Modules/DiffusionImaging/files.cmake @@ -1,165 +1,165 @@ -SET(CPP_FILES +set(CPP_FILES # DicomImport DicomImport/mitkDicomDiffusionImageReader.cpp DicomImport/mitkGroupDiffusionHeadersFilter.cpp DicomImport/mitkDicomDiffusionImageHeaderReader.cpp DicomImport/mitkGEDicomDiffusionImageHeaderReader.cpp DicomImport/mitkPhilipsDicomDiffusionImageHeaderReader.cpp DicomImport/mitkSiemensDicomDiffusionImageHeaderReader.cpp DicomImport/mitkSiemensMosaicDicomDiffusionImageHeaderReader.cpp # DataStructures IODataStructures/mitkDiffusionImagingObjectFactory.cpp # DataStructures -> DWI IODataStructures/DiffusionWeightedImages/mitkDiffusionImageHeaderInformation.cpp IODataStructures/DiffusionWeightedImages/mitkDiffusionImageSource.cpp IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageReader.cpp IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageWriter.cpp IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageIOFactory.cpp IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageWriterFactory.cpp IODataStructures/DiffusionWeightedImages/mitkDiffusionImageSerializer.cpp # DataStructures -> QBall IODataStructures/QBallImages/mitkQBallImageSource.cpp IODataStructures/QBallImages/mitkNrrdQBallImageReader.cpp IODataStructures/QBallImages/mitkNrrdQBallImageWriter.cpp IODataStructures/QBallImages/mitkNrrdQBallImageIOFactory.cpp IODataStructures/QBallImages/mitkNrrdQBallImageWriterFactory.cpp IODataStructures/QBallImages/mitkQBallImage.cpp IODataStructures/QBallImages/mitkQBallImageSerializer.cpp # DataStructures -> Tensor IODataStructures/TensorImages/mitkTensorImageSource.cpp IODataStructures/TensorImages/mitkNrrdTensorImageReader.cpp IODataStructures/TensorImages/mitkNrrdTensorImageWriter.cpp IODataStructures/TensorImages/mitkNrrdTensorImageIOFactory.cpp IODataStructures/TensorImages/mitkNrrdTensorImageWriterFactory.cpp IODataStructures/TensorImages/mitkTensorImage.cpp IODataStructures/TensorImages/mitkTensorImageSerializer.cpp # DataStructures -> FiberBundleX IODataStructures/FiberBundleX/mitkFiberBundleX.cpp IODataStructures/FiberBundleX/mitkFiberBundleXWriter.cpp IODataStructures/FiberBundleX/mitkFiberBundleXReader.cpp IODataStructures/FiberBundleX/mitkFiberBundleXIOFactory.cpp IODataStructures/FiberBundleX/mitkFiberBundleXWriterFactory.cpp IODataStructures/FiberBundleX/mitkFiberBundleXSerializer.cpp IODataStructures/FiberBundleX/mitkFiberBundleXThreadMonitor.cpp # DataStructures -> PlanarFigureComposite IODataStructures/PlanarFigureComposite/mitkPlanarFigureComposite.cpp # DataStructures -> Tbss IODataStructures/TbssImages/mitkTbssImageSource.cpp IODataStructures/TbssImages/mitkTbssRoiImageSource.cpp IODataStructures/TbssImages/mitkNrrdTbssImageReader.cpp IODataStructures/TbssImages/mitkNrrdTbssImageIOFactory.cpp IODataStructures/TbssImages/mitkNrrdTbssRoiImageReader.cpp IODataStructures/TbssImages/mitkNrrdTbssRoiImageIOFactory.cpp IODataStructures/TbssImages/mitkTbssImage.cpp IODataStructures/TbssImages/mitkTbssRoiImage.cpp IODataStructures/TbssImages/mitkNrrdTbssImageWriter.cpp IODataStructures/TbssImages/mitkNrrdTbssImageWriterFactory.cpp IODataStructures/TbssImages/mitkNrrdTbssRoiImageWriter.cpp IODataStructures/TbssImages/mitkNrrdTbssRoiImageWriterFactory.cpp IODataStructures/TbssImages/mitkTbssImporter.cpp # Rendering Rendering/vtkMaskedProgrammableGlyphFilter.cpp Rendering/mitkCompositeMapper.cpp Rendering/mitkVectorImageVtkGlyphMapper3D.cpp Rendering/vtkOdfSource.cxx Rendering/vtkThickPlane.cxx Rendering/mitkOdfNormalizationMethodProperty.cpp Rendering/mitkOdfScaleByProperty.cpp Rendering/mitkFiberBundleXMapper2D.cpp Rendering/mitkFiberBundleXMapper3D.cpp Rendering/mitkFiberBundleXThreadMonitorMapper3D.cpp Rendering/mitkTbssImageMapper.cpp Rendering/mitkPlanarCircleMapper3D.cpp Rendering/mitkPlanarPolygonMapper3D.cpp # Interactions Interactions/mitkFiberBundleInteractor.cpp # Algorithms Algorithms/mitkPartialVolumeAnalysisHistogramCalculator.cpp Algorithms/mitkPartialVolumeAnalysisClusteringCalculator.cpp Algorithms/mitkTractAnalyzer.cpp # Tractography Tractography/itkStochasticTractographyFilter.h ) -SET(H_FILES +set(H_FILES # Rendering Rendering/mitkDiffusionImageMapper.h Rendering/mitkTbssImageMapper.h Rendering/mitkOdfVtkMapper2D.h Rendering/mitkFiberBundleXMapper3D.h Rendering/mitkFiberBundleXMapper2D.h Rendering/mitkFiberBundleXThreadMonitorMapper3D.h Rendering/mitkPlanarCircleMapper3D.h Rendering/mitkPlanarPolygonMapper3D.h # Reconstruction Reconstruction/itkDiffusionQballReconstructionImageFilter.h Reconstruction/mitkTeemDiffusionTensor3DReconstructionImageFilter.h Reconstruction/itkAnalyticalDiffusionQballReconstructionImageFilter.h Reconstruction/itkPointShell.h Reconstruction/itkOrientationDistributionFunction.h Reconstruction/itkDiffusionIntravoxelIncoherentMotionReconstructionImageFilter.h Reconstruction/itkRegularizedIVIMLocalVariationImageFilter.h Reconstruction/itkRegularizedIVIMReconstructionFilter.h Reconstruction/itkRegularizedIVIMReconstructionSingleIteration.h # IO Datastructures IODataStructures/DiffusionWeightedImages/mitkDiffusionImage.h IODataStructures/TbssImages/mitkTbssImporter.h # DataStructures -> FiberBundleX IODataStructures/FiberBundleX/mitkFiberBundleX.h IODataStructures/FiberBundleX/mitkFiberBundleXWriter.h IODataStructures/FiberBundleX/mitkFiberBundleXReader.h IODataStructures/FiberBundleX/mitkFiberBundleXIOFactory.h IODataStructures/FiberBundleX/mitkFiberBundleXWriterFactory.h IODataStructures/FiberBundleX/mitkFiberBundleXSerializer.h IODataStructures/FiberBundleX/mitkFiberBundleXThreadMonitor.h # Tractography Tractography/itkGibbsTrackingFilter.h Tractography/itkStochasticTractographyFilter.h # Algorithms Algorithms/itkDiffusionQballGeneralizedFaImageFilter.h Algorithms/itkDiffusionQballPrepareVisualizationImageFilter.h Algorithms/itkTensorDerivedMeasurementsFilter.h Algorithms/itkBrainMaskExtractionImageFilter.h Algorithms/itkB0ImageExtractionImageFilter.h Algorithms/itkTensorImageToDiffusionImageFilter.h Algorithms/itkTensorToL2NormImageFilter.h Algorithms/itkTractDensityImageFilter.h Algorithms/itkTractsToFiberEndingsImageFilter.h Algorithms/itkTractsToRgbaImageFilter.h Algorithms/itkGaussianInterpolateImageFunction.h Algorithms/mitkPartialVolumeAnalysisHistogramCalculator.h Algorithms/mitkPartialVolumeAnalysisClusteringCalculator.h Algorithms/itkDiffusionTensorPrincipleDirectionImageFilter.h Algorithms/itkCartesianToPolarVectorImageFilter.h Algorithms/itkPolarToCartesianVectorImageFilter.h Algorithms/itkDistanceMapFilter.h Algorithms/itkProjectionFilter.h Algorithms/itkSkeletonizationFilter.h Algorithms/itkReduceDirectionGradientsFilter.h Algorithms/itkResidualImageFilter.h ) -SET( TOOL_FILES +set( TOOL_FILES ) -IF(WIN32) -ENDIF(WIN32) +if(WIN32) +endif(WIN32) #MITK_MULTIPLEX_PICTYPE( Algorithms/mitkImageRegistrationMethod-TYPE.cpp ) diff --git a/Modules/GPGPU/CMakeLists.txt b/Modules/GPGPU/CMakeLists.txt index 0d80390aba..6273843070 100644 --- a/Modules/GPGPU/CMakeLists.txt +++ b/Modules/GPGPU/CMakeLists.txt @@ -1,14 +1,14 @@ -IF (APPLE) - MESSAGE(STATUS "Module GPGPU is not ported to MacOS yet") -ELSE(APPLE) +if(APPLE) + message(STATUS "Module GPGPU is not ported to MacOS yet") +else(APPLE) MITK_CREATE_MODULE(mitkGPGPU # INCLUDE_DIRS . DEPENDS Mitk glew PACKAGE_DEPENDS QT EXPORT_DEFINE GPGPU_DLL_API QT_MODULE ) -ENDIF(APPLE) +endif(APPLE) diff --git a/Modules/GPGPU/files.cmake b/Modules/GPGPU/files.cmake index 7e8763a080..3d0cb2f26b 100644 --- a/Modules/GPGPU/files.cmake +++ b/Modules/GPGPU/files.cmake @@ -1,7 +1,7 @@ -SET(CPP_FILES +set(CPP_FILES mitkGPGPU.cpp ) diff --git a/Modules/GraphAlgorithms/files.cmake b/Modules/GraphAlgorithms/files.cmake index 23b450c9a6..03d5a624d9 100644 --- a/Modules/GraphAlgorithms/files.cmake +++ b/Modules/GraphAlgorithms/files.cmake @@ -1,9 +1,9 @@ -SET(CPP_FILES +set(CPP_FILES itkShortestPathNode.cpp ) -SET(H_FILES +set(H_FILES itkShortestPathCostFunction.h itkShortestPathCostFunctionTbss.h itkShortestPathNode.h itkShortestPathImageFilter.h ) diff --git a/Modules/IGT/CMakeLists.txt b/Modules/IGT/CMakeLists.txt index 944707515d..84de8cfe35 100644 --- a/Modules/IGT/CMakeLists.txt +++ b/Modules/IGT/CMakeLists.txt @@ -1,46 +1,46 @@ -INCLUDE(MITKIGTHardware.cmake) +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_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) +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 ADDITIONAL_LIBS "${ADDITIONAL_LIBS}" ) MITK_INSTALL(FILES ${MITK_SOURCE_DIR}/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/ClaronMicron.stl ) MITK_INSTALL(FILES ${MITK_SOURCE_DIR}/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/IntuitiveDaVinci.stl ) MITK_INSTALL(FILES ${MITK_SOURCE_DIR}/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAurora.stl ) MITK_INSTALL(FILES ${MITK_SOURCE_DIR}/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAurora_Dome.stl ) MITK_INSTALL(FILES ${MITK_SOURCE_DIR}/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAuroraCompactFG_Dome.stl ) MITK_INSTALL(FILES ${MITK_SOURCE_DIR}/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAuroraPlanarFG_Dome.stl ) MITK_INSTALL(FILES ${MITK_SOURCE_DIR}/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAuroraTabletopFG_Dome.stl ) MITK_INSTALL(FILES ${MITK_SOURCE_DIR}/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAuroraTabletopFG_Prototype_Dome.stl ) MITK_INSTALL(FILES ${MITK_SOURCE_DIR}/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIPolaris.stl ) MITK_INSTALL(FILES ${MITK_SOURCE_DIR}/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIPolarisVicra.stl ) MITK_INSTALL(FILES ${MITK_SOURCE_DIR}/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/StandardVolume.stl ) MITK_CHECK_MODULE(_RESULT MitkIGT) -IF(_RESULT) - MESSAGE(STATUS "IGTTutorialStep1 won't be built. Missing: ${_RESULT}") -ELSE(_RESULT) +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) +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 Mitk tinyxml PocoXML) +# add test programm for serial communication classADD_EXECUTABLE(SerialCommunicationTest IGTTrackingDevices/mitkSerialCommunicationTest.cpp)target_link_libraries(SerialCommunicationTest mitkIGT Mitk tinyxml PocoXML) -ADD_SUBDIRECTORY(IGTTutorial) +add_subdirectory(IGTTutorial) -ADD_SUBDIRECTORY(Testing) -ENDIF(_RESULT) +add_subdirectory(Testing) +endif(_RESULT) diff --git a/Modules/IGT/IGTTutorial/CMakeLists.txt b/Modules/IGT/IGTTutorial/CMakeLists.txt index 60dde48726..4d70184f0c 100644 --- a/Modules/IGT/IGTTutorial/CMakeLists.txt +++ b/Modules/IGT/IGTTutorial/CMakeLists.txt @@ -1,4 +1,4 @@ MITK_USE_MODULE(MitkIGT) -ADD_EXECUTABLE(IGTTutorialStep1 IGTTutorialStep1.cpp) -TARGET_LINK_LIBRARIES(IGTTutorialStep1 ${ALL_LIBRARIES}) +add_executable(IGTTutorialStep1 IGTTutorialStep1.cpp) +target_link_libraries(IGTTutorialStep1 ${ALL_LIBRARIES}) diff --git a/Modules/IGT/MITKIGTHardware.cmake b/Modules/IGT/MITKIGTHardware.cmake index 463887d2dc..658468573c 100644 --- a/Modules/IGT/MITKIGTHardware.cmake +++ b/Modules/IGT/MITKIGTHardware.cmake @@ -1,31 +1,31 @@ #Begin MicronTracker Hardware -OPTION(MITK_USE_MICRON_TRACKER "Enable support for micron tracker hardware" OFF) +option(MITK_USE_MICRON_TRACKER "Enable support for micron tracker hardware" OFF) # only if MicronTracker is enabled -IF(MITK_USE_MICRON_TRACKER) - FIND_LIBRARY(MITK_MICRON_TRACKER_LIB MTC DOC "Path which contains the MT2 library.") - GET_FILENAME_COMPONENT(MICRON_TRACKER_SDK_DIR ${MITK_MICRON_TRACKER_LIB} PATH) - FIND_PATH(MITK_MICRON_TRACKER_INCLUDE_DIR MTC.h ${MICRON_TRACKER_SDK_DIR} DOC "Include directory of the MT2.") - FIND_PATH(MITK_MICRON_TRACKER_TEMP_DIR . DOC "Any temporary directory which can be used by the MicronTracker2.") - FIND_PATH(MITK_MICRON_TRACKER_CALIBRATION_DIR BumbleBee_6400420.calib DOC "Path which contains the MT2 calibration file.") +if(MITK_USE_MICRON_TRACKER) + find_library(MITK_MICRON_TRACKER_LIB MTC DOC "Path which contains the MT2 library.") + get_filename_component(MICRON_TRACKER_SDK_DIR ${MITK_MICRON_TRACKER_LIB} PATH) + find_path(MITK_MICRON_TRACKER_INCLUDE_DIR MTC.h ${MICRON_TRACKER_SDK_DIR} DOC "Include directory of the MT2.") + find_path(MITK_MICRON_TRACKER_TEMP_DIR . DOC "Any temporary directory which can be used by the MicronTracker2.") + find_path(MITK_MICRON_TRACKER_CALIBRATION_DIR BumbleBee_6400420.calib DOC "Path which contains the MT2 calibration file.") MITK_INSTALL(FILES ${MICRON_TRACKER_SDK_DIR}/MTC.dll CONFIGURATIONS Release) MITK_INSTALL(FILES ${MICRON_TRACKER_SDK_DIR}/MTInterfaceDotNet.dll CONFIGURATIONS Release) MITK_INSTALL(FILES ${MICRON_TRACKER_SDK_DIR}/PGRFlyCapture.dll CONFIGURATIONS Release) ENDIF(MITK_USE_MICRON_TRACKER) #End MicronTracker Hardware # only on Win32 -IF(WIN32) +if(WIN32) #Begin Ascension MicroBird Hardware - OPTION(MITK_USE_MICROBIRD_TRACKER "Enable support for Ascension MicroBird tracker hardware" OFF) - IF(MITK_USE_MICROBIRD_TRACKER) - ADD_DEFINITIONS(-DMITK_USE_MICROBIRD_TRACKER) - FIND_LIBRARY(MITK_USE_MICROBIRD_TRACKER_LIB PCIBird3) - GET_FILENAME_COMPONENT(MICROBIRD_TRACKER_API_DIR ${MITK_USE_MICROBIRD_TRACKER_LIB} PATH) - FIND_PATH(MITK_USE_MICROBIRD_TRACKER_INCLUDE_DIR PCIBird3.h ${MICROBIRD_TRACKER_API_DIR}) - ENDIF(MITK_USE_MICROBIRD_TRACKER) + option(MITK_USE_MICROBIRD_TRACKER "Enable support for Ascension MicroBird tracker hardware" OFF) + if(MITK_USE_MICROBIRD_TRACKER) + add_definitions(-DMITK_USE_MICROBIRD_TRACKER) + find_library(MITK_USE_MICROBIRD_TRACKER_LIB PCIBird3) + get_filename_component(MICROBIRD_TRACKER_API_DIR ${MITK_USE_MICROBIRD_TRACKER_LIB} PATH) + find_path(MITK_USE_MICROBIRD_TRACKER_INCLUDE_DIR PCIBird3.h ${MICROBIRD_TRACKER_API_DIR}) + endif(MITK_USE_MICROBIRD_TRACKER) #End MicroBird Hardware -ENDIF(WIN32) \ No newline at end of file +endif(WIN32) diff --git a/Modules/IGT/Testing/CMakeLists.txt b/Modules/IGT/Testing/CMakeLists.txt index 457b10b802..765978613f 100644 --- a/Modules/IGT/Testing/CMakeLists.txt +++ b/Modules/IGT/Testing/CMakeLists.txt @@ -1,17 +1,17 @@ -IF(BUILD_TESTING) - INCLUDE(MITKIGTTrackingDeviceHardwareTesting.cmake) -ENDIF(BUILD_TESTING) +if(BUILD_TESTING) + include(MITKIGTTrackingDeviceHardwareTesting.cmake) +endif(BUILD_TESTING) MITK_CREATE_MODULE_TESTS() -IF(MITK_NDI_AURORA_CONNECTED) +if(MITK_NDI_AURORA_CONNECTED) mitkAddCustomModuleTest(mitkNDIAuroraHardwareTest mitkNDIAuroraHardwareTest ${MITK_NDI_AURORA_COM_PORT}) -ENDIF(MITK_NDI_AURORA_CONNECTED) +endif(MITK_NDI_AURORA_CONNECTED) -IF(MITK_NDI_POLARIS_CONNECTED) +if(MITK_NDI_POLARIS_CONNECTED) mitkAddCustomModuleTest(mitkNDIPolarisHardwareTest mitkNDIPolarisHardwareTest ${MITK_NDI_POLARIS_COM_PORT}) -ENDIF(MITK_NDI_POLARIS_CONNECTED) +endif(MITK_NDI_POLARIS_CONNECTED) -IF(MITK_CLARON_MICRONTRACKER_CONNECTED) +if(MITK_CLARON_MICRONTRACKER_CONNECTED) mitkAddCustomModuleTest(mitkClaronTrackingDeviceHardwareTest mitkClaronTrackingDeviceHardwareTest ${MITK_DATA_DIR}/IGT-Data/MicronTrackerToolfiles/Tool_11 ${MITK_DATA_DIR}/IGT-Data/MicronTrackerToolfiles/Tool_12 ${MITK_DATA_DIR}/IGT-Data/MicronTrackerToolfiles/Tool_13) -ENDIF(MITK_CLARON_MICRONTRACKER_CONNECTED) +endif(MITK_CLARON_MICRONTRACKER_CONNECTED) diff --git a/Modules/IGT/Testing/MITKIGTTrackingDeviceHardwareTesting.cmake b/Modules/IGT/Testing/MITKIGTTrackingDeviceHardwareTesting.cmake index 3dc44a886d..5b0a329053 100644 --- a/Modules/IGT/Testing/MITKIGTTrackingDeviceHardwareTesting.cmake +++ b/Modules/IGT/Testing/MITKIGTTrackingDeviceHardwareTesting.cmake @@ -1,17 +1,17 @@ -OPTION(MITK_TRACKING_DEVICES_HARDWARE_TESTS_ENABLED "Enable support for testing tracking device hardware (this hardware must be connected to the system)" OFF) -MARK_AS_ADVANCED(MITK_TRACKING_DEVICES_HARDWARE_TESTS_ENABLED) +option(MITK_TRACKING_DEVICES_HARDWARE_TESTS_ENABLED "Enable support for testing tracking device hardware (this hardware must be connected to the system)" OFF) +mark_as_advanced(MITK_TRACKING_DEVICES_HARDWARE_TESTS_ENABLED) -IF(MITK_TRACKING_DEVICES_HARDWARE_TESTS_ENABLED) - OPTION(MITK_NDI_AURORA_CONNECTED "Turn on if an Aurora system is connected and should be tested." OFF) - OPTION(MITK_NDI_POLARIS_CONNECTED "Turn on if a Polaris system is connected and should be tested." OFF) - OPTION(MITK_CLARON_MICRONTRACKER_CONNECTED "Turn on if a MicronTracker system is connected and should be tested." OFF) - MARK_AS_ADVANCED(MITK_NDI_AURORA_CONNECTED MITK_NDI_POLARIS_CONNECTED MITK_CLARON_MICRONTRACKER_CONNECTED MITK_CLARON_MICRONTRACKER_CONNECTED) -ENDIF(MITK_TRACKING_DEVICES_HARDWARE_TESTS_ENABLED) +if(MITK_TRACKING_DEVICES_HARDWARE_TESTS_ENABLED) + option(MITK_NDI_AURORA_CONNECTED "Turn on if an Aurora system is connected and should be tested." OFF) + option(MITK_NDI_POLARIS_CONNECTED "Turn on if a Polaris system is connected and should be tested." OFF) + option(MITK_CLARON_MICRONTRACKER_CONNECTED "Turn on if a MicronTracker system is connected and should be tested." OFF) + mark_as_advanced(MITK_NDI_AURORA_CONNECTED MITK_NDI_POLARIS_CONNECTED MITK_CLARON_MICRONTRACKER_CONNECTED MITK_CLARON_MICRONTRACKER_CONNECTED) +endif(MITK_TRACKING_DEVICES_HARDWARE_TESTS_ENABLED) -IF(MITK_NDI_AURORA_CONNECTED) +if(MITK_NDI_AURORA_CONNECTED) set(MITK_NDI_AURORA_COM_PORT "1" CACHE STRING "Serial port where the system is connected.") -ENDIF(MITK_NDI_AURORA_CONNECTED) +endif(MITK_NDI_AURORA_CONNECTED) -IF(MITK_NDI_POLARIS_CONNECTED) +if(MITK_NDI_POLARIS_CONNECTED) set(MITK_NDI_POLARIS_COM_PORT "1" CACHE STRING "Serial port where the system is connected.") -ENDIF(MITK_NDI_POLARIS_CONNECTED) \ No newline at end of file +endif(MITK_NDI_POLARIS_CONNECTED) \ No newline at end of file diff --git a/Modules/IGT/Testing/files.cmake b/Modules/IGT/Testing/files.cmake index 099a687983..2508b896aa 100644 --- a/Modules/IGT/Testing/files.cmake +++ b/Modules/IGT/Testing/files.cmake @@ -1,49 +1,49 @@ -SET(MODULE_TESTS +set(MODULE_TESTS mitkCameraVisualizationTest.cpp mitkClaronInterfaceTest.cpp mitkClaronToolTest.cpp mitkClaronTrackingDeviceTest.cpp mitkInternalTrackingToolTest.cpp mitkNavigationDataDisplacementFilterTest.cpp mitkNavigationDataLandmarkTransformFilterTest.cpp mitkNavigationDataObjectVisualizationFilterTest.cpp mitkNavigationDataTest.cpp mitkNavigationDataRecorderTest.cpp mitkNavigationDataReferenceTransformFilterTest.cpp mitkNavigationDataSequentialPlayerTest.cpp mitkNavigationDataToMessageFilterTest.cpp mitkNavigationDataToNavigationDataFilterTest.cpp mitkNavigationDataToPointSetFilterTest.cpp mitkNavigationDataTransformFilterTest.cpp mitkNDIPassiveToolTest.cpp mitkNDIProtocolTest.cpp mitkNDITrackingDeviceTest.cpp mitkTimeStampTest.cpp mitkTrackingVolumeGeneratorTest.cpp mitkTrackingDeviceTest.cpp mitkTrackingToolTest.cpp # This test fails randomly, see bug #8033 mitkVirtualTrackingDeviceTest.cpp mitkNavigationDataPlayerTest.cpp mitkTrackingDeviceSourceTest.cpp mitkTrackingDeviceSourceConfiguratorTest.cpp mitkNavigationDataEvaluationFilterTest.cpp mitkTrackingTypesTest.cpp # ------------------ Navigation Tool Management Tests ------------------- mitkNavigationToolStorageTest.cpp mitkNavigationToolStorageSerializerAndDeserializerTest.cpp #deactivated, see bug #10701 mitkNavigationToolTest.cpp mitkNavigationToolReaderAndWriterTest.cpp # ----------------------------------------------------------------------- # ------------------ Deavtivated Tests ---------------------------------- # ----------------------------------------------------------------------- ) -SET(MODULE_CUSTOM_TESTS +set(MODULE_CUSTOM_TESTS mitkNDIAuroraHardwareTest.cpp mitkNDIPolarisHardwareTest.cpp mitkClaronTrackingDeviceHardwareTest.cpp ) \ No newline at end of file diff --git a/Modules/IGT/files.cmake b/Modules/IGT/files.cmake index 858260c4e0..6ddc381f41 100644 --- a/Modules/IGT/files.cmake +++ b/Modules/IGT/files.cmake @@ -1,59 +1,59 @@ -SET(CPP_FILES +set(CPP_FILES IGTFilters/mitkNavigationDataLandmarkTransformFilter.cpp IGTFilters/mitkNavigationDataReferenceTransformFilter.cpp IGTFilters/mitkNavigationDataTransformFilter.cpp IGTFilters/mitkNavigationDataRecorder.cpp IGTFilters/mitkNavigationDataPlayer.cpp IGTFilters/mitkNavigationDataPlayerBase.cpp IGTFilters/mitkNavigationDataObjectVisualizationFilter.cpp IGTFilters/mitkCameraVisualization.cpp IGTFilters/mitkNavigationData.cpp IGTFilters/mitkNavigationDataDisplacementFilter.cpp IGTFilters/mitkNavigationDataSequentialPlayer.cpp IGTFilters/mitkNavigationDataSource.cpp IGTFilters/mitkNavigationDataToMessageFilter.cpp IGTFilters/mitkNavigationDataToNavigationDataFilter.cpp IGTFilters/mitkNavigationDataToPointSetFilter.cpp IGTFilters/mitkNavigationDataEvaluationFilter.cpp IGTFilters/mitkTrackingDeviceSource.cpp IGTFilters/mitkTrackingVolumeGenerator.cpp IGTFilters/mitkTimeStamp.cpp IGTFilters/mitkRealTimeClock.cpp IGTFilters/mitkTrackingDeviceSourceConfigurator.cpp IGTTrackingDevices/mitkClaronTool.cpp IGTTrackingDevices/mitkClaronTrackingDevice.cpp IGTTrackingDevices/mitkInternalTrackingTool.cpp IGTTrackingDevices/mitkNDIPassiveTool.cpp IGTTrackingDevices/mitkNDIProtocol.cpp IGTTrackingDevices/mitkNDITrackingDevice.cpp IGTTrackingDevices/mitkSerialCommunication.cpp IGTTrackingDevices/mitkTrackingDevice.cpp IGTTrackingDevices/mitkTrackingTool.cpp IGTTrackingDevices/mitkVirtualTrackingDevice.cpp IGTTrackingDevices/mitkVirtualTrackingTool.cpp IGTToolManagement/mitkNavigationToolStorage.cpp IGTToolManagement/mitkNavigationToolStorageSerializer.cpp IGTToolManagement/mitkNavigationToolStorageDeserializer.cpp IGTToolManagement/mitkNavigationTool.cpp IGTToolManagement/mitkNavigationToolReader.cpp IGTToolManagement/mitkNavigationToolWriter.cpp ) -IF(MITK_USE_MICRON_TRACKER) - SET(CPP_FILES ${CPP_FILES} IGTTrackingDevices/mitkClaronInterface.cpp) -ELSE() - SET(CPP_FILES ${CPP_FILES} IGTTrackingDevices/mitkClaronInterfaceStub.cpp) -ENDIF(MITK_USE_MICRON_TRACKER) +if(MITK_USE_MICRON_TRACKER) + set(CPP_FILES ${CPP_FILES} IGTTrackingDevices/mitkClaronInterface.cpp) +else() + set(CPP_FILES ${CPP_FILES} IGTTrackingDevices/mitkClaronInterfaceStub.cpp) +endif(MITK_USE_MICRON_TRACKER) -IF(MITK_USE_MICROBIRD_TRACKER) - SET(CPP_FILES ${CPP_FILES} IGTTrackingDevices/mitkMicroBirdTrackingDevice.cpp) -ENDIF(MITK_USE_MICROBIRD_TRACKER) +if(MITK_USE_MICROBIRD_TRACKER) + set(CPP_FILES ${CPP_FILES} IGTTrackingDevices/mitkMicroBirdTrackingDevice.cpp) +endif(MITK_USE_MICROBIRD_TRACKER) -IF(WIN32) - SET(CPP_FILES ${CPP_FILES} IGTFilters/mitkWindowsRealTimeClock.cpp) -ELSE() - SET(CPP_FILES ${CPP_FILES} IGTFilters/mitkLinuxRealTimeClock.cpp) -ENDIF(WIN32) \ No newline at end of file +if(WIN32) + set(CPP_FILES ${CPP_FILES} IGTFilters/mitkWindowsRealTimeClock.cpp) +else() + set(CPP_FILES ${CPP_FILES} IGTFilters/mitkLinuxRealTimeClock.cpp) +endif(WIN32) \ No newline at end of file diff --git a/Modules/IGT/moduleIncludeConf.cmake.in b/Modules/IGT/moduleIncludeConf.cmake.in index 88bda8fb40..4285a273db 100644 --- a/Modules/IGT/moduleIncludeConf.cmake.in +++ b/Modules/IGT/moduleIncludeConf.cmake.in @@ -1,5 +1,5 @@ -SET(@MODULE_NAME@_INCLUDE_DIRS "@MODULE_INCLUDE_DIRS@") -SET(@MODULE_NAME@_LIBRARIES "@MODULE_LIBRARIES@") +set(@MODULE_NAME@_INCLUDE_DIRS "@MODULE_INCLUDE_DIRS@") +set(@MODULE_NAME@_LIBRARIES "@MODULE_LIBRARIES@") -LIST(APPEND MITK_INCLUDE_DIRS ${@MODULE_NAME@_INCLUDE_DIRS}) -LIST(APPEND MITK_LIBRARIES ${@MODULE_NAME@_LIBRARIES}) \ No newline at end of file +list(APPEND MITK_INCLUDE_DIRS ${@MODULE_NAME@_INCLUDE_DIRS}) +list(APPEND MITK_LIBRARIES ${@MODULE_NAME@_LIBRARIES}) \ No newline at end of file diff --git a/Modules/IGTUI/CMakeLists.txt b/Modules/IGTUI/CMakeLists.txt index 276cb54902..83161cf33e 100644 --- a/Modules/IGTUI/CMakeLists.txt +++ b/Modules/IGTUI/CMakeLists.txt @@ -1,12 +1,12 @@ MITK_CREATE_MODULE(MitkIGTUI SUBPROJECTS MITK-IGT INCLUDE_DIRS Qmitk DEPENDS MitkIGT Qmitk QmitkExt QT_MODULE GENERATED_CPP ${TOOL_GUI_CPPS} ${TOOL_CPPS} ) ## create IGTUI config -CONFIGURE_FILE(mitkIGTUIConfig.h.in ${PROJECT_BINARY_DIR}/mitkIGTUIConfig.h @ONLY) +configure_file(mitkIGTUIConfig.h.in ${PROJECT_BINARY_DIR}/mitkIGTUIConfig.h @ONLY) diff --git a/Modules/IGTUI/files.cmake b/Modules/IGTUI/files.cmake index 79d9ea4c21..3799868b67 100644 --- a/Modules/IGTUI/files.cmake +++ b/Modules/IGTUI/files.cmake @@ -1,59 +1,59 @@ -SET(CPP_FILES +set(CPP_FILES Qmitk/QmitkTrackingDeviceWidget.cpp Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp Qmitk/QmitkNDIConfigurationWidget.cpp Qmitk/QmitkFiducialRegistrationWidget.cpp Qmitk/QmitkNDIToolDelegate.cpp Qmitk/QmitkNavigationToolManagementWidget.cpp Qmitk/QmitkIGTLoggerWidget.cpp Qmitk/QmitkUpdateTimerWidget.cpp Qmitk/QmitkToolDistanceWidget.cpp Qmitk/QmitkToolTrackingStatusWidget.cpp Qmitk/QmitkTrackingSourcesCheckBoxPanelWidget.cpp Qmitk/QmitkIGTPlayerWidget.cpp Qmitk/QmitkIGTConnectionWidget.cpp Qmitk/QmitkToolSelectionWidget.cpp Qmitk/QmitkNavigationToolCreationWidget.cpp ) -SET(UI_FILES +set(UI_FILES Qmitk/QmitkNavigationToolManagementWidgetControls.ui Qmitk/QmitkTrackingDeviceConfigurationWidgetControls.ui Qmitk/QmitkNDIConfigurationWidget.ui Qmitk/QmitkFiducialRegistrationWidget.ui Qmitk/QmitkIGTLoggerWidgetControls.ui Qmitk/QmitkUpdateTimerWidgetControls.ui Qmitk/QmitkToolDistanceWidgetControls.ui Qmitk/QmitkToolTrackingStatusWidgetControls.ui Qmitk/QmitkTrackingSourcesCheckBoxPanelWidgetControls.ui Qmitk/QmitkIGTPlayerWidgetControls.ui Qmitk/QmitkIGTConnectionWidgetControls.ui Qmitk/QmitkToolSelectionWidgetControls.ui Qmitk/QmitkNavigationToolCreationWidget.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES Qmitk/QmitkNavigationToolManagementWidget.h Qmitk/QmitkTrackingDeviceWidget.h Qmitk/QmitkTrackingDeviceConfigurationWidget.h Qmitk/QmitkNDIConfigurationWidget.h Qmitk/QmitkFiducialRegistrationWidget.h Qmitk/QmitkNDIToolDelegate.h Qmitk/QmitkIGTLoggerWidget.h Qmitk/QmitkUpdateTimerWidget.h Qmitk/QmitkToolDistanceWidget.h Qmitk/QmitkToolTrackingStatusWidget.h Qmitk/QmitkTrackingSourcesCheckBoxPanelWidget.h Qmitk/QmitkIGTPlayerWidget.h Qmitk/QmitkIGTConnectionWidget.h Qmitk/QmitkToolSelectionWidget.h Qmitk/QmitkNavigationToolCreationWidget.h ) -SET(QRC_FILES +set(QRC_FILES resources/IGTUI.qrc ) diff --git a/Modules/IGTUI/moduleIncludeConf.cmake.in b/Modules/IGTUI/moduleIncludeConf.cmake.in index d3b08b3d6f..3f5fca05cc 100644 --- a/Modules/IGTUI/moduleIncludeConf.cmake.in +++ b/Modules/IGTUI/moduleIncludeConf.cmake.in @@ -1,5 +1,5 @@ -SET(@MODULE_NAME@_INCLUDE_DIRS "@MODULE_INCLUDE_DIRS@") -SET(@MODULE_NAME@_LIBRARIES "@MODULE_LIBRARIES@") +set(@MODULE_NAME@_INCLUDE_DIRS "@MODULE_INCLUDE_DIRS@") +set(@MODULE_NAME@_LIBRARIES "@MODULE_LIBRARIES@") -LIST(APPEND MITK_INCLUDE_DIRS ${@MODULE_NAME@_INCLUDE_DIRS}) -LIST(APPEND MITK_LIBRARIES ${@MODULE_NAME@_LIBRARIES}) +list(APPEND MITK_INCLUDE_DIRS ${@MODULE_NAME@_INCLUDE_DIRS}) +list(APPEND MITK_LIBRARIES ${@MODULE_NAME@_LIBRARIES}) diff --git a/Modules/ImageExtraction/CMakeLists.txt b/Modules/ImageExtraction/CMakeLists.txt index 9b541151f2..51327efccc 100644 --- a/Modules/ImageExtraction/CMakeLists.txt +++ b/Modules/ImageExtraction/CMakeLists.txt @@ -1,10 +1,10 @@ MITK_CREATE_MODULE( ImageExtraction DEPENDS Mitk mitkIpPic PlanarFigure DEPENDS_INTERNAL pic2vtk ) -IF(BUILD_TESTING) +if(BUILD_TESTING) - ADD_SUBDIRECTORY(Testing) + add_subdirectory(Testing) -ENDIF(BUILD_TESTING) +endif(BUILD_TESTING) diff --git a/Modules/ImageExtraction/Testing/files.cmake b/Modules/ImageExtraction/Testing/files.cmake index bdad38d304..6282bcbc93 100644 --- a/Modules/ImageExtraction/Testing/files.cmake +++ b/Modules/ImageExtraction/Testing/files.cmake @@ -1,12 +1,12 @@ -SET(MODULE_IMAGE_TESTS +set(MODULE_IMAGE_TESTS mitkExtractImageFilterTest.cpp ) -SET(MODULE_TESTIMAGES +set(MODULE_TESTIMAGES US4DCyl.pic.gz Pic3D.pic.gz Pic2DplusT.pic.gz BallBinary30x30x30.pic.gz Png2D-bw.png binary.stl ball.stl ) diff --git a/Modules/ImageExtraction/files.cmake b/Modules/ImageExtraction/files.cmake index 5aa29f0d50..86ec6e7d9c 100644 --- a/Modules/ImageExtraction/files.cmake +++ b/Modules/ImageExtraction/files.cmake @@ -1,11 +1,11 @@ -SET(CPP_FILES +set(CPP_FILES mitkExtractDirectedPlaneImageFilter.cpp mitkExtractDirectedPlaneImageFilterNew.cpp mitkExtractImageFilter.cpp ) diff --git a/Modules/ImageStatistics/CMakeLists.txt b/Modules/ImageStatistics/CMakeLists.txt index e45492ad8b..4ed6da03a3 100644 --- a/Modules/ImageStatistics/CMakeLists.txt +++ b/Modules/ImageStatistics/CMakeLists.txt @@ -1,9 +1,9 @@ MITK_CREATE_MODULE( ImageStatistics DEPENDS Mitk ImageExtraction PlanarFigure ) -IF(BUILD_TESTING) +if(BUILD_TESTING) - ADD_SUBDIRECTORY(Testing) + add_subdirectory(Testing) -ENDIF(BUILD_TESTING) +endif(BUILD_TESTING) diff --git a/Modules/ImageStatistics/Testing/files.cmake b/Modules/ImageStatistics/Testing/files.cmake index bca23c3b38..01792788aa 100644 --- a/Modules/ImageStatistics/Testing/files.cmake +++ b/Modules/ImageStatistics/Testing/files.cmake @@ -1,5 +1,5 @@ -SET(MODULE_TESTS +set(MODULE_TESTS mitkImageStatisticsCalculatorTest.cpp mitkPointSetStatisticsCalculatorTest.cpp mitkPointSetDifferenceStatisticsCalculatorTest.cpp ) diff --git a/Modules/ImageStatistics/files.cmake b/Modules/ImageStatistics/files.cmake index c34c7179b3..b28f38e6ea 100644 --- a/Modules/ImageStatistics/files.cmake +++ b/Modules/ImageStatistics/files.cmake @@ -1,13 +1,13 @@ -SET(CPP_FILES +set(CPP_FILES mitkImageStatisticsCalculator.cpp mitkPointSetStatisticsCalculator.cpp mitkPointSetDifferenceStatisticsCalculator.cpp ) -IF ( ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} VERSION_LESS 5.8 ) - MESSAGE(STATUS "Using VTK 5.8 classes from MITK respository") - SET(CPP_FILES ${CPP_FILES} +if( ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} VERSION_LESS 5.8 ) + message(STATUS "Using VTK 5.8 classes from MITK respository") + set(CPP_FILES ${CPP_FILES} vtkImageStencilRaster.cxx vtkLassoStencilSource.cxx ) -ENDIF ( ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} VERSION_LESS 5.8 ) +endif( ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} VERSION_LESS 5.8 ) diff --git a/Modules/InputDevices/CMakeLists.txt b/Modules/InputDevices/CMakeLists.txt index 172b73697c..31c6f2079d 100644 --- a/Modules/InputDevices/CMakeLists.txt +++ b/Modules/InputDevices/CMakeLists.txt @@ -1,2 +1,2 @@ -ADD_SUBDIRECTORY(WiiMote) -ADD_SUBDIRECTORY(SpaceNavigator) \ No newline at end of file +add_subdirectory(WiiMote) +add_subdirectory(SpaceNavigator) \ No newline at end of file diff --git a/Modules/InputDevices/SpaceNavigator/CMakeLists.txt b/Modules/InputDevices/SpaceNavigator/CMakeLists.txt index 38747b1910..f127573896 100644 --- a/Modules/InputDevices/SpaceNavigator/CMakeLists.txt +++ b/Modules/InputDevices/SpaceNavigator/CMakeLists.txt @@ -1,11 +1,11 @@ -IF(WIN32) +if(WIN32) -OPTION(MITK_USE_SPACENAVIGATOR "Use space navigator" OFF) +option(MITK_USE_SPACENAVIGATOR "Use space navigator" OFF) -IF(MITK_USE_SPACENAVIGATOR) +if(MITK_USE_SPACENAVIGATOR) MITK_CREATE_MODULE(mitkSpaceNavigator DEPENDS Mitk ) -ENDIF(MITK_USE_SPACENAVIGATOR) +endif(MITK_USE_SPACENAVIGATOR) -ENDIF(WIN32) \ No newline at end of file +endif(WIN32) \ No newline at end of file diff --git a/Modules/InputDevices/SpaceNavigator/files.cmake b/Modules/InputDevices/SpaceNavigator/files.cmake index eb157f369f..3f404d63b5 100644 --- a/Modules/InputDevices/SpaceNavigator/files.cmake +++ b/Modules/InputDevices/SpaceNavigator/files.cmake @@ -1,6 +1,6 @@ - SET(CPP_FILES + set(CPP_FILES mitkSpaceNavigatorAddOn.cpp mitkSpaceNavigatorDriver.cpp mitkSpaceNavigatorEvent.cpp mitkSpaceNavigatorVtkCameraController.cpp ) \ No newline at end of file diff --git a/Modules/InputDevices/WiiMote/CMakeLists.txt b/Modules/InputDevices/WiiMote/CMakeLists.txt index e3fa9f163b..f1bdab74c3 100644 --- a/Modules/InputDevices/WiiMote/CMakeLists.txt +++ b/Modules/InputDevices/WiiMote/CMakeLists.txt @@ -1,23 +1,23 @@ -IF(WIN32) +if(WIN32) -OPTION(MITK_USE_WIIMOTE "Use wiimote" OFF) +option(MITK_USE_WIIMOTE "Use wiimote" OFF) -IF(MITK_USE_WIIMOTE) +if(MITK_USE_WIIMOTE) # was removed due to the fact that it did not work properly with WDK 7.1.0 and VC8 # has to be added manually into the IDE - more details on www.mitk.org # #find include directory of WDK / DDK and add it to include dirs of module -# FIND_PATH(MITK_WII_WDK_INC "Include Dir DDK or WDK (hidsdi.h)") +# find_path(MITK_WII_WDK_INC "Include Dir DDK or WDK (hidsdi.h)") # #find lib directory of WDK / DDK and add it to additional lib dirs of module -# #FIND_PATH(MITK_WII_WDK_LIB "Library Dir DDK or WDK (hid.lib)") -# FIND_LIBRARY(MITK_WII_WDK_LIB "hid.lib within DDK or WDK") +# #find_path(MITK_WII_WDK_LIB "Library Dir DDK or WDK (hid.lib)") +# find_library(MITK_WII_WDK_LIB "hid.lib within DDK or WDK") MITK_CREATE_MODULE(mitkWiiMote INCLUDE_DIRS wiiyourself #${MITK_WII_WDK_INC} DEPENDS Mitk mitkOpenCVVideoSupport #ADDITIONAL_LIBS "${MITK_WII_WDK_LIB}" ) -ENDIF(MITK_USE_WIIMOTE) +endif(MITK_USE_WIIMOTE) -ENDIF(WIN32) +endif(WIN32) diff --git a/Modules/InputDevices/WiiMote/files.cmake b/Modules/InputDevices/WiiMote/files.cmake index f2923b2a5b..ecba23e7fc 100644 --- a/Modules/InputDevices/WiiMote/files.cmake +++ b/Modules/InputDevices/WiiMote/files.cmake @@ -1,13 +1,13 @@ -SET(CPP_FILES +set(CPP_FILES wiiyourself/wiimote.cpp mitkWiiMoteAddOn.cpp mitkWiiMoteThread.cpp mitkWiiMoteVtkCameraController.cpp mitkWiiMoteButtonEvent.cpp mitkWiiMoteIREvent.cpp mitkWiiMoteCalibrationEvent.cpp mitkWiiMoteAllDataEvent.cpp mitkWiiMoteInteractor.cpp mitkKalmanFilter.cpp ) diff --git a/Modules/IpPicSupport/CMakeLists.txt b/Modules/IpPicSupport/CMakeLists.txt index 88806513de..63900a7b73 100644 --- a/Modules/IpPicSupport/CMakeLists.txt +++ b/Modules/IpPicSupport/CMakeLists.txt @@ -1,7 +1,7 @@ mitkFunctionCheckCompilerFlags("-Wno-deprecated-declarations" CMAKE_CXX_FLAGS) MITK_CREATE_MODULE( IpPicSupport DEPENDS Mitk LegacyAdaptors mitkIpPic ) -ADD_SUBDIRECTORY(Testing) +add_subdirectory(Testing) diff --git a/Modules/IpPicSupport/Testing/CMakeLists.txt b/Modules/IpPicSupport/Testing/CMakeLists.txt index cb65ac81de..a5d9823916 100644 --- a/Modules/IpPicSupport/Testing/CMakeLists.txt +++ b/Modules/IpPicSupport/Testing/CMakeLists.txt @@ -1,7 +1,7 @@ MITK_CREATE_MODULE_TESTS(LABELS MITK-Modules) mitkAddCustomModuleTest(mitkPicFileReaderTest_emptyFile mitkPicFileReaderTest ${CMAKE_CURRENT_SOURCE_DIR}/Data/emptyFile.pic) mitkAddCustomModuleTest(mitkPicFileReaderTest_emptyGzipFile mitkPicFileReaderTest ${CMAKE_CURRENT_SOURCE_DIR}/Data/emptyFile.pic.gz) -ADD_TEST(mitkPicFileReaderTest_emptyGzipFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkPicFileReaderTest ${CMAKE_CURRENT_SOURCE_DIR}/Data/emptyFile.pic.gz) -SET_PROPERTY(TEST mitkPicFileReaderTest_emptyGzipFile PROPERTY LABELS MITK-Modules) +add_test(mitkPicFileReaderTest_emptyGzipFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkPicFileReaderTest ${CMAKE_CURRENT_SOURCE_DIR}/Data/emptyFile.pic.gz) +set_property(TEST mitkPicFileReaderTest_emptyGzipFile PROPERTY LABELS MITK-Modules) diff --git a/Modules/IpPicSupport/Testing/files.cmake b/Modules/IpPicSupport/Testing/files.cmake index 1576f5fc23..0083e52bfa 100644 --- a/Modules/IpPicSupport/Testing/files.cmake +++ b/Modules/IpPicSupport/Testing/files.cmake @@ -1,12 +1,12 @@ -SET(MODULE_IMAGE_TESTS +set(MODULE_IMAGE_TESTS #mitkPicFileIOTest.cpp mitkPicFileWriterTest.cpp mitkPicFileReaderTest.cpp ) -SET(MODULE_TESTIMAGES +set(MODULE_TESTIMAGES US4DCyl.pic.gz Pic3D.pic.gz Pic2DplusT.pic.gz BallBinary30x30x30.pic.gz ) diff --git a/Modules/IpPicSupport/files.cmake b/Modules/IpPicSupport/files.cmake index 942e9eb6f2..416dcb4632 100644 --- a/Modules/IpPicSupport/files.cmake +++ b/Modules/IpPicSupport/files.cmake @@ -1,9 +1,9 @@ -SET(CPP_FILES +set(CPP_FILES mitkIpPicGet.c mitkPicFileWriter.cpp mitkPicFileReader.cpp mitkPicFileIOFactory.cpp mitkPicHelper.cpp mitkPicVolumeTimeSeriesIOFactory.cpp mitkPicVolumeTimeSeriesReader.cpp ) diff --git a/Modules/LegacyAdaptors/files.cmake b/Modules/LegacyAdaptors/files.cmake index 43267beabd..8025810e7e 100644 --- a/Modules/LegacyAdaptors/files.cmake +++ b/Modules/LegacyAdaptors/files.cmake @@ -1,3 +1,3 @@ -SET(CPP_FILES +set(CPP_FILES mitkLegacyAdaptors.cpp ) diff --git a/Modules/MitkExt/CMakeLists.txt b/Modules/MitkExt/CMakeLists.txt index da97b7292a..141d5ad27c 100644 --- a/Modules/MitkExt/CMakeLists.txt +++ b/Modules/MitkExt/CMakeLists.txt @@ -1,28 +1,28 @@ -#IF(WIN32) -# OPTION(MITK_USE_TD_MOUSE "Enable support for 3D Connexion SpaceNavigator" OFF) -#ENDIF(WIN32) +#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) +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 LegacyAdaptors IpPicSupport ipSegmentation mitkIpFunc PlanarFigure ImageStatistics DEPENDS_INTERNAL pic2vtk IIL4MITK ) # 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) +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) +add_subdirectory(Testing) diff --git a/Modules/MitkExt/Testing/files.cmake b/Modules/MitkExt/Testing/files.cmake index 9658f848af..529128a720 100644 --- a/Modules/MitkExt/Testing/files.cmake +++ b/Modules/MitkExt/Testing/files.cmake @@ -1,41 +1,41 @@ -SET(MODULE_TESTS +set(MODULE_TESTS mitkAutoCropImageFilterTest.cpp mitkBoundingObjectCutterTest.cpp mitkContourMapper2DTest.cpp mitkContourTest.cpp mitkCoreExtObjectFactoryTest mitkDataNodeExtTest.cpp mitkExternalToolsTest.cpp mitkMeshTest.cpp mitkMultiStepperTest.cpp mitkOrganTypePropertyTest.cpp mitkPipelineSmartPointerCorrectnessTest.cpp mitkPlaneFitTest.cpp mitkPointLocatorTest.cpp # mitkSegmentationInterpolationTest.cpp # mitkTestTemplate.cpp mitkToolManagerTest.cpp mitkUnstructuredGridTest.cpp mitkSimpleHistogramTest.cpp ) -SET(MODULE_IMAGE_TESTS +set(MODULE_IMAGE_TESTS mitkUnstructuredGridVtkWriterTest.cpp mitkCompressedImageContainerTest.cpp mitkCylindricToCartesianFilterTest.cpp #mitkExtractImageFilterTest.cpp mitkManualSegmentationToSurfaceFilterTest.cpp mitkOverwriteSliceImageFilterTest.cpp mitkSurfaceToImageFilterTest.cpp ) -SET(MODULE_CUSTOM_TESTS +set(MODULE_CUSTOM_TESTS mitkLabeledImageToSurfaceFilterTest.cpp ) -SET(MODULE_TESTIMAGES +set(MODULE_TESTIMAGES US4DCyl.nrrd Pic3D.nrrd Pic2DplusT.nrrd BallBinary30x30x30.nrrd Png2D-bw.png binary.stl ball.stl ) diff --git a/Modules/MitkExt/files.cmake b/Modules/MitkExt/files.cmake index 5ff607ed9e..562eec0b5f 100644 --- a/Modules/MitkExt/files.cmake +++ b/Modules/MitkExt/files.cmake @@ -1,200 +1,200 @@ -SET(CPP_FILES +set(CPP_FILES Algorithms/mitkImageToContourFilter.cpp Algorithms/mitkReduceContourSetFilter.cpp Algorithms/mitkComputeContourSetNormalsFilter.cpp Algorithms/mitkCreateDistanceImageFromSurfaceFilter.cpp Algorithms/mitkMaskAndCutRoiImageFilter.cpp Algorithms/mitkBoundingObjectToSegmentationFilter.cpp Algorithms/vtkPointSetSlicer.cxx Algorithms/mitkCoreExtObjectFactory.cpp Algorithms/mitkAngleCorrectByPointFilter.cpp Algorithms/mitkAutoCropImageFilter.cpp Algorithms/mitkBoundingObjectCutter.cpp Algorithms/mitkCalculateSegmentationVolume.cpp Algorithms/mitkContourSetToPointSetFilter.cpp Algorithms/mitkContourUtils.cpp Algorithms/mitkCorrectorAlgorithm.cpp Algorithms/mitkCylindricToCartesianFilter.cpp Algorithms/mitkDiffImageApplier.cpp Algorithms/mitkDopplerToStrainRateFilter.cpp Algorithms/mitkGeometryClipImageFilter.cpp Algorithms/mitkGeometryDataSource.cpp Algorithms/mitkHeightFieldSurfaceClipImageFilter.cpp Algorithms/mitkImageToLookupTableFilter.cpp Algorithms/mitkImageToSurfaceFilter.cpp Algorithms/mitkInterpolateLinesFilter.cpp Algorithms/mitkLabeledImageToSurfaceFilter.cpp Algorithms/mitkLabeledImageVolumeCalculator.cpp Algorithms/mitkLookupTableSource.cpp Algorithms/mitkManualSegmentationToSurfaceFilter.cpp Algorithms/mitkMaskImageFilter.cpp Algorithms/mitkMeshSource.cpp Algorithms/mitkNonBlockingAlgorithm.cpp Algorithms/mitkOverwriteSliceImageFilter.cpp Algorithms/mitkOverwriteDirectedPlaneImageFilter.cpp Algorithms/mitkPadImageFilter.cpp Algorithms/mitkPlaneCutFilter.cpp Algorithms/mitkPlaneFit.cpp Algorithms/mitkPlanesPerpendicularToLinesFilter.cpp Algorithms/mitkPointLocator.cpp Algorithms/mitkPointSetToCurvedGeometryFilter.cpp Algorithms/mitkPointSetToGeometryDataFilter.cpp Algorithms/mitkPointSetIndexToWorldTransformFilter.cpp Algorithms/mitkSurfaceIndexToWorldTransformFilter.cpp Algorithms/mitkPolygonToRingFilter.cpp Algorithms/mitkProbeFilter.cpp Algorithms/mitkSegmentationSink.cpp Algorithms/mitkShapeBasedInterpolationAlgorithm.cpp Algorithms/mitkShowSegmentationAsSmoothedSurface.cpp Algorithms/mitkShowSegmentationAsSurface.cpp Algorithms/mitkSimpleHistogram.cpp Algorithms/mitkSimpleUnstructuredGridHistogram.cpp Algorithms/mitkSurfaceToImageFilter.cpp Algorithms/mitkUnstructuredGridHistogram.cpp Algorithms/mitkUnstructuredGridSource.cpp Algorithms/mitkVolumeVisualizationImagePreprocessor.cpp Controllers/mitkMovieGenerator.cpp Controllers/mitkMultiStepper.cpp Controllers/mitkSegmentationInterpolationController.cpp Controllers/mitkSurfaceInterpolationController.cpp Controllers/mitkToolManager.cpp DataManagement/mitkAffineTransformationOperation.cpp DataManagement/mitkApplyDiffImageOperation.cpp DataManagement/mitkBoundingObject.cpp DataManagement/mitkBoundingObjectGroup.cpp DataManagement/mitkCellOperation.cpp DataManagement/mitkColorConversions.cpp DataManagement/mitkColorSequence.cpp DataManagement/mitkColorSequenceCycleH.cpp DataManagement/mitkColorSequenceHalfTones.cpp DataManagement/mitkColorSequenceRainbow.cpp DataManagement/mitkCompressedImageContainer.cpp DataManagement/mitkCone.cpp DataManagement/mitkContour.cpp DataManagement/mitkContourSet.cpp DataManagement/mitkCuboid.cpp DataManagement/mitkCylinder.cpp DataManagement/mitkDataStorageSelection.cpp DataManagement/mitkDelegateManager.cpp DataManagement/mitkDrawOperation.cpp DataManagement/mitkEllipsoid.cpp DataManagement/mitkExternAbstractTransformGeometry.cpp DataManagement/mitkExtrudedContour.cpp DataManagement/mitkFrameOfReferenceUIDManager.cpp DataManagement/mitkGridRepresentationProperty.cpp DataManagement/mitkGridVolumeMapperProperty.cpp DataManagement/mitkItkBaseDataAdapter.cpp DataManagement/mitkLabeledImageLookupTable.cpp DataManagement/mitkLineOperation.cpp DataManagement/mitkMesh.cpp DataManagement/mitkObjectSet.cpp DataManagement/mitkOrganTypeProperty.cpp DataManagement/mitkPlaneLandmarkProjector.cpp DataManagement/mitkPlane.cpp DataManagement/mitkPropertyManager.cpp DataManagement/mitkPropertyObserver.cpp DataManagement/mitkSeedsImage.cpp DataManagement/mitkSeedsImageLookupTableSource.cpp DataManagement/mitkSphereLandmarkProjector.cpp # DataManagement/mitkUSLookupTableSource.cpp DataManagement/mitkUnstructuredGrid.cpp DataManagement/mitkVideoSource.cpp DataManagement/vtkObjectSet.cpp IO/mitkObjFileIOFactory.cpp IO/mitkObjFileReader.cpp IO/mitkPACSPlugin.cpp IO/mitkParRecFileIOFactory.cpp IO/mitkParRecFileReader.cpp IO/mitkStlVolumeTimeSeriesIOFactory.cpp IO/mitkStlVolumeTimeSeriesReader.cpp IO/mitkUnstructuredGridVtkWriter.cpp IO/mitkUnstructuredGridVtkWriterFactory.cpp IO/mitkVtkUnstructuredGridIOFactory.cpp IO/mitkVtkUnstructuredGridReader.cpp IO/mitkVtkVolumeTimeSeriesIOFactory.cpp IO/mitkVtkVolumeTimeSeriesReader.cpp Interactions/mitkAutoSegmentationTool.cpp Interactions/mitkConferenceEventMapper.cpp Interactions/mitkConnectPointsInteractor.cpp Interactions/mitkContourInteractor.cpp Interactions/mitkContourTool.cpp #Interactions/mitkCoordinateSupplier.cpp #Interactions/mitkDisplayCoordinateOperation.cpp #Interactions/mitkDisplayInteractor.cpp Interactions/mitkAffineInteractor3D.cpp Interactions/mitkDisplayPointSetInteractor.cpp #Interactions/mitkDisplayVectorInteractor.cpp Interactions/mitkExtrudedContourInteractor.cpp Interactions/mitkFeedbackContourTool.cpp Interactions/mitkInteractionDebug.cpp Interactions/mitkInteractionDebugger.cpp Interactions/mitkPaintbrushTool.cpp Interactions/mitkPointInteractor.cpp Interactions/mitkPointSelectorInteractor.cpp #Interactions/mitkPositionTracker.cpp Interactions/mitkSeedsInteractor.cpp Interactions/mitkSegTool2D.cpp Interactions/mitkSegmentationsProcessingTool.cpp Interactions/mitkSetRegionTool.cpp Interactions/mitkSocketClient.cpp Interactions/mitkSurfaceDeformationInteractor3D.cpp Interactions/mitkSurfaceInteractor.cpp Interactions/mitkTool.cpp Interactions/mitkAddContourTool.cpp Interactions/mitkAutoCropTool.cpp Interactions/mitkBinaryThresholdTool.cpp Interactions/mitkCalculateGrayValueStatisticsTool.cpp Interactions/mitkCalculateVolumetryTool.cpp Interactions/mitkCorrectorTool2D.cpp Interactions/mitkCreateSurfaceTool.cpp Interactions/mitkEraseRegionTool.cpp Interactions/mitkFillRegionTool.cpp Interactions/mitkRegionGrowingTool.cpp Interactions/mitkSubtractContourTool.cpp Interactions/mitkDrawPaintbrushTool.cpp Interactions/mitkErasePaintbrushTool.cpp Interactions/mitkMorphologicTool.cpp Interactions/mitkErodeTool.cpp Interactions/mitkDilateTool.cpp Interactions/mitkOpeningTool.cpp Interactions/mitkClosingTool.cpp Interactions/mitkBinaryThresholdULTool.cpp Interactions/mitkPixelManipulationTool.cpp Interactions/mitkRegionGrow3DTool.cpp Rendering/mitkContourMapper2D.cpp Rendering/mitkContourSetMapper2D.cpp Rendering/mitkContourSetVtkMapper3D.cpp Rendering/mitkContourVtkMapper3D.cpp Rendering/mitkEnhancedPointSetVtkMapper3D.cpp Rendering/mitkImageBackground2D.cpp Rendering/mitkLineMapper2D.cpp # Rendering/mitkLineVtkMapper3D.cpp Rendering/mitkMeshMapper2D.cpp Rendering/mitkMeshVtkMapper3D.cpp Rendering/mitkNativeRenderWindowInteractor.cpp Rendering/mitkSplineMapper2D.cpp Rendering/mitkSplineVtkMapper3D.cpp Rendering/mitkUnstructuredGridMapper2D.cpp Rendering/mitkUnstructuredGridVtkMapper3D.cpp Rendering/mitkVectorImageMapper2D.cpp Rendering/vtkUnstructuredGridMapper.cpp Rendering/vtkMaskedGlyph2D.cpp Rendering/vtkMaskedGlyph3D.cpp Rendering/vtkMitkVolumeTextureMapper3D.cpp Rendering/vtkMitkOpenGLVolumeTextureMapper3D.cpp Rendering/mitkGPUVolumeMapper3D.cpp Rendering/vtkMitkGPUVolumeRayCastMapper.cpp Rendering/vtkMitkOpenGLGPUVolumeRayCastMapper.cpp Rendering/vtkMitkOpenGLGPUVolumeRayCastMapperShaders.cpp ) -IF(WIN32 AND NOT MINGW) - SET(CPP_FILES +if(WIN32 AND NOT MINGW) + set(CPP_FILES Controllers/mitkMovieGeneratorWin32.cpp ${CPP_FILES} ) -ENDIF(WIN32 AND NOT MINGW) +endif(WIN32 AND NOT MINGW) diff --git a/Modules/MitkExt/moduleIncludeConf.cmake.in b/Modules/MitkExt/moduleIncludeConf.cmake.in index 88bda8fb40..4285a273db 100644 --- a/Modules/MitkExt/moduleIncludeConf.cmake.in +++ b/Modules/MitkExt/moduleIncludeConf.cmake.in @@ -1,5 +1,5 @@ -SET(@MODULE_NAME@_INCLUDE_DIRS "@MODULE_INCLUDE_DIRS@") -SET(@MODULE_NAME@_LIBRARIES "@MODULE_LIBRARIES@") +set(@MODULE_NAME@_INCLUDE_DIRS "@MODULE_INCLUDE_DIRS@") +set(@MODULE_NAME@_LIBRARIES "@MODULE_LIBRARIES@") -LIST(APPEND MITK_INCLUDE_DIRS ${@MODULE_NAME@_INCLUDE_DIRS}) -LIST(APPEND MITK_LIBRARIES ${@MODULE_NAME@_LIBRARIES}) \ No newline at end of file +list(APPEND MITK_INCLUDE_DIRS ${@MODULE_NAME@_INCLUDE_DIRS}) +list(APPEND MITK_LIBRARIES ${@MODULE_NAME@_LIBRARIES}) \ No newline at end of file diff --git a/Modules/OpenCVVideoSupport/CMakeLists.txt b/Modules/OpenCVVideoSupport/CMakeLists.txt index 3c134e5a21..8279580c0d 100644 --- a/Modules/OpenCVVideoSupport/CMakeLists.txt +++ b/Modules/OpenCVVideoSupport/CMakeLists.txt @@ -1,25 +1,25 @@ -IF(MITK_USE_OpenCV) +if(MITK_USE_OpenCV) - SET(dependencies OpenCV) - IF(MITK_USE_videoInput) - SET(dependencies ${dependencies} videoInput) - ENDIF(MITK_USE_videoInput) + 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} ADDITIONAL_LIBS ${OPENCVVIDEOSUPPORT_ADDITIONAL_LIBS} EXPORT_DEFINE MITK_OPENCVVIDEOSUPPORT_EXPORT ) - IF(MITK_USE_QT) - ADD_SUBDIRECTORY(UI) - ENDIF(MITK_USE_QT) + if(MITK_USE_QT) + add_subdirectory(UI) + endif(MITK_USE_QT) - IF(BUILD_TESTING) - ADD_SUBDIRECTORY(Testing) - ENDIF(BUILD_TESTING) + if(BUILD_TESTING) + add_subdirectory(Testing) + endif(BUILD_TESTING) -ENDIF(MITK_USE_OpenCV) +endif(MITK_USE_OpenCV) diff --git a/Modules/OpenCVVideoSupport/Testing/files.cmake b/Modules/OpenCVVideoSupport/Testing/files.cmake index 01d7c6c9d8..ab90f6e626 100644 --- a/Modules/OpenCVVideoSupport/Testing/files.cmake +++ b/Modules/OpenCVVideoSupport/Testing/files.cmake @@ -1,11 +1,11 @@ -SET(MODULE_TESTS +set(MODULE_TESTS ) -SET(MODULE_IMAGE_TESTS +set(MODULE_IMAGE_TESTS mitkImageToOpenCVImageFilterTest.cpp ) # list of images for which the tests are run -SET(MODULE_TESTIMAGES +set(MODULE_TESTIMAGES Png2D-bw.png ) \ No newline at end of file diff --git a/Modules/OpenCVVideoSupport/UI/CMakeLists.txt b/Modules/OpenCVVideoSupport/UI/CMakeLists.txt index 7e195e3ab2..0d721d3cca 100644 --- a/Modules/OpenCVVideoSupport/UI/CMakeLists.txt +++ b/Modules/OpenCVVideoSupport/UI/CMakeLists.txt @@ -1,11 +1,11 @@ MITK_CREATE_MODULE(mitkOpenCVVideoSupportUI DEPENDS MitkExt QmitkExt mitkOpenCVVideoSupport PACKAGE_DEPENDS QT QT_MODULE EXPORT_DEFINE MITK_OPENCVVIDEOSUPPORTUI_EXPORT ) # no tests yet -#IF(BUILD_TESTING) - #ADD_SUBDIRECTORY(Testing) -#ENDIF(BUILD_TESTING) \ No newline at end of file +#if(BUILD_TESTING) + #add_subdirectory(Testing) +#endif(BUILD_TESTING) \ No newline at end of file diff --git a/Modules/OpenCVVideoSupport/UI/files.cmake b/Modules/OpenCVVideoSupport/UI/files.cmake index aa1ff0a31a..aee20cfa2f 100644 --- a/Modules/OpenCVVideoSupport/UI/files.cmake +++ b/Modules/OpenCVVideoSupport/UI/files.cmake @@ -1,15 +1,15 @@ -SET(CPP_FILES +set(CPP_FILES QmitkOpenCVVideoControls.cpp ) -SET(UI_FILES +set(UI_FILES QmitkOpenCVVideoControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES QmitkOpenCVVideoControls.h ) -SET(QRC_FILES +set(QRC_FILES OpenCVVideoSupportUI.qrc ) \ No newline at end of file diff --git a/Modules/OpenCVVideoSupport/files.cmake b/Modules/OpenCVVideoSupport/files.cmake index 1d46576780..fd1990a304 100644 --- a/Modules/OpenCVVideoSupport/files.cmake +++ b/Modules/OpenCVVideoSupport/files.cmake @@ -1,14 +1,14 @@ -SET(CPP_FILES +set(CPP_FILES mitkMovieGeneratorOpenCV.cpp mitkUndistortCameraImage.cpp mitkOpenCVVideoSource.cpp mitkOpenCVToMitkImageFilter.cpp mitkImageToOpenCVImageFilter.cpp ) -IF(MITK_USE_videoInput) - SET(CPP_FILES ${CPP_FILES} +if(MITK_USE_videoInput) + set(CPP_FILES ${CPP_FILES} mitkVideoInputSource.cpp ) -ENDIF(MITK_USE_videoInput) \ No newline at end of file +endif(MITK_USE_videoInput) \ No newline at end of file diff --git a/Modules/Overlays/CMakeLists.txt b/Modules/Overlays/CMakeLists.txt index b8e950783b..118081b25b 100644 --- a/Modules/Overlays/CMakeLists.txt +++ b/Modules/Overlays/CMakeLists.txt @@ -1,7 +1,7 @@ MITK_CREATE_MODULE( Overlays DEPENDS Qmitk PACKAGE_DEPENDS QT QVTK QT_MODULE ) -#ADD_SUBDIRECTORY(Testing) +#add_subdirectory(Testing) diff --git a/Modules/Overlays/files.cmake b/Modules/Overlays/files.cmake index 207d244c2b..1d3b3feef8 100644 --- a/Modules/Overlays/files.cmake +++ b/Modules/Overlays/files.cmake @@ -1,14 +1,14 @@ -SET(CPP_FILES +set(CPP_FILES QmitkOverlay.cpp QmitkOverlayController.cpp QmitkScalarBar.cpp QmitkScalarBarOverlay.cpp QmitkTextOverlay.cpp ) -SET(MOC_H_FILES +set(MOC_H_FILES QmitkOverlay.h QmitkOverlayController.h QmitkScalarBar.h QmitkScalarBarOverlay.h ) \ No newline at end of file diff --git a/Modules/PlanarFigure/CMakeLists.txt b/Modules/PlanarFigure/CMakeLists.txt index 8c1471105c..05f7ef29ce 100644 --- a/Modules/PlanarFigure/CMakeLists.txt +++ b/Modules/PlanarFigure/CMakeLists.txt @@ -1,6 +1,6 @@ MITK_CREATE_MODULE( PlanarFigure INCLUDE_DIRS Algorithms DataManagement Interactions IO Rendering DEPENDS Mitk SceneSerializationBase ) -ADD_SUBDIRECTORY(Testing) +add_subdirectory(Testing) diff --git a/Modules/PlanarFigure/Testing/files.cmake b/Modules/PlanarFigure/Testing/files.cmake index 91e5321fe4..a706fdc9b2 100644 --- a/Modules/PlanarFigure/Testing/files.cmake +++ b/Modules/PlanarFigure/Testing/files.cmake @@ -1,8 +1,8 @@ -SET(MODULE_TESTS +set(MODULE_TESTS mitkPlanarCrossTest.cpp mitkPlanarPolygonTest.cpp mitkPlanarSubdivisionPolygonTest.cpp mitkPlanarFigureIOTest.cpp mitkPlanarFigureObjectFactoryTest.cpp mitkPlanarArrowTest.cpp ) diff --git a/Modules/PlanarFigure/files.cmake b/Modules/PlanarFigure/files.cmake index 4572a68d2c..e07207542e 100644 --- a/Modules/PlanarFigure/files.cmake +++ b/Modules/PlanarFigure/files.cmake @@ -1,25 +1,25 @@ -SET(CPP_FILES +set(CPP_FILES Algorithms/mitkImageToPlanarFigureFilter.cpp Algorithms/mitkPlanarFigureObjectFactory.cpp Algorithms/mitkPlanarFigureSource.cpp Algorithms/mitkPlanarFigureToPlanarFigureFilter.cpp DataManagement/mitkPlanarAngle.cpp DataManagement/mitkPlanarCircle.cpp DataManagement/mitkPlanarCross.cpp DataManagement/mitkPlanarFigure.cpp DataManagement/mitkPlanarFourPointAngle.cpp DataManagement/mitkPlanarLine.cpp DataManagement/mitkPlanarArrow.cpp DataManagement/mitkPlanarPolygon.cpp DataManagement/mitkPlanarSubdivisionPolygon.cpp DataManagement/mitkPlanarRectangle.cpp DataManagement/mitkPlanarFigureControlPointStyleProperty.cpp IO/mitkPlanarFigureIOFactory.cpp IO/mitkPlanarFigureReader.cpp IO/mitkPlanarFigureWriter.cpp IO/mitkPlanarFigureWriterFactory.cpp IO/mitkPlanarFigureSerializer.cpp IO/mitkPlanarFigureSubclassesSerializer.cpp Interactions/mitkPlanarFigureInteractor.cpp Rendering/mitkPlanarFigureMapper2D.cpp ) diff --git a/Modules/Qmitk/files.cmake b/Modules/Qmitk/files.cmake index de4e751642..e43d76ed01 100644 --- a/Modules/Qmitk/files.cmake +++ b/Modules/Qmitk/files.cmake @@ -1,63 +1,63 @@ -SET(CPP_FILES +set(CPP_FILES QmitkApplicationCursor.cpp QmitkEnums.h QmitkCustomVariants.h QmitkDataStorageComboBox.cpp QmitkDataStorageListModel.cpp QmitkDataStorageTableModel.cpp QmitkDataStorageTreeModel.cpp QmitkEventAdapter.cpp QmitkLevelWindowPresetDefinitionDialog.cpp QmitkLevelWindowRangeChangeDialog.cpp QmitkLevelWindowWidgetContextMenu.cpp QmitkLevelWindowWidget.cpp QmitkLineEditLevelWindowWidget.cpp QmitkMemoryUsageIndicatorView.cpp QmitkNodeDescriptor.cpp QmitkNodeDescriptorManager.cpp QmitkRenderWindowMenu.cpp QmitkProgressBar.cpp QmitkPropertiesTableEditor.cpp QmitkPropertiesTableModel.cpp QmitkPropertyDelegate.cpp QmitkRegisterClasses.cpp QmitkRenderingManager.cpp QmitkRenderingManagerFactory.cpp QmitkRenderWindow.cpp QmitkSliderLevelWindowWidget.cpp QmitkStdMultiWidget.cpp QmitkMouseModeSwitcher.cpp ) -SET(MOC_H_FILES +set(MOC_H_FILES QmitkDataStorageComboBox.h QmitkDataStorageTableModel.h QmitkLevelWindowPresetDefinitionDialog.h QmitkLevelWindowRangeChangeDialog.h QmitkLevelWindowWidgetContextMenu.h QmitkLevelWindowWidget.h QmitkLineEditLevelWindowWidget.h QmitkMemoryUsageIndicatorView.h QmitkNodeDescriptor.h QmitkNodeDescriptorManager.h QmitkRenderWindowMenu.h QmitkProgressBar.h QmitkPropertiesTableEditor.h QmitkPropertyDelegate.h QmitkRenderingManager.h QmitkRenderWindow.h QmitkSliderLevelWindowWidget.h QmitkStdMultiWidget.h QmitkMouseModeSwitcher.h ) -SET(UI_FILES +set(UI_FILES QmitkLevelWindowPresetDefinition.ui QmitkLevelWindowWidget.ui QmitkLevelWindowRangeChange.ui QmitkMemoryUsageIndicator.ui ) -SET(QRC_FILES +set(QRC_FILES Qmitk.qrc ) diff --git a/Modules/QmitkExt/files.cmake b/Modules/QmitkExt/files.cmake index 79569aba66..ca5ce273e1 100644 --- a/Modules/QmitkExt/files.cmake +++ b/Modules/QmitkExt/files.cmake @@ -1,262 +1,262 @@ -SET(CPP_FILES +set(CPP_FILES QmitkApplicationBase/QmitkCommonFunctionality.cpp #QmitkModels/QmitkDataStorageListModel.cpp #QmitkModels/QmitkPropertiesTableModel.cpp #QmitkModels/QmitkDataStorageTreeModel.cpp #QmitkModels/QmitkDataStorageTableModel.cpp #QmitkModels/QmitkPropertyDelegate.cpp #QmitkModels/QmitkPointListModel.cpp #QmitkAlgorithmFunctionalityComponent.cpp #QmitkBaseAlgorithmComponent.cpp QmitkAboutDialog/QmitkAboutDialog.cpp #QmitkFunctionalityComponents/QmitkSurfaceCreatorComponent.cpp #QmitkFunctionalityComponents/QmitkPixelGreyValueManipulatorComponent.cpp #QmitkFunctionalityComponents/QmitkConnectivityFilterComponent.cpp #QmitkFunctionalityComponents/QmitkImageCropperComponent.cpp #QmitkFunctionalityComponents/QmitkSeedPointSetComponent.cpp #QmitkFunctionalityComponents/QmitkSurfaceTransformerComponent.cpp QmitkPropertyObservers/QmitkBasePropertyView.cpp QmitkPropertyObservers/QmitkBoolPropertyWidget.cpp QmitkPropertyObservers/QmitkColorPropertyEditor.cpp QmitkPropertyObservers/QmitkColorPropertyView.cpp QmitkPropertyObservers/QmitkEnumerationPropertyWidget.cpp QmitkPropertyObservers/QmitkNumberPropertyEditor.cpp QmitkPropertyObservers/QmitkNumberPropertyView.cpp QmitkPropertyObservers/QmitkPropertyViewFactory.cpp QmitkPropertyObservers/QmitkStringPropertyEditor.cpp QmitkPropertyObservers/QmitkStringPropertyOnDemandEdit.cpp QmitkPropertyObservers/QmitkStringPropertyView.cpp QmitkPropertyObservers/QmitkNumberPropertySlider.cpp QmitkPropertyObservers/QmitkUGCombinedRepresentationPropertyWidget.cpp qclickablelabel.cpp #QmitkAbortEventFilter.cpp # QmitkApplicationCursor.cpp QmitkCallbackFromGUIThread.cpp QmitkEditPointDialog.cpp QmitkExtRegisterClasses.cpp QmitkFileChooser.cpp # QmitkRenderingManager.cpp # QmitkRenderingManagerFactory.cpp # QmitkRenderWindow.cpp # QmitkEventAdapter.cpp QmitkFloatingPointSpanSlider.cpp QmitkColorTransferFunctionCanvas.cpp QmitkSlicesInterpolator.cpp QmitkStandardViews.cpp QmitkStepperAdapter.cpp # QmitkLineEditLevelWindowWidget.cpp # mitkSliderLevelWindowWidget.cpp # QmitkLevelWindowWidget.cpp # QmitkPointListWidget.cpp # QmitkPointListView.cpp QmitkPiecewiseFunctionCanvas.cpp QmitkSliderNavigatorWidget.cpp QmitkTransferFunctionCanvas.cpp QmitkCrossWidget.cpp #QmitkLevelWindowRangeChangeDialog.cpp #QmitkLevelWindowPresetDefinitionDialog.cpp # QmitkLevelWindowWidgetContextMenu.cpp QmitkSliceWidget.cpp # QmitkStdMultiWidget.cpp QmitkTransferFunctionWidget.cpp QmitkTransferFunctionGeneratorWidget.cpp QmitkSelectableGLWidget.cpp QmitkToolReferenceDataSelectionBox.cpp QmitkToolWorkingDataSelectionBox.cpp QmitkToolGUIArea.cpp QmitkToolSelectionBox.cpp # QmitkPropertyListPopup.cpp QmitkToolGUI.cpp QmitkNewSegmentationDialog.cpp QmitkPaintbrushToolGUI.cpp QmitkDrawPaintbrushToolGUI.cpp QmitkErasePaintbrushToolGUI.cpp QmitkBinaryThresholdToolGUI.cpp QmitkCalculateGrayValueStatisticsToolGUI.cpp QmitkCopyToClipBoardDialog.cpp # QmitkMaterialEditor.cpp # QmitkMaterialShowcase.cpp # QmitkPropertiesTableEditor.cpp QmitkPrimitiveMovieNavigatorWidget.cpp # QmitkDataStorageComboBox.cpp QmitkHistogram.cpp QmitkHistogramWidget.cpp QmitkPlotWidget.cpp QmitkPlotDialog.cpp QmitkPointListModel.cpp QmitkPointListView.cpp QmitkPointListWidget.cpp QmitkPointListViewWidget.cpp QmitkCorrespondingPointSetsView.cpp QmitkCorrespondingPointSetsModel.cpp QmitkCorrespondingPointSetsWidget.cpp QmitkVideoBackground.cpp QmitkHotkeyLineEdit.cpp QmitkErodeToolGUI.cpp QmitkDilateToolGUI.cpp QmitkMorphologicToolGUI.cpp QmitkOpeningToolGUI.cpp QmitkClosingToolGUI.cpp QmitkBinaryThresholdULToolGUI.cpp QmitkPixelManipulationToolGUI.cpp QmitkRegionGrow3DToolGUI.cpp QmitkToolRoiDataSelectionBox.cpp QmitkBoundingObjectWidget.cpp QmitkAdaptiveRegionGrowingWidget.cpp QmitkModuleTableModel.cpp QmitkModulesDialog.cpp ) -IF ( NOT ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION} VERSION_LESS 5.4.0 ) - SET(CPP_FILES +if( NOT ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION} VERSION_LESS 5.4.0 ) + set(CPP_FILES ${CPP_FILES} QmitkVtkHistogramWidget.cpp QmitkVtkLineProfileWidget.cpp ) -ENDIF() +endif() -IF (NOT APPLE) -SET(CPP_FILES +if(NOT APPLE) +set(CPP_FILES ${CPP_FILES} QmitkBaseComponent.cpp QmitkBaseFunctionalityComponent.cpp QmitkFunctionalityComponentContainer.cpp QmitkFunctionalityComponents/QmitkThresholdComponent.cpp ) -ENDIF() +endif() QT4_ADD_RESOURCES(CPP_FILES resources/QmitkResources.qrc) -SET(MOC_H_FILES +set(MOC_H_FILES QmitkPropertyObservers/QmitkBasePropertyView.h QmitkPropertyObservers/QmitkBoolPropertyWidget.h QmitkPropertyObservers/QmitkColorPropertyEditor.h QmitkPropertyObservers/QmitkColorPropertyView.h QmitkPropertyObservers/QmitkEnumerationPropertyWidget.h QmitkPropertyObservers/QmitkNumberPropertyEditor.h QmitkPropertyObservers/QmitkNumberPropertyView.h QmitkPropertyObservers/QmitkStringPropertyEditor.h QmitkPropertyObservers/QmitkStringPropertyOnDemandEdit.h QmitkPropertyObservers/QmitkStringPropertyView.h QmitkPropertyObservers/QmitkNumberPropertySlider.h QmitkPropertyObservers/QmitkUGCombinedRepresentationPropertyWidget.h # QmitkFunctionalityComponents/QmitkSurfaceCreatorComponent.h #QmitkFunctionalityComponents/QmitkPixelGreyValueManipulatorComponent.h # QmitkFunctionalityComponents/QmitkConnectivityFilterComponent.h # QmitkFunctionalityComponents/QmitkImageCropperComponent.h # QmitkFunctionalityComponents/QmitkSeedPointSetComponent.h # QmitkFunctionalityComponents/QmitkSurfaceTransformerComponent.h qclickablelabel.h QmitkCallbackFromGUIThread.h QmitkEditPointDialog.h #QmitkAlgorithmFunctionalityComponent.h #QmitkBaseAlgorithmComponent.h QmitkStandardViews.h QmitkStepperAdapter.h QmitkSliderNavigatorWidget.h QmitkSliceWidget.h QmitkSlicesInterpolator.h QmitkColorTransferFunctionCanvas.h QmitkPiecewiseFunctionCanvas.h QmitkTransferFunctionCanvas.h QmitkFloatingPointSpanSlider.h QmitkCrossWidget.h QmitkTransferFunctionWidget.h QmitkTransferFunctionGeneratorWidget.h QmitkToolGUIArea.h QmitkToolGUI.h QmitkToolReferenceDataSelectionBox.h QmitkToolWorkingDataSelectionBox.h QmitkToolSelectionBox.h # QmitkPropertyListPopup.h #QmitkSelectableGLWidget.h QmitkNewSegmentationDialog.h QmitkPaintbrushToolGUI.h QmitkDrawPaintbrushToolGUI.h QmitkErasePaintbrushToolGUI.h QmitkBinaryThresholdToolGUI.h QmitkCalculateGrayValueStatisticsToolGUI.h QmitkCopyToClipBoardDialog.h QmitkPrimitiveMovieNavigatorWidget.h QmitkPlotWidget.h QmitkPointListModel.h QmitkPointListView.h QmitkPointListWidget.h QmitkPointListViewWidget.h QmitkCorrespondingPointSetsView.h QmitkCorrespondingPointSetsModel.h QmitkCorrespondingPointSetsWidget.h QmitkHistogramWidget.h QmitkVideoBackground.h QmitkFileChooser.h QmitkHotkeyLineEdit.h QmitkAboutDialog/QmitkAboutDialog.h QmitkErodeToolGUI.h QmitkDilateToolGUI.h QmitkMorphologicToolGUI.h QmitkOpeningToolGUI.h QmitkClosingToolGUI.h QmitkBinaryThresholdULToolGUI.h QmitkPixelManipulationToolGUI.h QmitkRegionGrow3DToolGUI.h QmitkToolRoiDataSelectionBox.h QmitkBoundingObjectWidget.h QmitkPlotWidget.h QmitkAdaptiveRegionGrowingWidget.h ) -IF ( NOT ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION} VERSION_LESS 5.4.0 ) - SET(MOC_H_FILES +if( NOT ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION} VERSION_LESS 5.4.0 ) + set(MOC_H_FILES ${MOC_H_FILES} QmitkVtkHistogramWidget.h QmitkVtkLineProfileWidget.h ) -ENDIF() +endif() -IF (NOT APPLE) -SET(MOC_H_FILES +if(NOT APPLE) +set(MOC_H_FILES ${MOC_H_FILES} QmitkBaseComponent.h QmitkBaseFunctionalityComponent.h QmitkFunctionalityComponentContainer.h QmitkFunctionalityComponents/QmitkThresholdComponent.h ) -ENDIF() +endif() -SET(UI_FILES +set(UI_FILES QmitkSliderNavigator.ui # QmitkLevelWindowRangeChange.ui # QmitkLevelWindowPresetDefinition.ui # QmitkLevelWindowWidget.ui QmitkSliceWidget.ui QmitkTransferFunctionWidget.ui QmitkTransferFunctionGeneratorWidget.ui QmitkSelectableGLWidget.ui QmitkPrimitiveMovieNavigatorWidget.ui QmitkFunctionalityComponentContainerControls.ui QmitkFunctionalityComponents/QmitkThresholdComponentControls.ui QmitkAboutDialog/QmitkAboutDialogGUI.ui QmitkAdaptiveRegionGrowingWidgetControls.ui ) -SET(QRC_FILES +set(QRC_FILES QmitkExt.qrc ) diff --git a/Modules/QmitkExt/moduleIncludeConf.cmake.in b/Modules/QmitkExt/moduleIncludeConf.cmake.in index f4ec7d2e0e..ed5cb2a345 100644 --- a/Modules/QmitkExt/moduleIncludeConf.cmake.in +++ b/Modules/QmitkExt/moduleIncludeConf.cmake.in @@ -1,6 +1,6 @@ -SET(@MODULE_NAME@_INCLUDE_DIRS "@MODULE_INCLUDE_DIRS@") -SET(@MODULE_NAME@_LIBRARIES "@MODULE_LIBRARIES@") +set(@MODULE_NAME@_INCLUDE_DIRS "@MODULE_INCLUDE_DIRS@") +set(@MODULE_NAME@_LIBRARIES "@MODULE_LIBRARIES@") -LIST(APPEND QMITK_INCLUDE_DIRS ${@MODULE_NAME@_INCLUDE_DIRS}) -LIST(APPEND QMITK_LIBRARIES ${@MODULE_NAME@_LIBRARIES}) +list(APPEND QMITK_INCLUDE_DIRS ${@MODULE_NAME@_INCLUDE_DIRS}) +list(APPEND QMITK_LIBRARIES ${@MODULE_NAME@_LIBRARIES}) diff --git a/Modules/RigidRegistration/CMakeLists.txt b/Modules/RigidRegistration/CMakeLists.txt index 592908debc..9be694ca5e 100644 --- a/Modules/RigidRegistration/CMakeLists.txt +++ b/Modules/RigidRegistration/CMakeLists.txt @@ -1,7 +1,7 @@ MITK_CREATE_MODULE(MitkRigidRegistration SUBPROJECTS MITK-Registration DEPENDS Mitk EXPORT_DEFINE MITK_RIGIDREGISTRATION_EXPORT ) -ADD_SUBDIRECTORY(Testing) +add_subdirectory(Testing) diff --git a/Modules/RigidRegistration/Testing/files.cmake b/Modules/RigidRegistration/Testing/files.cmake index 89daed0ad0..46ad375f7e 100644 --- a/Modules/RigidRegistration/Testing/files.cmake +++ b/Modules/RigidRegistration/Testing/files.cmake @@ -1,4 +1,4 @@ -SET(MODULE_TESTS +set(MODULE_TESTS # mitkRigidRegistrationPresetTest.cpp # mitkRigidRegistrationTestPresetTest.cpp ) \ No newline at end of file diff --git a/Modules/RigidRegistration/files.cmake b/Modules/RigidRegistration/files.cmake index ddd895f16d..947986ceb5 100644 --- a/Modules/RigidRegistration/files.cmake +++ b/Modules/RigidRegistration/files.cmake @@ -1,13 +1,13 @@ -SET(CPP_FILES +set(CPP_FILES mitkImageRegistrationMethod.cpp mitkMetricParameters.cpp mitkOptimizerFactory.cpp mitkOptimizerParameters.cpp mitkRigidRegistrationObserver.cpp mitkRigidRegistrationPreset.cpp mitkTransformParameters.cpp mitkPyramidalRegistrationMethod.cpp ) MITK_MULTIPLEX_PICTYPE( mitkImageRegistrationMethod-TYPE.cpp ) MITK_MULTIPLEX_PICTYPE( mitkPyramidalRegistrationMethod-TYPE.cpp ) \ No newline at end of file diff --git a/Modules/RigidRegistrationUI/files.cmake b/Modules/RigidRegistrationUI/files.cmake index d4eec51056..135f7ba523 100644 --- a/Modules/RigidRegistrationUI/files.cmake +++ b/Modules/RigidRegistrationUI/files.cmake @@ -1,98 +1,98 @@ -SET(CPP_FILES +set(CPP_FILES RigidRegistrationMetrics/QmitkRigidRegistrationMetricsGUIBase.cpp RigidRegistrationMetrics/QmitkMeanSquaresMetricView.cpp RigidRegistrationMetrics/QmitkNormalizedCorrelationMetricView.cpp RigidRegistrationMetrics/QmitkGradientDifferenceMetricView.cpp RigidRegistrationMetrics/QmitkKullbackLeiblerCompareHistogramMetricView.cpp RigidRegistrationMetrics/QmitkCorrelationCoefficientHistogramMetricView.cpp RigidRegistrationMetrics/QmitkMeanSquaresHistogramMetricView.cpp RigidRegistrationMetrics/QmitkMutualInformationHistogramMetricView.cpp RigidRegistrationMetrics/QmitkNormalizedMutualInformationHistogramMetricView.cpp RigidRegistrationMetrics/QmitkMattesMutualInformationMetricView.cpp RigidRegistrationMetrics/QmitkMeanReciprocalSquareDifferenceMetricView.cpp RigidRegistrationMetrics/QmitkMutualInformationMetricView.cpp RigidRegistrationMetrics/QmitkMatchCardinalityMetricView.cpp RigidRegistrationMetrics/QmitkKappaStatisticMetricView.cpp RigidRegistrationOptimizer/QmitkRigidRegistrationOptimizerGUIBase.cpp RigidRegistrationOptimizer/QmitkExhaustiveOptimizerView.cpp RigidRegistrationOptimizer/QmitkGradientDescentOptimizerView.cpp RigidRegistrationOptimizer/QmitkQuaternionRigidTransformGradientDescentOptimizerView.cpp RigidRegistrationOptimizer/QmitkLBFGSBOptimizerView.cpp RigidRegistrationOptimizer/QmitkOnePlusOneEvolutionaryOptimizerView.cpp RigidRegistrationOptimizer/QmitkPowellOptimizerView.cpp RigidRegistrationOptimizer/QmitkFRPROptimizerView.cpp RigidRegistrationOptimizer/QmitkRegularStepGradientDescentOptimizerView.cpp RigidRegistrationOptimizer/QmitkVersorTransformOptimizerView.cpp RigidRegistrationOptimizer/QmitkAmoebaOptimizerView.cpp RigidRegistrationOptimizer/QmitkConjugateGradientOptimizerView.cpp RigidRegistrationOptimizer/QmitkLBFGSOptimizerView.cpp RigidRegistrationOptimizer/QmitkSPSAOptimizerView.cpp RigidRegistrationOptimizer/QmitkVersorRigid3DTransformOptimizerView.cpp RigidRegistrationTransforms/QmitkRigidRegistrationTransformsGUIBase.cpp RigidRegistrationTransforms/QmitkTranslationTransformView.cpp RigidRegistrationTransforms/QmitkScaleTransformView.cpp RigidRegistrationTransforms/QmitkScaleLogarithmicTransformView.cpp RigidRegistrationTransforms/QmitkAffineTransformView.cpp RigidRegistrationTransforms/QmitkFixedCenterOfRotationAffineTransformView.cpp RigidRegistrationTransforms/QmitkRigid3DTransformView.cpp RigidRegistrationTransforms/QmitkEuler3DTransformView.cpp RigidRegistrationTransforms/QmitkCenteredEuler3DTransformView.cpp RigidRegistrationTransforms/QmitkQuaternionRigidTransformView.cpp RigidRegistrationTransforms/QmitkVersorTransformView.cpp RigidRegistrationTransforms/QmitkVersorRigid3DTransformView.cpp RigidRegistrationTransforms/QmitkScaleSkewVersor3DTransformView.cpp RigidRegistrationTransforms/QmitkSimilarity3DTransformView.cpp RigidRegistrationTransforms/QmitkRigid2DTransformView.cpp RigidRegistrationTransforms/QmitkCenteredRigid2DTransformView.cpp RigidRegistrationTransforms/QmitkEuler2DTransformView.cpp RigidRegistrationTransforms/QmitkSimilarity2DTransformView.cpp RigidRegistrationTransforms/QmitkCenteredSimilarity2DTransformView.cpp ) -SET(UI_FILES +set(UI_FILES RigidRegistrationMetrics/QmitkMeanSquaresMetricControls.ui RigidRegistrationMetrics/QmitkNormalizedCorrelationMetricControls.ui RigidRegistrationMetrics/QmitkGradientDifferenceMetricControls.ui RigidRegistrationMetrics/QmitkKullbackLeiblerCompareHistogramMetricControls.ui RigidRegistrationMetrics/QmitkCorrelationCoefficientHistogramMetricControls.ui RigidRegistrationMetrics/QmitkMeanSquaresHistogramMetricControls.ui RigidRegistrationMetrics/QmitkMutualInformationHistogramMetricControls.ui RigidRegistrationMetrics/QmitkNormalizedMutualInformationHistogramMetricControls.ui RigidRegistrationMetrics/QmitkMattesMutualInformationMetricControls.ui RigidRegistrationMetrics/QmitkMeanReciprocalSquareDifferenceMetricControls.ui RigidRegistrationMetrics/QmitkMutualInformationMetricControls.ui RigidRegistrationMetrics/QmitkMatchCardinalityMetricControls.ui RigidRegistrationMetrics/QmitkKappaStatisticMetricControls.ui RigidRegistrationOptimizer/QmitkExhaustiveOptimizerControls.ui RigidRegistrationOptimizer/QmitkGradientDescentOptimizerControls.ui RigidRegistrationOptimizer/QmitkQuaternionRigidTransformGradientDescentOptimizerControls.ui RigidRegistrationOptimizer/QmitkLBFGSBOptimizerControls.ui RigidRegistrationOptimizer/QmitkOnePlusOneEvolutionaryOptimizerControls.ui RigidRegistrationOptimizer/QmitkPowellOptimizerControls.ui RigidRegistrationOptimizer/QmitkFRPROptimizerControls.ui RigidRegistrationOptimizer/QmitkRegularStepGradientDescentOptimizerControls.ui RigidRegistrationOptimizer/QmitkVersorTransformOptimizerControls.ui RigidRegistrationOptimizer/QmitkAmoebaOptimizerControls.ui RigidRegistrationOptimizer/QmitkConjugateGradientOptimizerControls.ui RigidRegistrationOptimizer/QmitkLBFGSOptimizerControls.ui RigidRegistrationOptimizer/QmitkSPSAOptimizerControls.ui RigidRegistrationOptimizer/QmitkVersorRigid3DTransformOptimizerControls.ui RigidRegistrationTransforms/QmitkTranslationTransformControls.ui RigidRegistrationTransforms/QmitkScaleTransformControls.ui RigidRegistrationTransforms/QmitkScaleLogarithmicTransformControls.ui RigidRegistrationTransforms/QmitkAffineTransformControls.ui RigidRegistrationTransforms/QmitkFixedCenterOfRotationAffineTransformControls.ui RigidRegistrationTransforms/QmitkRigid3DTransformControls.ui RigidRegistrationTransforms/QmitkEuler3DTransformControls.ui RigidRegistrationTransforms/QmitkCenteredEuler3DTransformControls.ui RigidRegistrationTransforms/QmitkQuaternionRigidTransformControls.ui RigidRegistrationTransforms/QmitkVersorTransformControls.ui RigidRegistrationTransforms/QmitkVersorRigid3DTransformControls.ui RigidRegistrationTransforms/QmitkScaleSkewVersor3DTransformControls.ui RigidRegistrationTransforms/QmitkSimilarity3DTransformControls.ui RigidRegistrationTransforms/QmitkRigid2DTransformControls.ui RigidRegistrationTransforms/QmitkCenteredRigid2DTransformControls.ui RigidRegistrationTransforms/QmitkEuler2DTransformControls.ui RigidRegistrationTransforms/QmitkSimilarity2DTransformControls.ui RigidRegistrationTransforms/QmitkCenteredSimilarity2DTransformControls.ui ) \ No newline at end of file diff --git a/Modules/SceneSerialization/CMakeLists.txt b/Modules/SceneSerialization/CMakeLists.txt index 5db50034d1..a75b2c22b2 100644 --- a/Modules/SceneSerialization/CMakeLists.txt +++ b/Modules/SceneSerialization/CMakeLists.txt @@ -1,8 +1,8 @@ MITK_CREATE_MODULE( SceneSerialization INCLUDE_DIRS BaseDataSerializer BasePropertySerializer BasePropertyDeserializer DEPENDS Mitk MitkExt SceneSerializationBase PACKAGE_DEPENDS Poco ADDITIONAL_LIBS optimized PocoFoundation debug PocoFoundationd optimized PocoZip debug PocoZipd ) -ADD_SUBDIRECTORY(Testing) +add_subdirectory(Testing) diff --git a/Modules/SceneSerialization/Testing/CMakeLists.txt b/Modules/SceneSerialization/Testing/CMakeLists.txt index 6ce20cef90..913bc60d64 100644 --- a/Modules/SceneSerialization/Testing/CMakeLists.txt +++ b/Modules/SceneSerialization/Testing/CMakeLists.txt @@ -1,8 +1,8 @@ MITK_CREATE_MODULE_TESTS(LABELS MITK-Modules) if(BUILD_TESTING AND MODULE_IS_ENABLED) - ADD_TEST(mitkSceneIOTest_Pic3D.nrrd_binary.stl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkSceneIOTest ${MITK_DATA_DIR}/Pic3D.nrrd + add_test(mitkSceneIOTest_Pic3D.nrrd_binary.stl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkSceneIOTest ${MITK_DATA_DIR}/Pic3D.nrrd ${MITK_DATA_DIR}/binary.stl) - SET_PROPERTY(TEST mitkSceneIOTest_Pic3D.nrrd_binary.stl PROPERTY LABELS MITK-Modules) + set_property(TEST mitkSceneIOTest_Pic3D.nrrd_binary.stl PROPERTY LABELS MITK-Modules) endif() diff --git a/Modules/SceneSerialization/Testing/files.cmake b/Modules/SceneSerialization/Testing/files.cmake index 2b237227a7..2e00e773c0 100644 --- a/Modules/SceneSerialization/Testing/files.cmake +++ b/Modules/SceneSerialization/Testing/files.cmake @@ -1,5 +1,5 @@ -SET(MODULE_CUSTOM_TESTS +set(MODULE_CUSTOM_TESTS mitkSceneIOTest.cpp ) diff --git a/Modules/SceneSerializationBase/CMakeLists.txt b/Modules/SceneSerializationBase/CMakeLists.txt index 0bc639abc2..5c51524447 100644 --- a/Modules/SceneSerializationBase/CMakeLists.txt +++ b/Modules/SceneSerializationBase/CMakeLists.txt @@ -1,6 +1,6 @@ MITK_CREATE_MODULE( SceneSerializationBase INCLUDE_DIRS BaseDataSerializer BasePropertySerializer DEPENDS Mitk ) -ADD_SUBDIRECTORY(Testing) +add_subdirectory(Testing) diff --git a/Modules/SceneSerializationBase/Testing/files.cmake b/Modules/SceneSerializationBase/Testing/files.cmake index 784b83e4db..d29d03adbe 100644 --- a/Modules/SceneSerializationBase/Testing/files.cmake +++ b/Modules/SceneSerializationBase/Testing/files.cmake @@ -1,5 +1,5 @@ -SET(MODULE_TESTS +set(MODULE_TESTS mitkPropertySerializationTest.cpp ) diff --git a/Modules/ToFHardware/CMakeLists.txt b/Modules/ToFHardware/CMakeLists.txt index b6bddfea93..22f063037b 100644 --- a/Modules/ToFHardware/CMakeLists.txt +++ b/Modules/ToFHardware/CMakeLists.txt @@ -1,34 +1,34 @@ -INCLUDE(mitkToFHardware.cmake) +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_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_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_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) +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 LegacyAdaptors EXPORT_DEFINE MITK_TOFHARDWARE_EXPORT ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ) -ADD_SUBDIRECTORY(Testing) +add_subdirectory(Testing) diff --git a/Modules/ToFHardware/Testing/files.cmake b/Modules/ToFHardware/Testing/files.cmake index ebd3469544..77fd5af217 100644 --- a/Modules/ToFHardware/Testing/files.cmake +++ b/Modules/ToFHardware/Testing/files.cmake @@ -1,30 +1,30 @@ -SET(MODULE_TESTS +set(MODULE_TESTS mitkThreadedToFRawDataReconstructionTest.cpp mitkToFCameraMITKPlayerControllerTest.cpp mitkToFCameraMITKPlayerDeviceTest.cpp mitkToFCameraPMDCamBoardControllerTest.cpp mitkToFCameraPMDCamBoardDeviceTest.cpp #mitkToFCameraPMDRawDataCamBoardDeviceTest.cpp mitkToFCameraPMDCamCubeControllerTest.cpp mitkToFCameraPMDCamCubeDeviceTest.cpp #mitkToFCameraPMDRawDataCamCubeDeviceTest.cpp mitkToFCameraPMDControllerTest.cpp mitkToFCameraPMDDeviceTest.cpp mitkToFCameraPMDRawDataDeviceTest.cpp mitkToFCameraPMDMITKPlayerControllerTest.cpp mitkToFCameraPMDMITKPlayerDeviceTest.cpp mitkToFCameraPMDO3ControllerTest.cpp mitkToFCameraPMDO3DeviceTest.cpp mitkToFCameraPMDPlayerControllerTest.cpp mitkToFCameraPMDPlayerDeviceTest.cpp mitkToFImageCsvWriterTest.cpp mitkToFImageGrabberTest.cpp mitkToFImageGrabberCreatorTest.cpp mitkToFImageRecorderTest.cpp mitkToFImageRecorderFilterTest.cpp mitkToFImageWriterTest.cpp mitkToFNrrdImageWriterTest.cpp mitkToFPicImageWriterTest.cpp mitkToFOpenCVImageGrabberTest.cpp ) diff --git a/Modules/ToFHardware/files.cmake b/Modules/ToFHardware/files.cmake index f6eb813347..03e6cd4390 100644 --- a/Modules/ToFHardware/files.cmake +++ b/Modules/ToFHardware/files.cmake @@ -1,96 +1,96 @@ -SET(CPP_FILES +set(CPP_FILES mitkToFImageGrabberCreator.cpp mitkToFImageGrabber.cpp mitkToFOpenCVImageGrabber.cpp mitkToFCameraDevice.cpp mitkToFCameraMITKPlayerController.cpp mitkToFCameraMITKPlayerDevice.cpp mitkToFCameraPMDDevice.cpp mitkToFCameraPMDRawDataDevice.cpp mitkToFCameraPMDPlayerDevice.cpp mitkToFCameraPMDMITKPlayerDevice.cpp mitkToFCameraPMDO3Device.cpp mitkToFCameraPMDCamCubeDevice.cpp mitkToFCameraPMDRawDataCamCubeDevice.cpp mitkToFCameraPMDCamBoardDevice.cpp mitkToFCameraPMDRawDataCamBoardDevice.cpp mitkToFCameraMESADevice.cpp mitkToFCameraMESASR4000Device.cpp mitkToFImageRecorder.cpp mitkToFImageRecorderFilter.cpp mitkToFImageWriter.cpp mitkToFNrrdImageWriter.cpp mitkToFPicImageWriter.cpp mitkToFImageCsvWriter.cpp mitkThreadedToFRawDataReconstruction.cpp ) -IF(MITK_USE_TOF_PMDCAMCUBE) -SET(CPP_FILES ${CPP_FILES} +if(MITK_USE_TOF_PMDCAMCUBE) +set(CPP_FILES ${CPP_FILES} mitkToFCameraPMDMITKPlayerController.cpp mitkToFCameraPMDCamCubeController.cpp mitkToFCameraPMDController.cpp ) -IF(WIN32) - IF(CMAKE_CL_64) - SET(CPP_FILES ${CPP_FILES} mitkToFCameraPMDPlayerControllerStub.cpp) - ELSE(CMAKE_CL_64) - SET(CPP_FILES ${CPP_FILES} mitkToFCameraPMDPlayerController.cpp) - ENDIF(CMAKE_CL_64) -ELSE(WIN32) - SET(CPP_FILES ${CPP_FILES} mitkToFCameraPMDPlayerControllerStub.cpp) -ENDIF(WIN32) -ELSE() -SET(CPP_FILES ${CPP_FILES} +if(WIN32) + if(CMAKE_CL_64) + set(CPP_FILES ${CPP_FILES} mitkToFCameraPMDPlayerControllerStub.cpp) + else(CMAKE_CL_64) + set(CPP_FILES ${CPP_FILES} mitkToFCameraPMDPlayerController.cpp) + endif(CMAKE_CL_64) +else(WIN32) + set(CPP_FILES ${CPP_FILES} mitkToFCameraPMDPlayerControllerStub.cpp) +endif(WIN32) +else() +set(CPP_FILES ${CPP_FILES} mitkToFCameraPMDMITKPlayerControllerStub.cpp mitkToFCameraPMDCamCubeControllerStub.cpp mitkToFCameraPMDPlayerControllerStub.cpp ) -ENDIF(MITK_USE_TOF_PMDCAMCUBE) +endif(MITK_USE_TOF_PMDCAMCUBE) -IF(MITK_USE_TOF_PMDCAMBOARD) -SET(CPP_FILES ${CPP_FILES} +if(MITK_USE_TOF_PMDCAMBOARD) +set(CPP_FILES ${CPP_FILES} mitkToFCameraPMDCamBoardController.cpp mitkToFCameraPMDController.cpp ) -ELSE() -SET(CPP_FILES ${CPP_FILES} +else() +set(CPP_FILES ${CPP_FILES} mitkToFCameraPMDCamBoardControllerStub.cpp ) -ENDIF(MITK_USE_TOF_PMDCAMBOARD) +endif(MITK_USE_TOF_PMDCAMBOARD) -IF(MITK_USE_TOF_PMDO3) -SET(CPP_FILES ${CPP_FILES} +if(MITK_USE_TOF_PMDO3) +set(CPP_FILES ${CPP_FILES} mitkToFCameraPMDO3Controller.cpp mitkToFCameraPMDController.cpp ) -ELSE() -SET(CPP_FILES ${CPP_FILES} +else() +set(CPP_FILES ${CPP_FILES} mitkToFCameraPMDO3ControllerStub.cpp ) -ENDIF(MITK_USE_TOF_PMDO3) +endif(MITK_USE_TOF_PMDO3) -IF(NOT MITK_USE_TOF_PMDCAMCUBE) -IF(NOT MITK_USE_TOF_PMDCAMBOARD) -IF(NOT MITK_USE_TOF_PMDO3) -SET(CPP_FILES ${CPP_FILES} +if(NOT MITK_USE_TOF_PMDCAMCUBE) +if(NOT MITK_USE_TOF_PMDCAMBOARD) +if(NOT MITK_USE_TOF_PMDO3) +set(CPP_FILES ${CPP_FILES} mitkToFCameraPMDControllerStub.cpp ) -ENDIF(NOT MITK_USE_TOF_PMDO3) -ENDIF(NOT MITK_USE_TOF_PMDCAMBOARD) -ENDIF(NOT MITK_USE_TOF_PMDCAMCUBE) +endif(NOT MITK_USE_TOF_PMDO3) +endif(NOT MITK_USE_TOF_PMDCAMBOARD) +endif(NOT MITK_USE_TOF_PMDCAMCUBE) -IF(MITK_USE_TOF_MESASR4000) -SET(CPP_FILES ${CPP_FILES} +if(MITK_USE_TOF_MESASR4000) +set(CPP_FILES ${CPP_FILES} mitkToFCameraMESASR4000Controller.cpp mitkToFCameraMESAController.cpp ) -ELSE() -SET(CPP_FILES ${CPP_FILES} +else() +set(CPP_FILES ${CPP_FILES} mitkToFCameraMESAControllerStub.cpp mitkToFCameraMESASR4000ControllerStub.cpp ) -ENDIF(MITK_USE_TOF_MESASR4000) +endif(MITK_USE_TOF_MESASR4000) diff --git a/Modules/ToFHardware/mitkToFHardware.cmake b/Modules/ToFHardware/mitkToFHardware.cmake index f7ffb2a970..8e2fd01aff 100644 --- a/Modules/ToFHardware/mitkToFHardware.cmake +++ b/Modules/ToFHardware/mitkToFHardware.cmake @@ -1,116 +1,116 @@ #option MITK_USE_TOF_HARDWARE -IF(WIN32) - IF(CMAKE_CL_64) - SET(_PLATFORM_STRING "W64") - ELSE(CMAKE_CL_64) - SET(_PLATFORM_STRING "W32") - ENDIF(CMAKE_CL_64) -ELSE(WIN32) - IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") - SET(_PLATFORM_STRING "L64") - ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") - SET(_PLATFORM_STRING "L32") - ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") -ENDIF(WIN32) +if(WIN32) + if(CMAKE_CL_64) + set(_PLATFORM_STRING "W64") + else(CMAKE_CL_64) + set(_PLATFORM_STRING "W32") + endif(CMAKE_CL_64) +else(WIN32) + if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") + set(_PLATFORM_STRING "L64") + else(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") + set(_PLATFORM_STRING "L32") + endif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") +endif(WIN32) -SET(MITK_TOF_AVAILABLE_CAMERAS MITK Player) +set(MITK_TOF_AVAILABLE_CAMERAS MITK Player) -OPTION(MITK_ENABLE_TOF_HARDWARE "Support for range cameras" OFF) -IF(MITK_ENABLE_TOF_HARDWARE) +option(MITK_ENABLE_TOF_HARDWARE "Support for range cameras" OFF) +if(MITK_ENABLE_TOF_HARDWARE) #Begin PMD Camcube hardware -OPTION(MITK_USE_TOF_PMDCAMCUBE "Enable support for PMD camcube" OFF) +option(MITK_USE_TOF_PMDCAMCUBE "Enable support for PMD camcube" OFF) # only if PMD Camcube is enabled -IF(MITK_USE_TOF_PMDCAMCUBE) - FIND_LIBRARY(MITK_PMD_LIB pmdaccess2 DOC "PMD access library.") - GET_FILENAME_COMPONENT(MITK_PMD_SDK_DIR ${MITK_PMD_LIB} PATH) - SET(MITK_PMD_SDK_DIR ${MITK_PMD_SDK_DIR}/..) - FIND_PATH(MITK_PMD_INCLUDE_DIR pmdsdk2.h ${MITK_PMD_SDK_DIR}/include DOC "Include directory of PMD-SDK.") - SET(MITK_TOF_PMD_CAMCUBE_SOURCE ${MITK_PMD_SDK_DIR}/plugins/camcube3.${_PLATFORM_STRING}.pap) - SET(MITK_TOF_PMD_CAMCUBE_PROC ${MITK_PMD_SDK_DIR}/plugins/camcubeproc.${_PLATFORM_STRING}.ppp) - SET(MITK_TOF_PMD_FILE_SOURCE ${MITK_PMD_SDK_DIR}/plugins/pmdfile.${_PLATFORM_STRING}.pcp) - SET(MITK_TOF_AVAILABLE_CAMERAS ${MITK_TOF_AVAILABLE_CAMERAS},PMD CamCube 2.0/3.0,PMD CamCubeRaw 2.0/3.0,PMD Player,PMD Raw Data Player) -# FILE(GLOB MITK_TOF_PMD_CAMCUBE_SOURCE camcube3.${_PLATFORM_STRING}.pap) -# FILE(GLOB MITK_TOF_PMD_CAMCUBE_PROC camcubeproc.${_PLATFORM_STRING}.ppp) -# FILE(GLOB MITK_TOF_PMD_FILE_SOURCE pmdfile.${_PLATFORM_STRING}.pcp) - IF(WIN32) +if(MITK_USE_TOF_PMDCAMCUBE) + find_library(MITK_PMD_LIB pmdaccess2 DOC "PMD access library.") + get_filename_component(MITK_PMD_SDK_DIR ${MITK_PMD_LIB} PATH) + set(MITK_PMD_SDK_DIR ${MITK_PMD_SDK_DIR}/..) + find_path(MITK_PMD_INCLUDE_DIR pmdsdk2.h ${MITK_PMD_SDK_DIR}/include DOC "Include directory of PMD-SDK.") + set(MITK_TOF_PMD_CAMCUBE_SOURCE ${MITK_PMD_SDK_DIR}/plugins/camcube3.${_PLATFORM_STRING}.pap) + set(MITK_TOF_PMD_CAMCUBE_PROC ${MITK_PMD_SDK_DIR}/plugins/camcubeproc.${_PLATFORM_STRING}.ppp) + set(MITK_TOF_PMD_FILE_SOURCE ${MITK_PMD_SDK_DIR}/plugins/pmdfile.${_PLATFORM_STRING}.pcp) + set(MITK_TOF_AVAILABLE_CAMERAS ${MITK_TOF_AVAILABLE_CAMERAS},PMD CamCube 2.0/3.0,PMD CamCubeRaw 2.0/3.0,PMD Player,PMD Raw Data Player) +# file(GLOB MITK_TOF_PMD_CAMCUBE_SOURCE camcube3.${_PLATFORM_STRING}.pap) +# file(GLOB MITK_TOF_PMD_CAMCUBE_PROC camcubeproc.${_PLATFORM_STRING}.ppp) +# file(GLOB MITK_TOF_PMD_FILE_SOURCE pmdfile.${_PLATFORM_STRING}.pcp) + if(WIN32) MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/bin/pmdaccess2.dll CONFIGURATIONS Release) MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camcube3.W32.pap CONFIGURATIONS Release) MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camcubeproc.W32.ppp CONFIGURATIONS Release) MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camcube3.W64.pap CONFIGURATIONS Release) MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camcubeproc.W64.ppp CONFIGURATIONS Release) MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/pmdfile.W32.pcp CONFIGURATIONS Release) - ENDIf(WIN32) -ENDIF(MITK_USE_TOF_PMDCAMCUBE) + endif(WIN32) +endif(MITK_USE_TOF_PMDCAMCUBE) #End PMD Camcube Hardware #Begin PMD CamBoard hardware -OPTION(MITK_USE_TOF_PMDCAMBOARD "Enable support for PMD camboard" OFF) +option(MITK_USE_TOF_PMDCAMBOARD "Enable support for PMD camboard" OFF) # only if PMD CamBoard is enabled -IF(MITK_USE_TOF_PMDCAMBOARD) - FIND_LIBRARY(MITK_PMD_LIB pmdaccess2 DOC "PMD access library.") - GET_FILENAME_COMPONENT(MITK_PMD_SDK_DIR ${MITK_PMD_LIB} PATH) - SET(MITK_PMD_SDK_DIR ${MITK_PMD_SDK_DIR}/..) - FIND_PATH(MITK_PMD_INCLUDE_DIR pmdsdk2.h ${MITK_PMD_SDK_DIR}/include DOC "Include directory of PMD-SDK.") - SET(MITK_TOF_PMD_CAMBOARD_SOURCE ${MITK_PMD_SDK_DIR}/plugins/camboard.${_PLATFORM_STRING}.pap) - SET(MITK_TOF_PMD_CAMBOARD_PROC ${MITK_PMD_SDK_DIR}/plugins/camboardproc.${_PLATFORM_STRING}.ppp) - SET(MITK_TOF_AVAILABLE_CAMERAS ${MITK_TOF_AVAILABLE_CAMERAS},PMD CamBoard,PMD CamBoardRaw) -# FILE(GLOB MITK_TOF_PMD_CAMBOARD_SOURCE camboard.${_PLATFORM_STRING}.pap) -# FILE(GLOB MITK_TOF_PMD_CAMBOARD_PROC camboardproc.${_PLATFORM_STRING}.ppp) -# FILE(GLOB MITK_TOF_PMD_FILE_SOURCE ${MITK_PMD_SDK_DIR}/plugins/pmdfile.${_PLATFORM_STRING}.pcp) - IF(WIN32) - INSTALL(FILES ${MITK_PMD_SDK_DIR}/bin/pmdaccess2.dll DESTINATION bin CONFIGURATIONS Release) - INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camboard.W32.pap DESTINATION bin CONFIGURATIONS Release) - INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camboardproc.W32.ppp DESTINATION bin CONFIGURATIONS Release) -# INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camboard.W64.pap DESTINATION bin CONFIGURATIONS Release) -# INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camboardproc.W64.ppp DESTINATION bin CONFIGURATIONS Release) -# INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/pmdfile.W32.pcp DESTINATION bin CONFIGURATIONS Release) - ENDIf(WIN32) -ENDIF(MITK_USE_TOF_PMDCAMBOARD) +if(MITK_USE_TOF_PMDCAMBOARD) + find_library(MITK_PMD_LIB pmdaccess2 DOC "PMD access library.") + get_filename_component(MITK_PMD_SDK_DIR ${MITK_PMD_LIB} PATH) + set(MITK_PMD_SDK_DIR ${MITK_PMD_SDK_DIR}/..) + find_path(MITK_PMD_INCLUDE_DIR pmdsdk2.h ${MITK_PMD_SDK_DIR}/include DOC "Include directory of PMD-SDK.") + set(MITK_TOF_PMD_CAMBOARD_SOURCE ${MITK_PMD_SDK_DIR}/plugins/camboard.${_PLATFORM_STRING}.pap) + set(MITK_TOF_PMD_CAMBOARD_PROC ${MITK_PMD_SDK_DIR}/plugins/camboardproc.${_PLATFORM_STRING}.ppp) + set(MITK_TOF_AVAILABLE_CAMERAS ${MITK_TOF_AVAILABLE_CAMERAS},PMD CamBoard,PMD CamBoardRaw) +# file(GLOB MITK_TOF_PMD_CAMBOARD_SOURCE camboard.${_PLATFORM_STRING}.pap) +# file(GLOB MITK_TOF_PMD_CAMBOARD_PROC camboardproc.${_PLATFORM_STRING}.ppp) +# file(GLOB MITK_TOF_PMD_FILE_SOURCE ${MITK_PMD_SDK_DIR}/plugins/pmdfile.${_PLATFORM_STRING}.pcp) + if(WIN32) + install(FILES ${MITK_PMD_SDK_DIR}/bin/pmdaccess2.dll DESTINATION bin CONFIGURATIONS Release) + install(FILES ${MITK_PMD_SDK_DIR}/plugins/camboard.W32.pap DESTINATION bin CONFIGURATIONS Release) + install(FILES ${MITK_PMD_SDK_DIR}/plugins/camboardproc.W32.ppp DESTINATION bin CONFIGURATIONS Release) +# install(FILES ${MITK_PMD_SDK_DIR}/plugins/camboard.W64.pap DESTINATION bin CONFIGURATIONS Release) +# install(FILES ${MITK_PMD_SDK_DIR}/plugins/camboardproc.W64.ppp DESTINATION bin CONFIGURATIONS Release) +# install(FILES ${MITK_PMD_SDK_DIR}/plugins/pmdfile.W32.pcp DESTINATION bin CONFIGURATIONS Release) + endif(WIN32) +endif(MITK_USE_TOF_PMDCAMBOARD) #End PMD CamBoard Hardware #Begin MESA SR4000 hardware -OPTION(MITK_USE_TOF_MESASR4000 "Enable support for MESA SR4000" OFF) +option(MITK_USE_TOF_MESASR4000 "Enable support for MESA SR4000" OFF) # only if MESA SR4000 is enabled -IF(MITK_USE_TOF_MESASR4000) - FIND_LIBRARY(MITK_MESA_LIB libMesaSR DOC "MESA access library.") - GET_FILENAME_COMPONENT(MITK_MESA_SDK_DIR ${MITK_MESA_LIB} PATH) - SET(MITK_MESA_SDK_DIR ${MITK_MESA_SDK_DIR}/..) - FIND_PATH(MITK_MESA_INCLUDE_DIR libMesaSR.h ${MITK_MESA_SDK_DIR}/include DOC "Include directory of MESA-SDK.") - SET(MITK_TOF_AVAILABLE_CAMERAS ${MITK_TOF_AVAILABLE_CAMERAS},MESA Swissranger 4000) - IF(WIN32) - INSTALL(FILES ${MITK_MESA_SDK_DIR}/bin/libMesaSR.dll DESTINATION bin CONFIGURATIONS Release) - ENDIf(WIN32) -ENDIF(MITK_USE_TOF_MESASR4000) +if(MITK_USE_TOF_MESASR4000) + find_library(MITK_MESA_LIB libMesaSR DOC "MESA access library.") + get_filename_component(MITK_MESA_SDK_DIR ${MITK_MESA_LIB} PATH) + set(MITK_MESA_SDK_DIR ${MITK_MESA_SDK_DIR}/..) + find_path(MITK_MESA_INCLUDE_DIR libMesaSR.h ${MITK_MESA_SDK_DIR}/include DOC "Include directory of MESA-SDK.") + set(MITK_TOF_AVAILABLE_CAMERAS ${MITK_TOF_AVAILABLE_CAMERAS},MESA Swissranger 4000) + if(WIN32) + install(FILES ${MITK_MESA_SDK_DIR}/bin/libMesaSR.dll DESTINATION bin CONFIGURATIONS Release) + endif(WIN32) +endif(MITK_USE_TOF_MESASR4000) #End MESA SR4000 Hardware -IF (WIN32) +if(WIN32) #Begin PMD O3 hardware -OPTION(MITK_USE_TOF_PMDO3 "Enable support for PMD O3 camera" OFF) +option(MITK_USE_TOF_PMDO3 "Enable support for PMD O3 camera" OFF) # only if PMD O3 is enabled -IF(MITK_USE_TOF_PMDO3) - FIND_LIBRARY(MITK_PMD_LIB pmdaccess2 DOC "PMD access library.") - GET_FILENAME_COMPONENT(MITK_PMD_SDK_DIR ${MITK_PMD_LIB} PATH) - SET(MITK_PMD_SDK_DIR ${MITK_PMD_SDK_DIR}/..) - FIND_PATH(MITK_PMD_INCLUDE_DIR pmdsdk2.h ${MITK_PMD_SDK_DIR}/include DOC "Include directory of PMD-SDK.") - SET(MITK_TOF_PMD_O3D_SOURCE ${MITK_PMD_SDK_DIR}/plugins/o3d.${_PLATFORM_STRING}.pcp) - SET(MITK_TOF_PMD_O3D_PROC ${MITK_PMD_SDK_DIR}/plugins/o3d.${_PLATFORM_STRING}.pcp) - SET(MITK_TOF_AVAILABLE_CAMERAS ${MITK_TOF_AVAILABLE_CAMERAS},PMD O3D) +if(MITK_USE_TOF_PMDO3) + find_library(MITK_PMD_LIB pmdaccess2 DOC "PMD access library.") + get_filename_component(MITK_PMD_SDK_DIR ${MITK_PMD_LIB} PATH) + set(MITK_PMD_SDK_DIR ${MITK_PMD_SDK_DIR}/..) + find_path(MITK_PMD_INCLUDE_DIR pmdsdk2.h ${MITK_PMD_SDK_DIR}/include DOC "Include directory of PMD-SDK.") + set(MITK_TOF_PMD_O3D_SOURCE ${MITK_PMD_SDK_DIR}/plugins/o3d.${_PLATFORM_STRING}.pcp) + set(MITK_TOF_PMD_O3D_PROC ${MITK_PMD_SDK_DIR}/plugins/o3d.${_PLATFORM_STRING}.pcp) + set(MITK_TOF_AVAILABLE_CAMERAS ${MITK_TOF_AVAILABLE_CAMERAS},PMD O3D) -# FILE(GLOB MITK_TOF_PMD_O3D_SOURCE o3d.${_PLATFORM_STRING}.pcp) -# FILE(GLOB MITK_TOF_PMD_O3D_PROC o3d.${_PLATFORM_STRING}.pcp) +# file(GLOB MITK_TOF_PMD_O3D_SOURCE o3d.${_PLATFORM_STRING}.pcp) +# file(GLOB MITK_TOF_PMD_O3D_PROC o3d.${_PLATFORM_STRING}.pcp) MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/bin/pmdaccess2.dll CONFIGURATIONS Release) MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/o3d.W32.pcp CONFIGURATIONS Release) -ENDIF(MITK_USE_TOF_PMDO3) +endif(MITK_USE_TOF_PMDO3) #End PMD O3 Hardware -ENDIF(WIN32) +endif(WIN32) -ENDIF(MITK_ENABLE_TOF_HARDWARE) +endif(MITK_ENABLE_TOF_HARDWARE) -CONFIGURE_FILE(mitkToFConfig.h.in ${PROJECT_BINARY_DIR}/mitkToFConfig.h @ONLY) +configure_file(mitkToFConfig.h.in ${PROJECT_BINARY_DIR}/mitkToFConfig.h @ONLY) diff --git a/Modules/ToFProcessing/CMakeLists.txt b/Modules/ToFProcessing/CMakeLists.txt index b33d161d55..88e5b5612a 100644 --- a/Modules/ToFProcessing/CMakeLists.txt +++ b/Modules/ToFProcessing/CMakeLists.txt @@ -1,12 +1,12 @@ MITK_CREATE_MODULE(mitkToFProcessing SUBPROJECTS MITK-ToF DEPENDS Mitk MitkExt mitkCameraCalibration PACKAGE_DEPENDS OpenCV ) -IF(BUILD_TESTING) +if(BUILD_TESTING) - ADD_SUBDIRECTORY(Testing) + add_subdirectory(Testing) -ENDIF(BUILD_TESTING) +endif(BUILD_TESTING) diff --git a/Modules/ToFProcessing/Testing/CMakeLists.txt b/Modules/ToFProcessing/Testing/CMakeLists.txt index 7d5de41cfc..a9448f43ab 100644 --- a/Modules/ToFProcessing/Testing/CMakeLists.txt +++ b/Modules/ToFProcessing/Testing/CMakeLists.txt @@ -1,10 +1,10 @@ MITK_CREATE_MODULE_TESTS() -IF(BUILD_TESTING AND MODULE_IS_ENABLED) +if(BUILD_TESTING AND MODULE_IS_ENABLED) mitkAddCustomModuleTest("mitkToFImageDownsamplingFilterTest" #name of the test "mitkToFImageDownsamplingFilterTest" #call the corresponding test "PMDCamCube2_MF0_IT0_20Images_DistanceImage.pic") #input parameter(s) mitkAddCustomModuleTest("mitkToFImageDownsamplingFilterTest" #name of the test "mitkToFImageDownsamplingFilterTest" #call the corresponding test "PMDCamCube2_MF0_IT0_1Images_DistanceImage.pic") #input parameter(s) -ENDIF(BUILD_TESTING AND MODULE_IS_ENABLED) \ No newline at end of file +endif(BUILD_TESTING AND MODULE_IS_ENABLED) \ No newline at end of file diff --git a/Modules/ToFProcessing/Testing/files.cmake b/Modules/ToFProcessing/Testing/files.cmake index 8a49f5df75..05fec4f4b1 100644 --- a/Modules/ToFProcessing/Testing/files.cmake +++ b/Modules/ToFProcessing/Testing/files.cmake @@ -1,7 +1,7 @@ -SET(MODULE_TESTS +set(MODULE_TESTS mitkToFDistanceImageToPointSetFilterTest.cpp mitkToFDistanceImageToSurfaceFilterTest.cpp mitkToFCompositeFilterTest.cpp mitkToFProcessingCommonTest.cpp mitkToFImageDownsamplingFilterTest.cpp ) diff --git a/Modules/ToFProcessing/files.cmake b/Modules/ToFProcessing/files.cmake index a38fe955e9..f5d34eaca5 100644 --- a/Modules/ToFProcessing/files.cmake +++ b/Modules/ToFProcessing/files.cmake @@ -1,9 +1,9 @@ -SET(CPP_FILES +set(CPP_FILES mitkToFCompositeFilter.cpp mitkToFDistanceImageToPointSetFilter.cpp mitkToFDistanceImageToSurfaceFilter.cpp mitkToFImageDownsamplingFilter.cpp mitkToFProcessingCommon.cpp mitkToFSurfaceVtkMapper3D.cpp mitkToFTestingCommon.cpp ) diff --git a/Modules/ToFUI/files.cmake b/Modules/ToFUI/files.cmake index af636a4574..084141cd52 100644 --- a/Modules/ToFUI/files.cmake +++ b/Modules/ToFUI/files.cmake @@ -1,34 +1,34 @@ -SET(CPP_FILES +set(CPP_FILES Qmitk/QmitkToFConnectionWidget.cpp Qmitk/QmitkToFPointSetWidget.cpp Qmitk/QmitkToFRecorderWidget.cpp Qmitk/QmitkToFVisualisationSettingsWidget.cpp Qmitk/QmitkToFCompositeFilterWidget.cpp Qmitk/QmitkToFPMDParameterWidget.cpp Qmitk/QmitkToFMESAParameterWidget.cpp ) -SET(UI_FILES +set(UI_FILES Qmitk/QmitkToFConnectionWidgetControls.ui Qmitk/QmitkToFPointSetWidgetControls.ui Qmitk/QmitkToFRecorderWidgetControls.ui Qmitk/QmitkToFVisualisationSettingsWidgetControls.ui Qmitk/QmitkToFCompositeFilterWidgetControls.ui Qmitk/QmitkToFPMDParameterWidgetControls.ui Qmitk/QmitkToFMESAParameterWidgetControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES Qmitk/QmitkToFConnectionWidget.h Qmitk/QmitkToFPointSetWidget.h Qmitk/QmitkToFRecorderWidget.h Qmitk/QmitkToFVisualisationSettingsWidget.h Qmitk/QmitkToFCompositeFilterWidget.h Qmitk/QmitkToFPMDParameterWidget.h Qmitk/QmitkToFMESAParameterWidget.h ) # uncomment the following line if you want to use Qt resources -SET(QRC_FILES +set(QRC_FILES resources/QmitkToFUtilWidget.qrc ) diff --git a/Plugins/PluginList.cmake b/Plugins/PluginList.cmake index 37a1544854..b71acba70c 100644 --- a/Plugins/PluginList.cmake +++ b/Plugins/PluginList.cmake @@ -1,41 +1,41 @@ # Plug-ins must be ordered according to their dependencies -SET(MITK_EXT_PLUGINS +set(MITK_EXT_PLUGINS org.mitk.core.services:ON org.mitk.gui.common:ON org.mitk.planarfigure:ON org.mitk.core.ext:OFF org.mitk.core.jobs:OFF org.mitk.diffusionimaging:OFF org.mitk.gui.qt.application:ON org.mitk.gui.qt.coreapplication:OFF org.mitk.gui.qt.ext:OFF org.mitk.gui.qt.extapplication:OFF org.mitk.gui.qt.common:ON org.mitk.gui.qt.stdmultiwidgeteditor:ON org.mitk.gui.qt.common.legacy:OFF org.mitk.gui.qt.diffusionimagingapp:OFF org.mitk.gui.qt.datamanager:ON org.mitk.gui.qt.basicimageprocessing:OFF org.mitk.gui.qt.diffusionimaging:OFF org.mitk.gui.qt.dtiatlasapp:OFF org.mitk.gui.qt.examples:OFF org.mitk.gui.qt.examplesopencv:OFF org.mitk.gui.qt.igtexamples:OFF org.mitk.gui.qt.igtnavigation:OFF org.mitk.gui.qt.igttracking:OFF org.mitk.gui.qt.imagecropper:OFF org.mitk.gui.qt.imagenavigator:ON org.mitk.gui.qt.materialeditor:OFF org.mitk.gui.qt.measurementtoolbox:OFF org.mitk.gui.qt.moviemaker:OFF org.mitk.gui.qt.pointsetinteraction:OFF org.mitk.gui.qt.python.console:OFF org.mitk.gui.qt.registration:OFF org.mitk.gui.qt.segmentation:OFF org.mitk.gui.qt.toftutorial:OFF org.mitk.gui.qt.tofutil:OFF org.mitk.gui.qt.ugvisualization:OFF org.mitk.gui.qt.volumevisualization:OFF ) diff --git a/Plugins/org.mitk.core.ext/CMakeLists.txt b/Plugins/org.mitk.core.ext/CMakeLists.txt index 2889ad8b12..82b323f872 100755 --- a/Plugins/org.mitk.core.ext/CMakeLists.txt +++ b/Plugins/org.mitk.core.ext/CMakeLists.txt @@ -1,8 +1,8 @@ -PROJECT(org_mitk_core_ext) +project(org_mitk_core_ext) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE MITKCOREEXT_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES MitkExt ) diff --git a/Plugins/org.mitk.core.ext/files.cmake b/Plugins/org.mitk.core.ext/files.cmake index 0a25520e4c..223b40a331 100755 --- a/Plugins/org.mitk.core.ext/files.cmake +++ b/Plugins/org.mitk.core.ext/files.cmake @@ -1,34 +1,34 @@ -SET(SRC_H_FILES +set(SRC_H_FILES mitkIInputDeviceDescriptor.h mitkIInputDeviceRegistry.h mitkIInputDevice.h ) -SET(SRC_CPP_FILES +set(SRC_CPP_FILES mitkCoreExtConstants.cpp mitkInputDeviceRegistry.cpp mitkInputDeviceDescriptor.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES mitkCoreExtActivator.cpp ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/mitkCoreExtActivator.h ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.core.jobs/CMakeLists.txt b/Plugins/org.mitk.core.jobs/CMakeLists.txt index f071ea263a..0b820688d8 100644 --- a/Plugins/org.mitk.core.jobs/CMakeLists.txt +++ b/Plugins/org.mitk.core.jobs/CMakeLists.txt @@ -1,6 +1,6 @@ -PROJECT(org_mitk_core_jobs) +project(org_mitk_core_jobs) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE MITK_JOBS_EXPORT EXPORTED_INCLUDE_SUFFIXES src ) diff --git a/Plugins/org.mitk.core.jobs/files.cmake b/Plugins/org.mitk.core.jobs/files.cmake index adb1828c7f..ce7df10ec2 100644 --- a/Plugins/org.mitk.core.jobs/files.cmake +++ b/Plugins/org.mitk.core.jobs/files.cmake @@ -1,21 +1,21 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES mitkDataStorageAccessRule.cpp mitkPluginActivator.cpp ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/mitkPluginActivator.h ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.core.services/CMakeLists.txt b/Plugins/org.mitk.core.services/CMakeLists.txt index a8fa9cd7fd..d45573076d 100644 --- a/Plugins/org.mitk.core.services/CMakeLists.txt +++ b/Plugins/org.mitk.core.services/CMakeLists.txt @@ -1,8 +1,8 @@ -PROJECT(org_mitk_core_services) +project(org_mitk_core_services) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE MITK_CORE_SERVICES_PLUGIN EXPORTED_INCLUDE_SUFFIXES src SUBPROJECTS MITK-CoreUI ) diff --git a/Plugins/org.mitk.core.services/files.cmake b/Plugins/org.mitk.core.services/files.cmake index ab51b1b034..28e8dc5b8b 100644 --- a/Plugins/org.mitk.core.services/files.cmake +++ b/Plugins/org.mitk.core.services/files.cmake @@ -1,24 +1,24 @@ -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/mitkPluginActivator.h src/internal/mitkDataStorageService.h ) -SET(SRC_CPP_FILES +set(SRC_CPP_FILES mitkIDataStorageService.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES mitkPluginActivator.cpp mitkDataStorageReference.cpp mitkDataStorageService.cpp ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.diffusionimaging/CMakeLists.txt b/Plugins/org.mitk.diffusionimaging/CMakeLists.txt index 3d05bd3950..10174a592c 100644 --- a/Plugins/org.mitk.diffusionimaging/CMakeLists.txt +++ b/Plugins/org.mitk.diffusionimaging/CMakeLists.txt @@ -1,7 +1,7 @@ -PROJECT(org_mitk_diffusionimaging) +project(org_mitk_diffusionimaging) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE ORG_MITK_DIFFUSIONIMAGING_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES MitkDiffusionImaging QmitkExt ) diff --git a/Plugins/org.mitk.diffusionimaging/files.cmake b/Plugins/org.mitk.diffusionimaging/files.cmake index 3b39ed6c21..a4396b7853 100644 --- a/Plugins/org.mitk.diffusionimaging/files.cmake +++ b/Plugins/org.mitk.diffusionimaging/files.cmake @@ -1,22 +1,22 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES mitkDiffusionImagingActivator.cpp ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/mitkDiffusionImagingActivator.h ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.common/CMakeLists.txt b/Plugins/org.mitk.gui.common/CMakeLists.txt index d6010babf0..2e7de4bb9c 100644 --- a/Plugins/org.mitk.gui.common/CMakeLists.txt +++ b/Plugins/org.mitk.gui.common/CMakeLists.txt @@ -1,8 +1,8 @@ -PROJECT(org_mitk_gui_common) +project(org_mitk_gui_common) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE MITK_GUI_COMMON_PLUGIN EXPORTED_INCLUDE_SUFFIXES src SUBPROJECTS MITK-CoreUI ) diff --git a/Plugins/org.mitk.gui.common/files.cmake b/Plugins/org.mitk.gui.common/files.cmake index 966ce2635d..d2ef71d786 100644 --- a/Plugins/org.mitk.gui.common/files.cmake +++ b/Plugins/org.mitk.gui.common/files.cmake @@ -1,31 +1,31 @@ -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/org_mitk_gui_common_Activator.h ) -SET(SRC_CPP_FILES +set(SRC_CPP_FILES mitkDataNodeObject.cpp mitkDataNodeSelection.cpp mitkDataStorageEditorInput.cpp mitkILifecycleAwarePart.h mitkILinkedRenderWindowPart.h mitkIRenderingManager.cpp mitkIRenderWindowPart.cpp mitkIRenderWindowPartListener.h mitkIZombieViewPart.h mitkWorkbenchUtil.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES org_mitk_gui_common_Activator.cpp ) -#SET(CPP_FILES manifest.cpp) +#set(CPP_FILES manifest.cpp) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.application/CMakeLists.txt b/Plugins/org.mitk.gui.qt.application/CMakeLists.txt index 86d35c1d45..13f1aa6dff 100644 --- a/Plugins/org.mitk.gui.qt.application/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.application/CMakeLists.txt @@ -1,8 +1,8 @@ -PROJECT(org_mitk_gui_qt_application) +project(org_mitk_gui_qt_application) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE MITK_QT_APP EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES Qmitk SUBPROJECTS MITK-CoreUI ) diff --git a/Plugins/org.mitk.gui.qt.application/files.cmake b/Plugins/org.mitk.gui.qt.application/files.cmake index 52b966668b..2482c478e3 100644 --- a/Plugins/org.mitk.gui.qt.application/files.cmake +++ b/Plugins/org.mitk.gui.qt.application/files.cmake @@ -1,47 +1,47 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES QmitkCloseProjectAction.cpp QmitkDefaultDropTargetListener.cpp QmitkFileExitAction.cpp QmitkFileOpenAction.cpp QmitkPreferencesDialog.cpp QmitkStatusBar.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES org_mitk_gui_qt_application_Activator.cpp QmitkEditorsPreferencePage.cpp QmitkGeneralPreferencePage.cpp ) -SET(MOC_H_FILES +set(MOC_H_FILES src/QmitkCloseProjectAction.h src/QmitkFileExitAction.h src/QmitkFileOpenAction.h src/QmitkPreferencesDialog.h src/internal/org_mitk_gui_qt_application_Activator.h src/internal/QmitkEditorsPreferencePage.h src/internal/QmitkGeneralPreferencePage.h ) -SET(UI_FILES +set(UI_FILES src/QmitkPreferencesDialog.ui ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml ) -SET(QRC_FILES +set(QRC_FILES resources/resources.qrc ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.application/target_libraries.cmake b/Plugins/org.mitk.gui.qt.application/target_libraries.cmake index 9412e38dde..d960ce8173 100644 --- a/Plugins/org.mitk.gui.qt.application/target_libraries.cmake +++ b/Plugins/org.mitk.gui.qt.application/target_libraries.cmake @@ -1,9 +1,9 @@ # See CMake/ctkFunctionGetTargetLibraries.cmake # # This file should list the libraries required to build the current CTK plugin. # For specifying required plugins, see the manifest_headers.cmake file. # -SET(target_libraries +set(target_libraries CTKWidgets ) diff --git a/Plugins/org.mitk.gui.qt.basicimageprocessing/CMakeLists.txt b/Plugins/org.mitk.gui.qt.basicimageprocessing/CMakeLists.txt index 9efe41ff7e..a6b4701130 100644 --- a/Plugins/org.mitk.gui.qt.basicimageprocessing/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.basicimageprocessing/CMakeLists.txt @@ -1,10 +1,10 @@ #MACRO_CREATE_MITK_PLUGIN(QmitkExt) -PROJECT(org_mitk_gui_qt_basicimageprocessing) +project(org_mitk_gui_qt_basicimageprocessing) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE BASICIMAGEPROCESSING_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES QmitkExt ) diff --git a/Plugins/org.mitk.gui.qt.basicimageprocessing/files.cmake b/Plugins/org.mitk.gui.qt.basicimageprocessing/files.cmake index d696fc9b5e..ab27be6105 100644 --- a/Plugins/org.mitk.gui.qt.basicimageprocessing/files.cmake +++ b/Plugins/org.mitk.gui.qt.basicimageprocessing/files.cmake @@ -1,35 +1,35 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES QmitkBasicImageProcessingView.cpp mitkBasicImageProcessingActivator.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/QmitkBasicImageProcessingViewControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/QmitkBasicImageProcessingView.h src/internal/mitkBasicImageProcessingActivator.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES resources/lena.xpm plugin.xml ) -SET(QRC_FILES +set(QRC_FILES resources/QmitkBasicImageProcessingView.qrc ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.common.legacy/CMakeLists.txt b/Plugins/org.mitk.gui.qt.common.legacy/CMakeLists.txt index 19059562eb..44b99188a2 100755 --- a/Plugins/org.mitk.gui.qt.common.legacy/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.common.legacy/CMakeLists.txt @@ -1,8 +1,8 @@ -PROJECT(org_mitk_gui_qt_common_legacy) +project(org_mitk_gui_qt_common_legacy) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE MITK_QT_COMMON_LEGACY EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES Qmitk SUBPROJECTS MITK-CoreUI ) diff --git a/Plugins/org.mitk.gui.qt.common.legacy/files.cmake b/Plugins/org.mitk.gui.qt.common.legacy/files.cmake index 9081ef1134..331c6b063f 100755 --- a/Plugins/org.mitk.gui.qt.common.legacy/files.cmake +++ b/Plugins/org.mitk.gui.qt.common.legacy/files.cmake @@ -1,33 +1,33 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES QmitkFunctionality.cpp QmitkFunctionality2.cpp QmitkFunctionalityCoordinator.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES QmitkCommonLegacyActivator.cpp QmitkFunctionalityUtil.cpp ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/QmitkCommonLegacyActivator.h ) -SET(UI_FILES +set(UI_FILES ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES ) -SET(QRC_FILES +set(QRC_FILES ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.common/CMakeLists.txt b/Plugins/org.mitk.gui.qt.common/CMakeLists.txt index fb42e857d2..a87e750b5c 100755 --- a/Plugins/org.mitk.gui.qt.common/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.common/CMakeLists.txt @@ -1,8 +1,8 @@ -PROJECT(org_mitk_gui_qt_common) +project(org_mitk_gui_qt_common) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE MITK_QT_COMMON EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES Qmitk SUBPROJECTS MITK-CoreUI ) diff --git a/Plugins/org.mitk.gui.qt.common/files.cmake b/Plugins/org.mitk.gui.qt.common/files.cmake index d3c3feebdf..26169e2fbf 100755 --- a/Plugins/org.mitk.gui.qt.common/files.cmake +++ b/Plugins/org.mitk.gui.qt.common/files.cmake @@ -1,36 +1,36 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES QmitkAbstractRenderEditor.cpp QmitkAbstractView.cpp QmitkDataNodeSelectionProvider.cpp QmitkDnDFrameWidget.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES QmitkCommonActivator.cpp QmitkDataNodeItemModel.cpp QmitkDataNodeSelection.cpp QmitkViewCoordinator.cpp ) -SET(MOC_H_FILES +set(MOC_H_FILES src/QmitkAbstractRenderEditor.h src/QmitkDnDFrameWidget.h src/internal/QmitkCommonActivator.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES ) -SET(QRC_FILES +set(QRC_FILES ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.common/testing/CMakeLists.txt b/Plugins/org.mitk.gui.qt.common/testing/CMakeLists.txt index cdbd7824f9..699b815cce 100644 --- a/Plugins/org.mitk.gui.qt.common/testing/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.common/testing/CMakeLists.txt @@ -1,13 +1,13 @@ -PROJECT(org_mitk_gui_qt_common_tests) +project(org_mitk_gui_qt_common_tests) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE org_mitk_gui_qt_common_tests_EXPORT EXPORTED_INCLUDE_SUFFIXES src src/api MODULE_DEPENDENCIES Qmitk TEST_PLUGIN ) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} optimized CppUnit debug CppUnitd) +target_link_libraries(${PROJECT_NAME} optimized CppUnit debug CppUnitd) MACRO_TEST_UIPLUGIN(${MITK_DEFAULT_SUBPROJECTS}) diff --git a/Plugins/org.mitk.gui.qt.common/testing/files.cmake b/Plugins/org.mitk.gui.qt.common/testing/files.cmake index b7a94b74a1..4eecfbe54f 100644 --- a/Plugins/org.mitk.gui.qt.common/testing/files.cmake +++ b/Plugins/org.mitk.gui.qt.common/testing/files.cmake @@ -1,37 +1,37 @@ -SET(MOC_H_FILES +set(MOC_H_FILES src/QmitkQtCommonTestSuite.h src/api/QmitkMockFunctionality.h src/internal/mitkPluginActivator.h ) -SET(SRC_CPP_FILES +set(SRC_CPP_FILES QmitkQtCommonTestSuite.cpp # API Tests api/QmitkFunctionalityTest.cpp api/QmitkMockFunctionality.cpp api/QmitkUiApiTestSuite.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES mitkPluginActivator.cpp ) -SET(CPP_FILES ) +set(CPP_FILES ) -SET(RESOURCE_FILES +set(RESOURCE_FILES # icons/view.gif ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.coreapplication/CMakeLists.txt b/Plugins/org.mitk.gui.qt.coreapplication/CMakeLists.txt index bf2b55ceae..ec694bbe8f 100644 --- a/Plugins/org.mitk.gui.qt.coreapplication/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.coreapplication/CMakeLists.txt @@ -1,8 +1,8 @@ -PROJECT(org_mitk_gui_qt_coreapplication) +project(org_mitk_gui_qt_coreapplication) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE MITK_QT_COREAPP EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES Qmitk SUBPROJECTS MITK-CoreUI ) diff --git a/Plugins/org.mitk.gui.qt.coreapplication/files.cmake b/Plugins/org.mitk.gui.qt.coreapplication/files.cmake index 129790de1c..863322168d 100644 --- a/Plugins/org.mitk.gui.qt.coreapplication/files.cmake +++ b/Plugins/org.mitk.gui.qt.coreapplication/files.cmake @@ -1,32 +1,32 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES org_mitk_gui_qt_coreapplication_Activator.cpp QmitkActionBarAdvisor.cpp QmitkCoreApplication.cpp QmitkDefaultPerspective.cpp QmitkWorkbenchAdvisor.cpp QmitkWorkbenchWindowAdvisor.cpp ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/org_mitk_gui_qt_coreapplication_Activator.h src/internal/QmitkCoreApplication.h src/internal/QmitkDefaultPerspective.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.datamanager/CMakeLists.txt b/Plugins/org.mitk.gui.qt.datamanager/CMakeLists.txt index 3b5efcc10d..7c2993de13 100644 --- a/Plugins/org.mitk.gui.qt.datamanager/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.datamanager/CMakeLists.txt @@ -1,6 +1,6 @@ -PROJECT(org_mitk_gui_qt_datamanager) +project(org_mitk_gui_qt_datamanager) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE MITK_QT_DATAMANAGER EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES QmitkExt) diff --git a/Plugins/org.mitk.gui.qt.datamanager/files.cmake b/Plugins/org.mitk.gui.qt.datamanager/files.cmake index f64b6f1a83..ad9241d53a 100644 --- a/Plugins/org.mitk.gui.qt.datamanager/files.cmake +++ b/Plugins/org.mitk.gui.qt.datamanager/files.cmake @@ -1,43 +1,43 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES berrySingleNodeSelection.cpp QmitkDataManagerView.cpp QmitkDataManagerPreferencePage.cpp QmitkDataManagerHotkeysPrefPage.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES mitkPluginActivator.cpp QmitkPropertyListView.cpp QmitkNodeTableViewKeyFilter.cpp QmitkInfoDialog.cpp ) -SET(MOC_H_FILES +set(MOC_H_FILES src/QmitkDataManagerView.h src/QmitkDataManagerPreferencePage.h src/QmitkDataManagerHotkeysPrefPage.h src/internal/QmitkNodeTableViewKeyFilter.h src/internal/QmitkPropertyListView.h src/internal/QmitkInfoDialog.h src/internal/mitkPluginActivator.h ) -SET(CPP_FILES ) +set(CPP_FILES ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml resources/DataManager_48.png resources/propertylist.png ) -SET(QRC_FILES +set(QRC_FILES resources/datamanager.qrc ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimaging/CMakeLists.txt index 775263d718..0b6fabcce4 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.diffusionimaging/CMakeLists.txt @@ -1,7 +1,7 @@ -PROJECT(org_mitk_gui_qt_diffusionimaging) +project(org_mitk_gui_qt_diffusionimaging) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE DIFFUSIONIMAGING_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES QmitkExt MitkDiffusionImaging ) diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/files.cmake b/Plugins/org.mitk.gui.qt.diffusionimaging/files.cmake index 50676e1a87..22679483fb 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging/files.cmake +++ b/Plugins/org.mitk.gui.qt.diffusionimaging/files.cmake @@ -1,114 +1,114 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES QmitkODFDetailsWidget.cpp QmitkODFRenderWidget.cpp QmitkPartialVolumeAnalysisWidget.cpp QmitkIVIMWidget.cpp QmitkTbssRoiAnalysisWidget.cpp QmitkResidualAnalysisWidget.cpp QmitkResidualViewWidget.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES mitkPluginActivator.cpp QmitkQBallReconstructionView.cpp QmitkPreprocessingView.cpp QmitkDiffusionDicomImportView.cpp QmitkDiffusionQuantificationView.cpp QmitkTensorReconstructionView.cpp QmitkDiffusionImagingPublicPerspective.cpp QmitkControlVisualizationPropertiesView.cpp QmitkODFDetailsView.cpp QmitkGibbsTrackingView.cpp QmitkStochasticFiberTrackingView.cpp QmitkFiberProcessingView.cpp QmitkFiberBundleDeveloperView.cpp QmitkPartialVolumeAnalysisView.cpp QmitkIVIMView.cpp QmitkTractbasedSpatialStatisticsView.cpp QmitkTbssTableModel.cpp QmitkTbssMetaTableModel.cpp QmitkTbssSkeletonizationView.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/QmitkQBallReconstructionViewControls.ui src/internal/QmitkPreprocessingViewControls.ui src/internal/QmitkDiffusionDicomImportViewControls.ui src/internal/QmitkDiffusionQuantificationViewControls.ui src/internal/QmitkTensorReconstructionViewControls.ui src/internal/QmitkControlVisualizationPropertiesViewControls.ui src/internal/QmitkODFDetailsViewControls.ui src/internal/QmitkGibbsTrackingViewControls.ui src/internal/QmitkStochasticFiberTrackingViewControls.ui src/internal/QmitkFiberProcessingViewControls.ui src/internal/QmitkFiberBundleDeveloperViewControls.ui src/internal/QmitkPartialVolumeAnalysisViewControls.ui src/internal/QmitkIVIMViewControls.ui src/internal/QmitkTractbasedSpatialStatisticsViewControls.ui src/internal/QmitkTbssSkeletonizationViewControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/mitkPluginActivator.h src/internal/QmitkQBallReconstructionView.h src/internal/QmitkPreprocessingView.h src/internal/QmitkDiffusionDicomImportView.h src/internal/QmitkDiffusionImagingPublicPerspective.h src/internal/QmitkDiffusionQuantificationView.h src/internal/QmitkTensorReconstructionView.h src/internal/QmitkControlVisualizationPropertiesView.h src/internal/QmitkODFDetailsView.h src/QmitkODFRenderWidget.h src/QmitkODFDetailsWidget.h src/internal/QmitkGibbsTrackingView.h src/internal/QmitkStochasticFiberTrackingView.h src/internal/QmitkFiberProcessingView.h src/internal/QmitkFiberBundleDeveloperView.h src/internal/QmitkPartialVolumeAnalysisView.h src/QmitkPartialVolumeAnalysisWidget.h src/internal/QmitkIVIMView.h src/internal/QmitkTractbasedSpatialStatisticsView.h src/internal/QmitkTbssSkeletonizationView.h src/QmitkTbssRoiAnalysisWidget.h src/QmitkResidualAnalysisWidget.h src/QmitkResidualViewWidget.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES # list of resource files which can be used by the plug-in # system without loading the plug-ins shared library, # for example the icon used in the menu and tabs for the # plug-in views in the workbench plugin.xml resources/preprocessing.png resources/dwiimport.png resources/quantification.png resources/reconodf.png resources/recontensor.png resources/vizControls.png resources/OdfDetails.png resources/GibbsTracking.png resources/FiberBundleOperations.png resources/PartialVolumeAnalysis_24.png resources/IVIM_48.png resources/stochFB.png resources/tbss.png ) -SET(QRC_FILES +set(QRC_FILES # uncomment the following line if you want to use Qt resources resources/QmitkDiffusionImaging.qrc #resources/QmitkTractbasedSpatialStatisticsView.qrc ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimagingapp/CMakeLists.txt index e357958be7..4d1d73e677 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.diffusionimagingapp/CMakeLists.txt @@ -1,18 +1,18 @@ -SET (QT_USE_QTWEBKIT TRUE) -INCLUDE(${QT_USE_FILE}) +set(QT_USE_QTWEBKIT TRUE) +include(${QT_USE_FILE}) -IF(QT_QTWEBKIT_FOUND) - ADD_DEFINITIONS(-DQT_WEBKIT) -ENDIF(QT_QTWEBKIT_FOUND) +if(QT_QTWEBKIT_FOUND) + add_definitions(-DQT_WEBKIT) +endif(QT_QTWEBKIT_FOUND) # The project name must correspond to the directory name of your plug-in # and must not contain periods. -PROJECT(org_mitk_gui_qt_diffusionimagingapp) +project(org_mitk_gui_qt_diffusionimagingapp) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE DIFFUSIONIMAGING_APP_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES Qmitk SceneSerialization ) -TARGET_LINK_LIBRARIES(${PLUGIN_TARGET} ${QT_LIBRARIES}) +target_link_libraries(${PLUGIN_TARGET} ${QT_LIBRARIES}) diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/files.cmake b/Plugins/org.mitk.gui.qt.diffusionimagingapp/files.cmake index 373f0964d1..19fa450822 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/files.cmake +++ b/Plugins/org.mitk.gui.qt.diffusionimagingapp/files.cmake @@ -1,98 +1,98 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES QmitkDiffusionImagingAppApplication.cpp QmitkDiffusionImagingAppWorkbenchAdvisor.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES mitkPluginActivator.cpp QmitkDiffusionImagingAppIntroPart.cpp QmitkDiffusionImagingAppPerspective.cpp QmitkWelcomePerspective.cpp QmitkDIAppConnectomicsPerspective.cpp QmitkDIAppDicomImportPerspective.cpp QmitkDIAppFiberTractographyPerspective.cpp QmitkDIAppIVIMPerspective.cpp QmitkDIAppPreprocessingReconstructionPerspective.cpp QmitkDIAppQuantificationPerspective.cpp QmitkDIAppScreenshotsMoviesPerspective.cpp QmitkDIAppTBSSPerspective.cpp QmitkDIAppVolumeVisualizationPerspective.cpp QmitkDIAppTrackingEvaluationPerspective.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/QmitkWelcomeScreenViewControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/QmitkDiffusionImagingAppIntroPart.h src/internal/mitkPluginActivator.h src/QmitkDiffusionImagingAppApplication.h src/internal/QmitkDiffusionImagingAppPerspective.h src/internal/QmitkWelcomePerspective.h src/internal/QmitkDIAppConnectomicsPerspective.h src/internal/QmitkDIAppDicomImportPerspective.h src/internal/QmitkDIAppFiberTractographyPerspective.h src/internal/QmitkDIAppIVIMPerspective.h src/internal/QmitkDIAppPreprocessingReconstructionPerspective.h src/internal/QmitkDIAppQuantificationPerspective.h src/internal/QmitkDIAppScreenshotsMoviesPerspective.h src/internal/QmitkDIAppTBSSPerspective.h src/internal/QmitkDIAppVolumeVisualizationPerspective.h src/internal/QmitkDIAppTrackingEvaluationPerspective.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES # list of resource files which can be used by the plug-in # system without loading the plug-ins shared library, # for example the icon used in the menu and tabs for the # plug-in views in the workbench plugin.xml resources/icon_dicom.xpm resources/diffusionimaging.png resources/preprocessing.png resources/Measurement_48.png resources/volvis.png resources/perspectives/diffusionimaging.png resources/perspectives/icon_home.png resources/perspectives/connectomics.png resources/perspectives/dicomimport.png resources/perspectives/tractography.png resources/perspectives/ivim.png resources/perspectives/preprocessingreconstruction.png resources/perspectives/quantification.png resources/perspectives/screenshotsmovies.png resources/perspectives/tbss.png resources/perspectives/volumevizualization.png ) -SET(QRC_FILES +set(QRC_FILES # uncomment the following line if you want to use Qt resources resources/welcome/QmitkWelcomeScreenView.qrc resources/org_mitk_gui_qt_diffusionimagingapp.qrc ) -# SET(CPP_FILES) +# set(CPP_FILES) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) #----------- Qt Help Collection Project -------------# -IF (BLUEBERRY_USE_QT_HELP) - SET(_plugin_qhcp_input "${CMAKE_CURRENT_SOURCE_DIR}/documentation/MitkDiffusionImagingAppQtHelpCollectionProject.qhcp") - SET(_plugin_qhcp_output "${CMAKE_CURRENT_BINARY_DIR}/MitkDiffusionImagingAppQtHelpCollection.qhc") - ADD_CUSTOM_COMMAND(OUTPUT ${_plugin_qhcp_output} +if(BLUEBERRY_USE_QT_HELP) + set(_plugin_qhcp_input "${CMAKE_CURRENT_SOURCE_DIR}/documentation/MitkDiffusionImagingAppQtHelpCollectionProject.qhcp") + set(_plugin_qhcp_output "${CMAKE_CURRENT_BINARY_DIR}/MitkDiffusionImagingAppQtHelpCollection.qhc") + add_custom_command(OUTPUT ${_plugin_qhcp_output} COMMAND ${QT_COLLECTIONGENERATOR_EXECUTABLE} ${_plugin_qhcp_input} -o ${_plugin_qhcp_output} DEPENDS ${_plugin_qhcp_input} ) - LIST(APPEND CACHED_RESOURCE_FILES ${_plugin_qhcp_output}) - #SET(FILE_DEPENDENCIES ${_plugin_qhcp_output}) -ENDIF() + list(APPEND CACHED_RESOURCE_FILES ${_plugin_qhcp_output}) + #set(FILE_DEPENDENCIES ${_plugin_qhcp_output}) +endif() diff --git a/Plugins/org.mitk.gui.qt.dtiatlasapp/CMakeLists.txt b/Plugins/org.mitk.gui.qt.dtiatlasapp/CMakeLists.txt index e2265be9fa..b304be87ac 100644 --- a/Plugins/org.mitk.gui.qt.dtiatlasapp/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.dtiatlasapp/CMakeLists.txt @@ -1,18 +1,18 @@ -SET (QT_USE_QTWEBKIT TRUE) -INCLUDE(${QT_USE_FILE}) +set(QT_USE_QTWEBKIT TRUE) +include(${QT_USE_FILE}) -IF(QT_QTWEBKIT_FOUND) - ADD_DEFINITIONS(-DQT_WEBKIT) -ENDIF(QT_QTWEBKIT_FOUND) +if(QT_QTWEBKIT_FOUND) + add_definitions(-DQT_WEBKIT) +endif(QT_QTWEBKIT_FOUND) # The project name must correspond to the directory name of your plug-in # and must not contain periods. -PROJECT(org_mitk_gui_qt_dtiatlasapp) +project(org_mitk_gui_qt_dtiatlasapp) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE DTIATLAS_APP_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES Qmitk SceneSerialization ) -TARGET_LINK_LIBRARIES(${PLUGIN_TARGET} ${QT_LIBRARIES}) +target_link_libraries(${PLUGIN_TARGET} ${QT_LIBRARIES}) diff --git a/Plugins/org.mitk.gui.qt.dtiatlasapp/files.cmake b/Plugins/org.mitk.gui.qt.dtiatlasapp/files.cmake index f824847149..d17de8cbfa 100644 --- a/Plugins/org.mitk.gui.qt.dtiatlasapp/files.cmake +++ b/Plugins/org.mitk.gui.qt.dtiatlasapp/files.cmake @@ -1,62 +1,62 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES QmitkDTIAtlasAppApplication.cpp QmitkDTIAtlasAppWorkbenchAdvisor.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES QmitkDTIAtlasAppApplicationPlugin.cpp QmitkDTIAtlasAppIntroPart.cpp QmitkDTIAtlasAppPerspective.cpp QmitkWelcomePerspective.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/QmitkWelcomeScreenViewControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/QmitkDTIAtlasAppIntroPart.h src/internal/QmitkDTIAtlasAppApplicationPlugin.h src/QmitkDTIAtlasAppApplication.h src/internal/QmitkDTIAtlasAppPerspective.h src/internal/QmitkWelcomePerspective.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES # list of resource files which can be used by the plug-in # system without loading the plug-ins shared library, # for example the icon used in the menu and tabs for the # plug-in views in the workbench plugin.xml resources/diffusionimaging.png ) -SET(QRC_FILES +set(QRC_FILES # uncomment the following line if you want to use Qt resources resources/welcome/QmitkWelcomeScreenView.qrc resources/org_mitk_gui_qt_dtiatlasapp.qrc ) -# SET(CPP_FILES) +# set(CPP_FILES) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) #----------- Qt Help Collection Project -------------# -IF (BLUEBERRY_USE_QT_HELP) - SET(_plugin_qhcp_input "${CMAKE_CURRENT_SOURCE_DIR}/documentation/MitkDTIAtlasAppQtHelpCollectionProject.qhcp") - SET(_plugin_qhcp_output "${PLUGIN_OUTPUT_DIR}/resources/MitkDTIAtlasAppQtHelpCollection_${MBI_WC_REVISION_HASH}.qhc") - ADD_CUSTOM_COMMAND(OUTPUT ${_plugin_qhcp_output} +if(BLUEBERRY_USE_QT_HELP) + set(_plugin_qhcp_input "${CMAKE_CURRENT_SOURCE_DIR}/documentation/MitkDTIAtlasAppQtHelpCollectionProject.qhcp") + set(_plugin_qhcp_output "${PLUGIN_OUTPUT_DIR}/resources/MitkDTIAtlasAppQtHelpCollection_${MBI_WC_REVISION_HASH}.qhc") + add_custom_command(OUTPUT ${_plugin_qhcp_output} COMMAND ${QT_COLLECTIONGENERATOR_EXECUTABLE} ${_plugin_qhcp_input} -o ${_plugin_qhcp_output} DEPENDS ${_plugin_qhcp_input} ) - SET(FILE_DEPENDENCIES ${_plugin_qhcp_output}) -ENDIF() + set(FILE_DEPENDENCIES ${_plugin_qhcp_output}) +endif() diff --git a/Plugins/org.mitk.gui.qt.examples/CMakeLists.txt b/Plugins/org.mitk.gui.qt.examples/CMakeLists.txt index 08c4858b98..4c7d54d49d 100644 --- a/Plugins/org.mitk.gui.qt.examples/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.examples/CMakeLists.txt @@ -1,7 +1,7 @@ -PROJECT(org_mitk_gui_qt_examples) +project(org_mitk_gui_qt_examples) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE EXAMPLES_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES QmitkExt ) \ No newline at end of file diff --git a/Plugins/org.mitk.gui.qt.examples/files.cmake b/Plugins/org.mitk.gui.qt.examples/files.cmake index 3e0f4be53a..83a3277952 100644 --- a/Plugins/org.mitk.gui.qt.examples/files.cmake +++ b/Plugins/org.mitk.gui.qt.examples/files.cmake @@ -1,60 +1,60 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES mitkPluginActivator.cpp colourimageprocessing/QmitkColourImageProcessingView.cpp colourimageprocessing/mitkColourImageProcessor.cpp isosurface/QmitkIsoSurface.cpp simpleexample/QmitkSimpleExampleView.cpp simplemeasurement/QmitkSimpleMeasurement.cpp viewinitialization/QmitkViewInitializationView.cpp volumetry/QmitkVolumetryView.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/colourimageprocessing/QmitkColourImageProcessingViewControls.ui src/internal/isosurface/QmitkIsoSurfaceControls.ui src/internal/simpleexample/QmitkSimpleExampleViewControls.ui src/internal/simplemeasurement/QmitkSimpleMeasurementControls.ui src/internal/viewinitialization/QmitkViewInitializationViewControls.ui src/internal/volumetry/QmitkVolumetryViewControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/mitkPluginActivator.h src/internal/colourimageprocessing/QmitkColourImageProcessingView.h src/internal/isosurface/QmitkIsoSurface.h src/internal/simpleexample/QmitkSimpleExampleView.h src/internal/simplemeasurement/QmitkSimpleMeasurement.h src/internal/viewinitialization/QmitkViewInitializationView.h src/internal/volumetry/QmitkVolumetryView.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml resources/ColorImageProcessing.png resources/isoSurface.xpm resources/SimpleExample.png resources/SimpleMeasurement.png resources/viewInitializationIcon.xpm resources/volumetryIcon.xpm ) -SET(QRC_FILES +set(QRC_FILES resources/QmitkColourImageProcessingView.qrc resources/isosurface.qrc resources/QmitkVolumetryView.qrc ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.examplesopencv/CMakeLists.txt b/Plugins/org.mitk.gui.qt.examplesopencv/CMakeLists.txt index c1b8065339..51c996fc51 100644 --- a/Plugins/org.mitk.gui.qt.examplesopencv/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.examplesopencv/CMakeLists.txt @@ -1,9 +1,9 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. -PROJECT(org_mitk_gui_qt_examplesopencv) +project(org_mitk_gui_qt_examplesopencv) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE EXAMPLESOPENCV_EXPORTS EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES mitkOpenCVVideoSupportUI ) \ No newline at end of file diff --git a/Plugins/org.mitk.gui.qt.examplesopencv/files.cmake b/Plugins/org.mitk.gui.qt.examplesopencv/files.cmake index 9beb13537a..b0c477ba8d 100644 --- a/Plugins/org.mitk.gui.qt.examplesopencv/files.cmake +++ b/Plugins/org.mitk.gui.qt.examplesopencv/files.cmake @@ -1,29 +1,29 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES videoplayer/QmitkVideoPlayer.cpp mitkPluginActivator.cpp ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/mitkPluginActivator.h src/internal/videoplayer/QmitkVideoPlayer.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES resources/videoplayer.gif plugin.xml ) -SET(QRC_FILES +set(QRC_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.ext/CMakeLists.txt b/Plugins/org.mitk.gui.qt.ext/CMakeLists.txt index fa177c7c10..10fc9463f2 100644 --- a/Plugins/org.mitk.gui.qt.ext/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.ext/CMakeLists.txt @@ -1,7 +1,7 @@ -PROJECT(org_mitk_gui_qt_ext) +project(org_mitk_gui_qt_ext) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE MITK_QT_COMMON_EXT_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES QmitkExt SceneSerialization ) diff --git a/Plugins/org.mitk.gui.qt.ext/files.cmake b/Plugins/org.mitk.gui.qt.ext/files.cmake index 4d0b3344c7..c4efc7d27d 100644 --- a/Plugins/org.mitk.gui.qt.ext/files.cmake +++ b/Plugins/org.mitk.gui.qt.ext/files.cmake @@ -1,51 +1,51 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES QmitkExtActionBarAdvisor.cpp QmitkExtWorkbenchWindowAdvisor.cpp QmitkExtFileSaveProjectAction.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES QmitkAppInstancesPreferencePage.cpp QmitkCommonExtPlugin.cpp QmitkInputDevicesPrefPage.cpp QmitkModuleView.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/QmitkAppInstancesPreferencePage.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/QmitkExtFileSaveProjectAction.h src/QmitkExtWorkbenchWindowAdvisor.h src/internal/QmitkAppInstancesPreferencePage.h src/internal/QmitkCommonExtPlugin.h src/internal/QmitkExtWorkbenchWindowAdvisorHack.h src/internal/QmitkInputDevicesPrefPage.h src/internal/QmitkModuleView.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES # list of resource files which can be used by the plug-in # system without loading the plug-ins shared library, # for example the icon used in the menu and tabs for the # plug-in views in the workbench plugin.xml resources/ModuleView.png ) -SET(QRC_FILES +set(QRC_FILES # uncomment the following line if you want to use Qt resources resources/org_mitk_gui_qt_ext.qrc ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.extapplication/CMakeLists.txt b/Plugins/org.mitk.gui.qt.extapplication/CMakeLists.txt index b23edacdae..64a92f7cab 100644 --- a/Plugins/org.mitk.gui.qt.extapplication/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.extapplication/CMakeLists.txt @@ -1,6 +1,6 @@ -PROJECT(org_mitk_gui_qt_extapplication) +project(org_mitk_gui_qt_extapplication) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE MITK_QT_EXTAPP EXPORTED_INCLUDE_SUFFIXES src ) diff --git a/Plugins/org.mitk.gui.qt.extapplication/files.cmake b/Plugins/org.mitk.gui.qt.extapplication/files.cmake index 273481bf06..77328988e7 100644 --- a/Plugins/org.mitk.gui.qt.extapplication/files.cmake +++ b/Plugins/org.mitk.gui.qt.extapplication/files.cmake @@ -1,40 +1,40 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES QmitkExtApplication.cpp QmitkExtApplicationPlugin.cpp QmitkExtAppWorkbenchAdvisor.cpp QmitkExtDefaultPerspective.cpp ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/QmitkExtApplication.h src/internal/QmitkExtApplicationPlugin.h src/internal/QmitkExtDefaultPerspective.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES # list of resource files which can be used by the plug-in # system without loading the plug-ins shared library, # for example the icon used in the menu and tabs for the # plug-in views in the workbench plugin.xml resources/icon_research.xpm ) -SET(QRC_FILES +set(QRC_FILES # uncomment the following line if you want to use Qt resources # resources/QmitkExtApplication.qrc ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.igtexamples/CMakeLists.txt b/Plugins/org.mitk.gui.qt.igtexamples/CMakeLists.txt index 59385725e9..4b6474cfa4 100644 --- a/Plugins/org.mitk.gui.qt.igtexamples/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.igtexamples/CMakeLists.txt @@ -1,9 +1,9 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. -PROJECT(org_mitk_gui_qt_igtexamples) +project(org_mitk_gui_qt_igtexamples) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE IGTEXAMPLES_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES QmitkExt MitkIGT MitkIGTUI ) \ No newline at end of file diff --git a/Plugins/org.mitk.gui.qt.igtexamples/files.cmake b/Plugins/org.mitk.gui.qt.igtexamples/files.cmake index c164ff8c4c..6cf35f1ffe 100644 --- a/Plugins/org.mitk.gui.qt.igtexamples/files.cmake +++ b/Plugins/org.mitk.gui.qt.igtexamples/files.cmake @@ -1,45 +1,45 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES QmitkIGTTrackingLabView.cpp QmitkIGTTutorialView.cpp mitkPluginActivator.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/QmitkIGTTrackingLabViewControls.ui src/internal/QmitkIGTTutorialViewControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/QmitkIGTTrackingLabView.h src/internal/QmitkIGTTutorialView.h src/internal/mitkPluginActivator.h ) -SET(QRC_FILES +set(QRC_FILES resources/QmitkIGTTrackingLabView.qrc #resources/QmitkIGTTutorialView.qrc ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES resources/IgtTrackingLab.png resources/start_rec.png resources/stop_rec.png resources/IGTTutorial.png plugin.xml ) -SET(CPP_FILES +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.imagecropper/CMakeLists.txt b/Plugins/org.mitk.gui.qt.imagecropper/CMakeLists.txt index 3116697747..abba489ac9 100644 --- a/Plugins/org.mitk.gui.qt.imagecropper/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.imagecropper/CMakeLists.txt @@ -1,12 +1,12 @@ -PROJECT(org_mitk_gui_qt_imagecropper) +project(org_mitk_gui_qt_imagecropper) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE MITK_QT_IMAGECROPPER EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES QmitkExt ) #MACRO_CREATE_MITK_PLUGIN(QmitkExt) diff --git a/Plugins/org.mitk.gui.qt.imagecropper/files.cmake b/Plugins/org.mitk.gui.qt.imagecropper/files.cmake index 8435af7118..e800d7bc02 100644 --- a/Plugins/org.mitk.gui.qt.imagecropper/files.cmake +++ b/Plugins/org.mitk.gui.qt.imagecropper/files.cmake @@ -1,37 +1,37 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES mitkImageCropperPluginActivator.cpp QmitkImageCropper.cpp mitkImageCropperEventInterface.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/QmitkImageCropperControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/mitkImageCropperPluginActivator.h src/internal/QmitkImageCropper.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES resources/icon.xpm plugin.xml ) -SET(QRC_FILES +set(QRC_FILES resources/imagecropper.qrc ) -SET(CPP_FILES) +set(CPP_FILES) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.imagenavigator/CMakeLists.txt b/Plugins/org.mitk.gui.qt.imagenavigator/CMakeLists.txt index 49ed29a959..023147478a 100644 --- a/Plugins/org.mitk.gui.qt.imagenavigator/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.imagenavigator/CMakeLists.txt @@ -1,9 +1,9 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. -PROJECT(org_mitk_gui_qt_imagenavigator) +project(org_mitk_gui_qt_imagenavigator) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE IMAGENAVIGATOR_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES QmitkExt ) diff --git a/Plugins/org.mitk.gui.qt.imagenavigator/files.cmake b/Plugins/org.mitk.gui.qt.imagenavigator/files.cmake index 3e50cffe64..ebd672d964 100644 --- a/Plugins/org.mitk.gui.qt.imagenavigator/files.cmake +++ b/Plugins/org.mitk.gui.qt.imagenavigator/files.cmake @@ -1,36 +1,36 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES QmitkImageNavigatorView.cpp mitkImageNavigatorPluginActivator.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/QmitkImageNavigatorViewControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/mitkImageNavigatorPluginActivator.h src/internal/QmitkImageNavigatorView.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES resources/Slider.png plugin.xml ) -SET(QRC_FILES +set(QRC_FILES resources/QmitkImageNavigatorView.qrc ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.materialeditor/CMakeLists.txt b/Plugins/org.mitk.gui.qt.materialeditor/CMakeLists.txt index d1cdb61faf..93d46f514d 100644 --- a/Plugins/org.mitk.gui.qt.materialeditor/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.materialeditor/CMakeLists.txt @@ -1,9 +1,9 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. -PROJECT(org_mitk_gui_qt_materialeditor) +project(org_mitk_gui_qt_materialeditor) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE MATERIALEDITOR_EXPORTS EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES Qmitk ) diff --git a/Plugins/org.mitk.gui.qt.materialeditor/files.cmake b/Plugins/org.mitk.gui.qt.materialeditor/files.cmake index 5ff2c78cd7..53b0ee26bb 100644 --- a/Plugins/org.mitk.gui.qt.materialeditor/files.cmake +++ b/Plugins/org.mitk.gui.qt.materialeditor/files.cmake @@ -1,34 +1,34 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES QmitkMITKSurfaceMaterialEditorView.cpp mitkMaterialEditorPluginActivator.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/QmitkMITKSurfaceMaterialEditorViewControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/QmitkMITKSurfaceMaterialEditorView.h src/internal/mitkMaterialEditorPluginActivator.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES resources/SurfaceMaterialEditor.png plugin.xml ) -SET(QRC_FILES +set(QRC_FILES resources/QmitkMITKSurfaceMaterialEditorView.qrc ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) \ No newline at end of file diff --git a/Plugins/org.mitk.gui.qt.measurementtoolbox/CMakeLists.txt b/Plugins/org.mitk.gui.qt.measurementtoolbox/CMakeLists.txt index 21c525eeec..88586d5f8a 100644 --- a/Plugins/org.mitk.gui.qt.measurementtoolbox/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.measurementtoolbox/CMakeLists.txt @@ -1,9 +1,9 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. -PROJECT(org_mitk_gui_qt_measurementtoolbox) +project(org_mitk_gui_qt_measurementtoolbox) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE MITK_QT_MEASUREMENTTOOLBOX EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES QmitkExt PlanarFigure ) \ No newline at end of file diff --git a/Plugins/org.mitk.gui.qt.measurementtoolbox/files.cmake b/Plugins/org.mitk.gui.qt.measurementtoolbox/files.cmake index c0e98b05a3..4fd1dd2406 100644 --- a/Plugins/org.mitk.gui.qt.measurementtoolbox/files.cmake +++ b/Plugins/org.mitk.gui.qt.measurementtoolbox/files.cmake @@ -1,57 +1,57 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES QmitkMeasurementView.cpp QmitkPlanarFiguresTableModel.cpp QmitkImageStatisticsView.cpp mitkPluginActivator.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/QmitkImageStatisticsViewControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/QmitkMeasurementView.h src/internal/QmitkPlanarFiguresTableModel.h src/internal/QmitkImageStatisticsView.h src/internal/mitkPluginActivator.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES resources/angle.png resources/arrow.png resources/circle.png resources/four-point-angle.png resources/ImageStatistic_24.png resources/ImageStatistic_48.png resources/ImageStatistic_64.png resources/lena.xpm resources/line.png resources/measurement.png resources/path.png resources/polygon.png resources/rectangle.png resources/stats.png resources/text.png plugin.xml ) -SET(QRC_FILES +set(QRC_FILES resources/measurement.qrc resources/QmitkImageStatisticsView.qrc ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.moviemaker/CMakeLists.txt b/Plugins/org.mitk.gui.qt.moviemaker/CMakeLists.txt index 22140aeebb..2302510722 100644 --- a/Plugins/org.mitk.gui.qt.moviemaker/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.moviemaker/CMakeLists.txt @@ -1,9 +1,9 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. -PROJECT(org_mitk_gui_qt_moviemaker) +project(org_mitk_gui_qt_moviemaker) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE MOVIEMAKER_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES QmitkExt ) \ No newline at end of file diff --git a/Plugins/org.mitk.gui.qt.moviemaker/files.cmake b/Plugins/org.mitk.gui.qt.moviemaker/files.cmake index 631a7c5a89..c4e28db992 100644 --- a/Plugins/org.mitk.gui.qt.moviemaker/files.cmake +++ b/Plugins/org.mitk.gui.qt.moviemaker/files.cmake @@ -1,46 +1,46 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES QmitkMovieMaker.cpp mitkMovieMakerPluginActivator.cpp QmitkScreenshotMaker.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/QmitkMovieMakerControls.ui src/internal/QmitkScreenshotMakerControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/mitkMovieMakerPluginActivator.h src/internal/QmitkMovieMaker.h src/internal/QmitkScreenshotMaker.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES resources/icon.xpm plugin.xml resources/play.xpm resources/stop.xpm resources/pause.xpm resources/screenshot_maker.png ) -SET(RES_FILES +set(RES_FILES resources/QmitkMovieMaker.qrc resources/play.xpm resources/stop.xpm resources/pause.xpm ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.pointsetinteraction/CMakeLists.txt b/Plugins/org.mitk.gui.qt.pointsetinteraction/CMakeLists.txt index bdf0247903..de2c794a1b 100644 --- a/Plugins/org.mitk.gui.qt.pointsetinteraction/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.pointsetinteraction/CMakeLists.txt @@ -1,9 +1,9 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. -PROJECT(org_mitk_gui_qt_pointsetinteraction) +project(org_mitk_gui_qt_pointsetinteraction) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE POINTSETINTERACTION_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES QmitkExt ) \ No newline at end of file diff --git a/Plugins/org.mitk.gui.qt.pointsetinteraction/files.cmake b/Plugins/org.mitk.gui.qt.pointsetinteraction/files.cmake index 2bf6295eee..5b5a44cf9d 100644 --- a/Plugins/org.mitk.gui.qt.pointsetinteraction/files.cmake +++ b/Plugins/org.mitk.gui.qt.pointsetinteraction/files.cmake @@ -1,35 +1,35 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES QmitkPointSetInteractionView.cpp mitkPluginActivator.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/QmitkPointSetInteractionViewControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/mitkPluginActivator.h src/internal/QmitkPointSetInteractionView.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES resources/pointset_interaction.png plugin.xml ) -SET(QRC_FILES +set(QRC_FILES resources/QmitkPointSetInteractionView.qrc ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.cmake b/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.cmake index 1b6d4d3f8c..3734c47189 100755 --- a/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.cmake +++ b/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.cmake @@ -1,11 +1,11 @@ # QmitkPointSetInteractionView -MESSAGE(STATUS "processing QmitkPointSetInteractionView.cmake") -MESSAGE(STATUS "APPMOD_CPP before: ${APPMOD_CPP}") +message(STATUS "processing QmitkPointSetInteractionView.cmake") +message(STATUS "APPMOD_CPP before: ${APPMOD_CPP}") -SET( APPMOD_H ${APPMOD_H} QmitkPointSetInteractionView.h ) -SET( APPMOD_MOC_H ${APPMOD_MOC_H} QmitkPointSetInteractionView.h ) -SET( APPMOD_CPP ${APPMOD_CPP} QmitkPointSetInteractionView.cpp ) -SET (APPMOD_FORMS ${APPMOD_FORMS} QmitkPointSetInteractionControls.ui) -MESSAGE(STATUS "APPMOD_CPP after: ${APPMOD_CPP}") +set( APPMOD_H ${APPMOD_H} QmitkPointSetInteractionView.h ) +set( APPMOD_MOC_H ${APPMOD_MOC_H} QmitkPointSetInteractionView.h ) +set( APPMOD_CPP ${APPMOD_CPP} QmitkPointSetInteractionView.cpp ) +set(APPMOD_FORMS ${APPMOD_FORMS} QmitkPointSetInteractionControls.ui) +message(STATUS "APPMOD_CPP after: ${APPMOD_CPP}") diff --git a/Plugins/org.mitk.gui.qt.python.console/CMakeLists.txt b/Plugins/org.mitk.gui.qt.python.console/CMakeLists.txt index 26b2b61bb2..59aab2aaa5 100644 --- a/Plugins/org.mitk.gui.qt.python.console/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.python.console/CMakeLists.txt @@ -1,20 +1,20 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. -IF(MITK_USE_Python) - PROJECT(org_mitk_gui_qt_python_console) +if(MITK_USE_Python) + project(org_mitk_gui_qt_python_console) set(SWIG_PYTHON_WRAPPER _mitkCorePython SwigRuntimePython) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE CONSOLE_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES QmitkExt CTK ) - INCLUDE_DIRECTORIES("${MITK_WRAPPING_SOURCE_DIR}/CSwig" "${MITK_WRAPPING_BINARY_DIR}/CSwig/Core") + include_directories("${MITK_WRAPPING_SOURCE_DIR}/CSwig" "${MITK_WRAPPING_BINARY_DIR}/CSwig/Core") - TARGET_LINK_LIBRARIES(org_mitk_gui_qt_python_console ${SWIG_PYTHON_WRAPPER}) + target_link_libraries(org_mitk_gui_qt_python_console ${SWIG_PYTHON_WRAPPER}) -ELSE() - MESSAGE("MITK Python Console needs Python. Enable MITK_USE_PYTHON") -ENDIF() \ No newline at end of file +else() + message("MITK Python Console needs Python. Enable MITK_USE_PYTHON") +endif() \ No newline at end of file diff --git a/Plugins/org.mitk.gui.qt.python.console/files.cmake b/Plugins/org.mitk.gui.qt.python.console/files.cmake index f4a8ef958b..5a8b6e7991 100644 --- a/Plugins/org.mitk.gui.qt.python.console/files.cmake +++ b/Plugins/org.mitk.gui.qt.python.console/files.cmake @@ -1,61 +1,61 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES mitkPluginActivator.cpp QmitkPythonConsoleView.cpp QmitkPythonEditor.cpp QmitkPythonScriptEditor.cpp QmitkPythonVariableStack.cpp QmitkPythonCommandHistory.cpp QmitkPythonScriptEditorHighlighter.cpp QmitkPythonCommandHistoryTreeWidget.cpp QmitkPythonVariableStackTreeWidget.cpp QmitkPythonTextEditor.cpp QmitkCTKPythonShell.cpp QmitkPythonMediator.cpp QmitkPythonPerspective.cpp QmitkPythonSnippets.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/QmitkPythonConsoleViewControls.ui src/internal/QmitkPythonEditor.ui src/internal/QmitkPythonVariableStack.ui src/internal/QmitkPythonSnippets.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/mitkPluginActivator.h src/internal/QmitkPythonCommandHistory.h src/internal/QmitkPythonCommandHistoryTreeWidget.h src/internal/QmitkPythonConsoleView.h src/internal/QmitkPythonEditor.h src/internal/QmitkPythonPerspective.h src/internal/QmitkPythonScriptEditor.h src/internal/QmitkPythonScriptEditorHighlighter.h src/internal/QmitkPythonTextEditor.h src/internal/QmitkPythonVariableStack.h src/internal/QmitkPythonSnippets.h src/internal/QmitkPythonVariableStackTreeWidget.h src/internal/QmitkCTKPythonShell.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES resources/py.png plugin.xml ) -SET(QRC_FILES +set(QRC_FILES resources/QmitkPythonConsoleView.qrc ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.registration/CMakeLists.txt b/Plugins/org.mitk.gui.qt.registration/CMakeLists.txt index f288c90d8b..7ec141df0f 100644 --- a/Plugins/org.mitk.gui.qt.registration/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.registration/CMakeLists.txt @@ -1,10 +1,10 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. -PROJECT(org_mitk_gui_qt_registration) +project(org_mitk_gui_qt_registration) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE REGISTRATION_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES QmitkExt MitkDeformableRegistration MitkDeformableRegistrationUI MitkRigidRegistration MitkRigidRegistrationUI ) diff --git a/Plugins/org.mitk.gui.qt.registration/files.cmake b/Plugins/org.mitk.gui.qt.registration/files.cmake index f86a449992..4d3be5d1cd 100644 --- a/Plugins/org.mitk.gui.qt.registration/files.cmake +++ b/Plugins/org.mitk.gui.qt.registration/files.cmake @@ -1,77 +1,77 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES mitkPluginActivator.cpp #DeformableRegistration QmitkDeformableRegistrationView.cpp # PointBasedRegistration QmitkPointBasedRegistrationView.cpp QmitkPointBasedRegistrationTesting.cpp mitkLandmarkWarping.cpp # RigidRegistration QmitkRigidRegistrationView.cpp QmitkLoadPresetDialog.cpp QmitkRigidRegistrationSelectorView.cpp ) -SET(UI_FILES +set(UI_FILES #DeformableRegistration src/internal/QmitkDeformableRegistrationViewControls.ui # PointBasedRegistration src/internal/QmitkPointBasedRegistrationViewControls.ui # RigidRegistration src/internal/QmitkRigidRegistrationViewControls.ui src/internal/QmitkRigidRegistrationSelector.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/mitkPluginActivator.h #DeformableRegistration src/internal/QmitkDeformableRegistrationView.h # PointBasedRegistration src/internal/QmitkPointBasedRegistrationView.h # RigidRegistration src/internal/QmitkRigidRegistrationView.h src/internal/QmitkLoadPresetDialog.h src/internal/QmitkRigidRegistrationSelectorView.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES # list of resource files which can be used by the plug-in # system without loading the plug-ins shared library, # for example the icon used in the menu and tabs for the # plug-in views in the workbench plugin.xml #DeformableRegistration resources/DeformableRegistration.xpm # PointBasedRegistration resources/PointBasedRegistration.xpm # RigidRegistration resources/RigidRegistration.xpm ) -SET(QRC_FILES +set(QRC_FILES #DeformableRegistration resources/QmitkDeformableRegistrationView.qrc # PointBasedRegistration resources/QmitkPointBasedRegistrationView.qrc # RigidRegistration resources/QmitkRigidRegistrationView.qrc ) -SET(CPP_FILES +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.segmentation/CMakeLists.txt b/Plugins/org.mitk.gui.qt.segmentation/CMakeLists.txt index eea24414fb..4cf6b1231e 100644 --- a/Plugins/org.mitk.gui.qt.segmentation/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.segmentation/CMakeLists.txt @@ -1,7 +1,7 @@ -PROJECT(org_mitk_gui_qt_segmentation) +project(org_mitk_gui_qt_segmentation) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE MITK_QT_SEGMENTATION EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES QmitkExt ClippingTools ) diff --git a/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/ToolExtensionsGeneralOverview.dox b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/ToolExtensionsGeneralOverview.dox index 14a7073107..a30a965483 100644 --- a/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/ToolExtensionsGeneralOverview.dox +++ b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/ToolExtensionsGeneralOverview.dox @@ -1,181 +1,181 @@ /** \page toolextensions How to extend the Segmentation bundle with external tools
  • \ref ToolExtensionsGeneralOverview2
  • \ref ToolExtensionsGeneralOverview3
    • \ref ToolExtensionsGeneralOverview31
    • \ref ToolExtensionsGeneralOverview32
    • \ref ToolExtensionsGeneralOverview33
  • \ref ToolExtensionsGeneralOverview4
  • \ref ToolExtensionsGeneralOverview5
  • \ref ToolExtensionsGeneralOverview6
\section ToolExtensionsGeneralOverview2 Introduction The application for manual segmentation in MITK (Segmentation bundle) comes with a tool class framework that is extensible with new tools (description at \ref QmitkSegmentationTechnicalPage). The usual way to create new tools (since it is mostly used inside DKFZ) is to just add new files to the MITK source code tree. However, this requires to be familiar with the MITK build system and turnaround time during development might be long (recompiling parts of MITK again and again). For external users who just want to use MITK as a library and application, there is a way to create new segmentation tools in an MITK external project, which will compile the new tools into a shared object (DLL). Such shared objects can be loaded via the ITK object factory and its autoload feature on application startup. This document describes how to build such external extensions. Example files can be found in the MITK source code in the directory ${MITK_SOURCE_DIR}/QApplications/ToolExtensionsExample/. \section ToolExtensionsGeneralOverview3 What might be part of an extension The extension concept assumes that you want to create one or several new interactive segmentation tools for Segmentation or another MITK functionality that uses the tools infrastructure. In the result you will create a shared object (DLL), which contains several tools and their GUI counterparts, plus optional code that your extension requires. The following sections shortly describe each of these parts. \subsection ToolExtensionsGeneralOverview31 Tool classes A tool is basically any subclass of mitk::Tool. Tools are created at runtime through the ITK object factory (so they inherit from itk::Object). Tools should handle the interaction part of a segmentation method, i.e. create seed points, draw contours, etc., in order to parameterize segmentation algorithms. Simple algorithms can even be part of a tool. A tools is identified by icon (XPM format), name (short string) and optionally a group name (e.g. the group name for Segmentation is "default"). There is a naming convention: you should put a tool called \c mitk::ExternalTool into files called \c mitkExternalTool.h and \c mitkExternalTool.cpp. This is \e required if you use the convenience macros described below, because there need to be ITK factories, which names are directly derived from the file names of the tools. For the example of mitk::ExternalTool there would be a factory called \c mitk::ExternalToolFactory in a file named \c mitkExternalToolFactory.cpp. \subsection ToolExtensionsGeneralOverview32 GUI classes for tools Tools are non-graphical classes that only implement interactions in renderwindows. However, some tools will need a means to allow the user to set some parameters -- a graphical user interface, GUI. In the Qt3 case, tool GUIs inherit from QmitkToolGUI, which is a mixture of QWidget and itk::Object. Tool GUIs are also created through the ITK object factory. Tools inform their GUIs about state changes by messages. Tool GUIs communicate with their associated tools via direct method calls (they know their tools). See mitk::BinaryThresholdTool for examples. Again a naming convention: if the convenience macros for tool extension shared objects are used, you have to put a tool GUI called \c QmitkExternalToolGUI into a files named \c QmitkExternalToolGUI.cpp and \c QmitkExternalToolGUI.h. The convenience macro will create a factory called \c QmitkExternalToolGUIFactory into a file named \c QmitkExternalToolGUIFactory.cpp. \subsection ToolExtensionsGeneralOverview33 Additional files If you are writing tools MITK externally, these tools might depend on additional files, e.g. segmentation algorithms. These can also be compiled into a tool extension shared object. \section ToolExtensionsGeneralOverview4 Writing a CMake file for a tool extension Summing up the last section, an example tool extension could comprise the following files: \verbatim mitkExternalTool.h \ mitkExternalTool.xpm >--- implementing mitk::ExternalTool (header, icon, implementation) mitkExternalTool.cpp / QmitkExternalToolGUI.h ,-- implementing a GUI for mitk::ExternalTool QmitkExternalToolGUI.cpp / externalalgorithm.h \ externalalgorithm.cpp \ externalalgorithmsolver.h >-- a couple of files (not related to MITK tools) externalalgorithmsolver.cpp / \endverbatim This should all be compiled into one shared object. Just like ITK, VTK and MITK we will use CMake for this purpose (I assume you either know or are willing to learn about www.cmake.org) A CMake file for the above example would look like this: \code -PROJECT ( ExternalTool ) +project( ExternalTool ) -FIND_PACKAGE(ITK) -FIND_PACKAGE(MITK) -FIND_PACKAGE(Qt3) +find_package(ITK) +find_package(MITK) +find_package(Qt3) -ADD_DEFINITIONS(${QT_DEFINITIONS}) +add_definitions(${QT_DEFINITIONS}) -SET( TOOL_QT3GUI_FILES +set( TOOL_QT3GUI_FILES QmitkExternalToolGUI.cpp ) -SET( TOOL_FILES +set( TOOL_FILES mitkExternalTool.cpp ) -SET( TOOL_ADDITIONAL_CPPS +set( TOOL_ADDITIONAL_CPPS externalalgorithm.cpp externalalgorithmsolver.cpp ) -SET( TOOL_ADDITIONAL_MOC_H +set( TOOL_ADDITIONAL_MOC_H ) MITK_GENERATE_TOOLS_LIBRARY(mitkExternalTools) \endcode Basically, you only have to change the definitions of \c TOOL_FILES and, optionally, \c TOOL_QT3GUI_FILES, \c TOOL_ADDITIONAL_CPPS and \c TOOL_ADDITIONAL_MOC_H. For all .cpp files in \c TOOL_FILES and \c TOOL_QT3GUI_FILES there will be factories created assuming the naming conventions described in the sections above. Files listed in \c TOOL_ADDITIONAL_CPPS will just be compiled. Files listed in \c TOOL_ADDITIONAL_MOC_H will be run through Qts meta object compiler \c moc -- this is neccessary for all objects that have the Q_OBJECT macro in their declaration. \c moc will create new files that will also be compiled into the library. \section ToolExtensionsGeneralOverview5 Compiling the extension For compiling a tool extension, you will need a compiled version of MITK. We will assume MITK was compiled into /home/user/mitk/debug. You need to build MITK with BUILD_SHARED_CORE turned on! You build the tool extension just like any other CMake based project: \li know where your source code is (e.g. /home/user/mitk/tool-extension-src) \li change into the directory, where you want to compile the shared object (e.g. /home/user/mitk/tool-extension-debug) \li invoke cmake: ccmake /home/user/mitk/tool-extension-src \li configure (press c or the "configure" button) \li set the ITK_DIR variable to the directory, where you compiled ITK \li set the MITK_DIR variable to the directory, where you compiled MITK: /home/user/mitk/debug \li configure (press "c" or the "configure" button) \li generate (press "g" or the "generate" button) This should do it and leave you with a or project file or Makefile that you can compile (using make or VisualStudio). \section ToolExtensionsGeneralOverview6 Configuring ITK autoload If the compile succeeds, you will get a library mitkExternalTools.dll or libmitkExternalTools.so. This library exports a symbol \c itkLoad which is expected by the ITK object factory. On application startup the ITK object factory will search a list of directories from the environment variable \c ITK_AUTOLOAD_PATH. Set this environment variable to your binary directory (/home/user/mitk/tool-extension-debug). The ITK object factory will load all shared objects that it finds in the specified directories and will test if they contain a symbol (function pointer) \c itkLoad, which is expected to return a pointer to a itk::ObjectFactoryBase instance. If such a symbol is found, the returned factory will be registered with the ITK object factory. If you successfully followed all the steps above, MITK will find your mitk::ExternalTool on application startup, when the ITK object factory is asked to create all known instances of mitk::Tool. Furthermore, if your mitk::ExternalTool claims to be part of the "default" group, there will be a new icon in Segmentation, which activates your tool. Have fun! (And Windows users: welcome to the world of DLLs) **/ diff --git a/Plugins/org.mitk.gui.qt.segmentation/files.cmake b/Plugins/org.mitk.gui.qt.segmentation/files.cmake index 38332ca8f9..d9dfee5deb 100644 --- a/Plugins/org.mitk.gui.qt.segmentation/files.cmake +++ b/Plugins/org.mitk.gui.qt.segmentation/files.cmake @@ -1,62 +1,62 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES QmitkSegmentationPreferencePage.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES mitkPluginActivator.cpp QmitkSegmentationView.cpp QmitkSegmentationPostProcessing.cpp QmitkThresholdAction.cpp QmitkCreatePolygonModelAction.cpp QmitkStatisticsAction.cpp QmitkAutocropAction.cpp QmitkBooleanOperationsView.cpp QmitkDeformableClippingPlaneView.cpp regiongrowing/QmitkRegionGrowingView.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/QmitkSegmentationControls.ui src/internal/QmitkBooleanOperationsView.ui src/internal/QmitkDeformableClippingPlaneViewControls.ui src/internal/regiongrowing/QmitkRegionGrowingViewControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/QmitkSegmentationPreferencePage.h src/internal/mitkPluginActivator.h src/internal/QmitkSegmentationView.h src/internal/QmitkSegmentationPostProcessing.h src/internal/QmitkThresholdAction.h src/internal/QmitkCreatePolygonModelAction.h src/internal/QmitkStatisticsAction.h src/internal/QmitkAutocropAction.h src/internal/QmitkBooleanOperationsView.h src/internal/QmitkDeformableClippingPlaneView.h src/internal/regiongrowing/QmitkRegionGrowingView.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES resources/segmentation.png resources/boolean.png resources/deformablePlane.png resources/regiongrowing.xpm plugin.xml ) -SET(QRC_FILES +set(QRC_FILES resources/segmentation.qrc resources/boolean.qrc resources/regiongrowing.qrc ) -SET(CPP_FILES) +set(CPP_FILES) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/CMakeLists.txt b/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/CMakeLists.txt index 68c6d2852f..6b09099b4b 100755 --- a/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/CMakeLists.txt @@ -1,8 +1,8 @@ -PROJECT(org_mitk_gui_qt_stdmultiwidgeteditor) +project(org_mitk_gui_qt_stdmultiwidgeteditor) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE ORG_MITK_GUI_QT_STDMULTIWIDGETEDITOR EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES Qmitk SUBPROJECTS MITK-CoreUI ) diff --git a/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/files.cmake b/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/files.cmake index 4829f1df58..1be6bd8610 100755 --- a/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/files.cmake +++ b/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/files.cmake @@ -1,36 +1,36 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES QmitkStdMultiWidgetEditor.cpp ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES org_mitk_gui_qt_stdmultiwidgeteditor_Activator.cpp QmitkStdMultiWidgetEditorPreferencePage.cpp ) -SET(MOC_H_FILES +set(MOC_H_FILES src/QmitkStdMultiWidgetEditor.h src/internal/org_mitk_gui_qt_stdmultiwidgeteditor_Activator.h src/internal/QmitkStdMultiWidgetEditorPreferencePage.h ) -SET(UI_FILES +set(UI_FILES ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml ) -SET(QRC_FILES +set(QRC_FILES ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.toftutorial/CMakeLists.txt b/Plugins/org.mitk.gui.qt.toftutorial/CMakeLists.txt index 8bf27d4bc3..938ad4a72b 100644 --- a/Plugins/org.mitk.gui.qt.toftutorial/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.toftutorial/CMakeLists.txt @@ -1,9 +1,9 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. -PROJECT(org_mitk_gui_qt_toftutorial) +project(org_mitk_gui_qt_toftutorial) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE TOFTUTORIAL_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES QmitkExt mitkToFHardware mitkToFProcessing ) \ No newline at end of file diff --git a/Plugins/org.mitk.gui.qt.toftutorial/files.cmake b/Plugins/org.mitk.gui.qt.toftutorial/files.cmake index aa5533022d..289ef57228 100644 --- a/Plugins/org.mitk.gui.qt.toftutorial/files.cmake +++ b/Plugins/org.mitk.gui.qt.toftutorial/files.cmake @@ -1,37 +1,37 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES QmitkToFTutorialView.cpp mitkPluginActivator.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/QmitkToFTutorialViewControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/QmitkToFTutorialView.h src/internal/mitkPluginActivator.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml resources/icon.xpm ) -SET(QRC_FILES +set(QRC_FILES resources/QmitkToFTutorialView.qrc ) -SET(CPP_FILES) +set(CPP_FILES) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.tofutil/CMakeLists.txt b/Plugins/org.mitk.gui.qt.tofutil/CMakeLists.txt index 1a337da0d3..72549cb9df 100644 --- a/Plugins/org.mitk.gui.qt.tofutil/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.tofutil/CMakeLists.txt @@ -1,11 +1,11 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. -PROJECT(org_mitk_gui_qt_tofutil) +project(org_mitk_gui_qt_tofutil) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE TOFUTIL_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES mitkToFHardware Qmitk QmitkExt mitkTOFUI ) diff --git a/Plugins/org.mitk.gui.qt.tofutil/files.cmake b/Plugins/org.mitk.gui.qt.tofutil/files.cmake index a78dd195f6..70e5b1ec86 100644 --- a/Plugins/org.mitk.gui.qt.tofutil/files.cmake +++ b/Plugins/org.mitk.gui.qt.tofutil/files.cmake @@ -1,39 +1,39 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES QmitkToFUtilView.cpp QmitkToFImageBackground.cpp mitkPluginActivator.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/QmitkToFUtilViewControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/QmitkToFUtilView.h src/internal/QmitkToFImageBackground.h src/internal/mitkPluginActivator.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml resources/icon.xpm ) -SET(QRC_FILES +set(QRC_FILES resources/QmitkToFUtilView.qrc ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.ugvisualization/CMakeLists.txt b/Plugins/org.mitk.gui.qt.ugvisualization/CMakeLists.txt index 429419ef9a..ccda3e814a 100644 --- a/Plugins/org.mitk.gui.qt.ugvisualization/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.ugvisualization/CMakeLists.txt @@ -1,7 +1,7 @@ -PROJECT(org_mitk_gui_qt_ugvisualization) +project(org_mitk_gui_qt_ugvisualization) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE UGVISUALIZATION_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES QmitkExt ) diff --git a/Plugins/org.mitk.gui.qt.ugvisualization/files.cmake b/Plugins/org.mitk.gui.qt.ugvisualization/files.cmake index e666250cd1..cc3101c329 100644 --- a/Plugins/org.mitk.gui.qt.ugvisualization/files.cmake +++ b/Plugins/org.mitk.gui.qt.ugvisualization/files.cmake @@ -1,37 +1,37 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES QmitkUGVisualizationView.cpp mitkPluginActivator.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/QmitkUGVisualizationViewControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/QmitkUGVisualizationView.h src/internal/mitkPluginActivator.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES resources/icon.png plugin.xml ) -SET(QRC_FILES +set(QRC_FILES ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.volumevisualization/CMakeLists.txt b/Plugins/org.mitk.gui.qt.volumevisualization/CMakeLists.txt index c2302f3977..b004f1caf6 100755 --- a/Plugins/org.mitk.gui.qt.volumevisualization/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.volumevisualization/CMakeLists.txt @@ -1,7 +1,7 @@ -PROJECT(org_mitk_gui_qt_volumevisualization) +project(org_mitk_gui_qt_volumevisualization) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE MITK_QT_VOLUMEVISUALIZATION EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES QmitkExt qxt ) diff --git a/Plugins/org.mitk.gui.qt.volumevisualization/files.cmake b/Plugins/org.mitk.gui.qt.volumevisualization/files.cmake index 911ee183d2..1287d40e9d 100755 --- a/Plugins/org.mitk.gui.qt.volumevisualization/files.cmake +++ b/Plugins/org.mitk.gui.qt.volumevisualization/files.cmake @@ -1,37 +1,37 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES mitkPluginActivator.cpp QmitkVolumeVisualizationView.cpp ) -SET(UI_FILES +set(UI_FILES src/internal/QmitkVolumeVisualizationViewControls.ui ) -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/mitkPluginActivator.h src/internal/QmitkVolumeVisualizationView.h ) -SET(CACHED_RESOURCE_FILES +set(CACHED_RESOURCE_FILES plugin.xml resources/icon.xpm ) -SET(QRC_FILES +set(QRC_FILES ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.inputdevices.spacenavigator/CMakeLists.txt b/Plugins/org.mitk.inputdevices.spacenavigator/CMakeLists.txt index e56eb20a28..911003f758 100644 --- a/Plugins/org.mitk.inputdevices.spacenavigator/CMakeLists.txt +++ b/Plugins/org.mitk.inputdevices.spacenavigator/CMakeLists.txt @@ -1,3 +1,3 @@ -IF(WIN32) +if(WIN32) MACRO_CREATE_MITK_PLUGIN(mitkSpaceNavigator) -ENDIF(WIN32) +endif(WIN32) diff --git a/Plugins/org.mitk.inputdevices.spacenavigator/files.cmake b/Plugins/org.mitk.inputdevices.spacenavigator/files.cmake index 7d63d8ace4..e94bb024c9 100644 --- a/Plugins/org.mitk.inputdevices.spacenavigator/files.cmake +++ b/Plugins/org.mitk.inputdevices.spacenavigator/files.cmake @@ -1,35 +1,35 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES mitkSpaceNavigatorActivator.cpp ) -SET(UI_FILES +set(UI_FILES ) -SET(MOC_H_FILES +set(MOC_H_FILES ) -SET(RESOURCE_FILES +set(RESOURCE_FILES ) -SET(RES_FILES +set(RES_FILES ) -SET(CPP_FILES manifest.cpp) +set(CPP_FILES manifest.cpp) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.inputdevices.wiimote/CMakeLists.txt b/Plugins/org.mitk.inputdevices.wiimote/CMakeLists.txt index 5199a45d03..2132a88f14 100644 --- a/Plugins/org.mitk.inputdevices.wiimote/CMakeLists.txt +++ b/Plugins/org.mitk.inputdevices.wiimote/CMakeLists.txt @@ -1,3 +1,3 @@ -IF(WIN32) +if(WIN32) MACRO_CREATE_MITK_PLUGIN(mitkWiiMote) -ENDIF(WIN32) +endif(WIN32) diff --git a/Plugins/org.mitk.inputdevices.wiimote/files.cmake b/Plugins/org.mitk.inputdevices.wiimote/files.cmake index b357749b31..85b14fb84b 100644 --- a/Plugins/org.mitk.inputdevices.wiimote/files.cmake +++ b/Plugins/org.mitk.inputdevices.wiimote/files.cmake @@ -1,34 +1,34 @@ -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES mitkWiiMoteActivator.cpp ) -SET(UI_FILES +set(UI_FILES ) -SET(MOC_H_FILES +set(MOC_H_FILES ) -SET(RESOURCE_FILES +set(RESOURCE_FILES ) -SET(RES_FILES +set(RES_FILES ) -SET(CPP_FILES manifest.cpp) +set(CPP_FILES manifest.cpp) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.planarfigure/CMakeLists.txt b/Plugins/org.mitk.planarfigure/CMakeLists.txt index 31bdd65aba..447864ee61 100644 --- a/Plugins/org.mitk.planarfigure/CMakeLists.txt +++ b/Plugins/org.mitk.planarfigure/CMakeLists.txt @@ -1,7 +1,7 @@ -PROJECT(org_mitk_planarfigure) +project(org_mitk_planarfigure) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE ORG_MITK_PLANARFIGURE_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES PlanarFigure Qmitk ) diff --git a/Plugins/org.mitk.planarfigure/files.cmake b/Plugins/org.mitk.planarfigure/files.cmake index b43ad1682a..ab08ee0f37 100644 --- a/Plugins/org.mitk.planarfigure/files.cmake +++ b/Plugins/org.mitk.planarfigure/files.cmake @@ -1,22 +1,22 @@ -SET(MOC_H_FILES +set(MOC_H_FILES src/internal/mitkPlanarFigureActivator.h ) -SET(SRC_CPP_FILES +set(SRC_CPP_FILES ) -SET(INTERNAL_CPP_FILES +set(INTERNAL_CPP_FILES mitkPlanarFigureActivator.cpp ) -SET(CPP_FILES ) +set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) + set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) + set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/SuperBuild.cmake b/SuperBuild.cmake index c760570fac..9273d6c61b 100644 --- a/SuperBuild.cmake +++ b/SuperBuild.cmake @@ -1,309 +1,309 @@ #----------------------------------------------------------------------------- # Convenient macro allowing to download a file #----------------------------------------------------------------------------- -MACRO(downloadFile url dest) - FILE(DOWNLOAD ${url} ${dest} STATUS status) - LIST(GET status 0 error_code) - LIST(GET status 1 error_msg) - IF(error_code) - MESSAGE(FATAL_ERROR "error: Failed to download ${url} - ${error_msg}") - ENDIF() -ENDMACRO() +macro(downloadFile url dest) + file(DOWNLOAD ${url} ${dest} STATUS status) + list(GET status 0 error_code) + list(GET status 1 error_msg) + if(error_code) + message(FATAL_ERROR "error: Failed to download ${url} - ${error_msg}") + endif() +endmacro() #----------------------------------------------------------------------------- # MITK Prerequisites #----------------------------------------------------------------------------- if(UNIX AND NOT APPLE) #----------------------------- libxt-dev -------------------- - INCLUDE(${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake) + include(${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake) set(CMAKE_REQUIRED_INCLUDES "/usr/include/X11/") CHECK_INCLUDE_FILE("StringDefs.h" STRING_DEFS_H) if(NOT STRING_DEFS_H) message(FATAL_ERROR "error: could not find StringDefs.h provided by libxt-dev") endif() set(CMAKE_REQUIRED_INCLUDES "/usr/include/") CHECK_INCLUDE_FILE("tiff.h" TIFF_H) if(NOT TIFF_H) message(FATAL_ERROR "error: could not find tiff.h - libtiff4-dev needs to be installed") endif() CHECK_INCLUDE_FILE("tcpd.h" LIB_WRAP) if(NOT LIB_WRAP) message(FATAL_ERROR "error: could not find tcpd.h - libwrap0-dev needs to be installed") endif() endif() #----------------------------------------------------------------------------- # ExternalProjects #----------------------------------------------------------------------------- -SET(external_projects +set(external_projects VTK GDCM CableSwig ITK Boost DCMTK CTK OpenCV MITKData ) set(MITK_USE_CableSwig ${MITK_USE_Python}) set(MITK_USE_GDCM 1) set(MITK_USE_ITK 1) set(MITK_USE_VTK 1) foreach(proj VTK GDCM CableSwig ITK DCMTK CTK OpenCV) if(MITK_USE_${proj}) set(EXTERNAL_${proj}_DIR "${${proj}_DIR}" CACHE PATH "Path to ${proj} build directory") mark_as_advanced(EXTERNAL_${proj}_DIR) if(EXTERNAL_${proj}_DIR) set(${proj}_DIR ${EXTERNAL_${proj}_DIR}) endif() endif() endforeach() if(MITK_USE_Boost) set(EXTERNAL_BOOST_ROOT "${BOOST_ROOT}" CACHE PATH "Path to Boost directory") mark_as_advanced(EXTERNAL_BOOST_ROOT) if(EXTERNAL_BOOST_ROOT) set(BOOST_ROOT ${EXTERNAL_BOOST_ROOT}) endif() endif() if(BUILD_TESTING) set(EXTERNAL_MITK_DATA_DIR "${MITK_DATA_DIR}" CACHE PATH "Path to the MITK data directory") mark_as_advanced(EXTERNAL_MITK_DATA_DIR) if(EXTERNAL_MITK_DATA_DIR) set(MITK_DATA_DIR ${EXTERNAL_MITK_DATA_DIR}) endif() endif() # Look for git early on, if needed if((BUILD_TESTING AND NOT EXTERNAL_MITK_DATA_DIR) OR (MITK_USE_CTK AND NOT EXTERNAL_CTK_DIR)) find_package(Git REQUIRED) endif() #----------------------------------------------------------------------------- # External project settings #----------------------------------------------------------------------------- -INCLUDE(ExternalProject) +include(ExternalProject) -SET(ep_base "${CMAKE_BINARY_DIR}/CMakeExternals") -SET_PROPERTY(DIRECTORY PROPERTY EP_BASE ${ep_base}) +set(ep_base "${CMAKE_BINARY_DIR}/CMakeExternals") +set_property(DIRECTORY PROPERTY EP_BASE ${ep_base}) -SET(ep_install_dir ${ep_base}/Install) -#SET(ep_build_dir ${ep_base}/Build) -SET(ep_source_dir ${ep_base}/Source) -#SET(ep_parallelism_level) -SET(ep_build_shared_libs ON) -SET(ep_build_testing OFF) +set(ep_install_dir ${ep_base}/Install) +#set(ep_build_dir ${ep_base}/Build) +set(ep_source_dir ${ep_base}/Source) +#set(ep_parallelism_level) +set(ep_build_shared_libs ON) +set(ep_build_testing OFF) -IF(NOT MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL) - SET(MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL http://mitk.org/download/thirdparty) -ENDIF() +if(NOT MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL) + set(MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL http://mitk.org/download/thirdparty) +endif() # Compute -G arg for configuring external projects with the same CMake generator: -IF(CMAKE_EXTRA_GENERATOR) - SET(gen "${CMAKE_EXTRA_GENERATOR} - ${CMAKE_GENERATOR}") -ELSE() - SET(gen "${CMAKE_GENERATOR}") -ENDIF() +if(CMAKE_EXTRA_GENERATOR) + set(gen "${CMAKE_EXTRA_GENERATOR} - ${CMAKE_GENERATOR}") +else() + set(gen "${CMAKE_GENERATOR}") +endif() # Use this value where semi-colons are needed in ep_add args: set(sep "^^") ## -IF(MSVC90 OR MSVC10) - SET(ep_common_C_FLAGS "${CMAKE_C_FLAGS} /bigobj /MP") - SET(ep_common_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj /MP") -ELSE() - SET(ep_common_C_FLAGS "${CMAKE_C_FLAGS} -DLINUX_EXTRA") - SET(ep_common_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLINUX_EXTRA") -ENDIF() +if(MSVC90 OR MSVC10) + set(ep_common_C_FLAGS "${CMAKE_C_FLAGS} /bigobj /MP") + set(ep_common_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj /MP") +else() + set(ep_common_C_FLAGS "${CMAKE_C_FLAGS} -DLINUX_EXTRA") + set(ep_common_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLINUX_EXTRA") +endif() -SET(ep_common_args +set(ep_common_args -DBUILD_TESTING:BOOL=${ep_build_testing} -DCMAKE_INSTALL_PREFIX:PATH=${ep_install_dir} -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER} -DCMAKE_C_FLAGS:STRING=${ep_common_C_FLAGS} -DCMAKE_CXX_FLAGS:STRING=${ep_common_CXX_FLAGS} #debug flags -DCMAKE_CXX_FLAGS_DEBUG:STRING=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_C_FLAGS_DEBUG:STRING=${CMAKE_C_FLAGS_DEBUG} #release flags -DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE} #relwithdebinfo -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING=${CMAKE_C_FLAGS_RELWITHDEBINFO} ) # Include external projects -FOREACH(p ${external_projects}) - INCLUDE(CMakeExternals/${p}.cmake) -ENDFOREACH() +foreach(p ${external_projects}) + include(CMakeExternals/${p}.cmake) +endforeach() #----------------------------------------------------------------------------- # Set superbuild boolean args #----------------------------------------------------------------------------- -SET(mitk_cmake_boolean_args +set(mitk_cmake_boolean_args BUILD_SHARED_LIBS WITH_COVERAGE BUILD_TESTING MITK_USE_QT MITK_BUILD_ALL_PLUGINS MITK_BUILD_ALL_APPS MITK_BUILD_TUTORIAL MITK_USE_Boost MITK_USE_SYSTEM_Boost MITK_USE_BLUEBERRY MITK_USE_CTK MITK_USE_DCMTK MITK_USE_OpenCV MITK_USE_Python ) #----------------------------------------------------------------------------- # Create the final variable containing superbuild boolean args #----------------------------------------------------------------------------- -SET(mitk_superbuild_boolean_args) -FOREACH(mitk_cmake_arg ${mitk_cmake_boolean_args}) - LIST(APPEND mitk_superbuild_boolean_args -D${mitk_cmake_arg}:BOOL=${${mitk_cmake_arg}}) -ENDFOREACH() +set(mitk_superbuild_boolean_args) +foreach(mitk_cmake_arg ${mitk_cmake_boolean_args}) + list(APPEND mitk_superbuild_boolean_args -D${mitk_cmake_arg}:BOOL=${${mitk_cmake_arg}}) +endforeach() -IF(MITK_BUILD_ALL_PLUGINS) - LIST(APPEND mitk_superbuild_boolean_args -DBLUEBERRY_BUILD_ALL_PLUGINS:BOOL=ON) -ENDIF() +if(MITK_BUILD_ALL_PLUGINS) + list(APPEND mitk_superbuild_boolean_args -DBLUEBERRY_BUILD_ALL_PLUGINS:BOOL=ON) +endif() #----------------------------------------------------------------------------- # MITK Utilities #----------------------------------------------------------------------------- set(proj MITK-Utilities) ExternalProject_Add(${proj} DOWNLOAD_COMMAND "" CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" DEPENDS # Mandatory dependencies ${VTK_DEPENDS} ${ITK_DEPENDS} # Optionnal dependencies ${Boost_DEPENDS} ${CTK_DEPENDS} ${DCMTK_DEPENDS} ${OpenCV_DEPENDS} ${MITK-Data_DEPENDS} ) #----------------------------------------------------------------------------- # MITK Configure #----------------------------------------------------------------------------- -IF(MITK_INITIAL_CACHE_FILE) - SET(mitk_initial_cache_arg -C "${MITK_INITIAL_CACHE_FILE}") -ENDIF() +if(MITK_INITIAL_CACHE_FILE) + set(mitk_initial_cache_arg -C "${MITK_INITIAL_CACHE_FILE}") +endif() -SET(mitk_optional_cache_args ) -FOREACH(type RUNTIME ARCHIVE LIBRARY) - IF(DEFINED CTK_PLUGIN_${type}_OUTPUT_DIRECTORY) - LIST(APPEND mitk_optional_cache_args -DCTK_PLUGIN_${type}_OUTPUT_DIRECTORY:PATH=${CTK_PLUGIN_${type}_OUTPUT_DIRECTORY}) - ENDIF() -ENDFOREACH() +set(mitk_optional_cache_args ) +foreach(type RUNTIME ARCHIVE LIBRARY) + if(DEFINED CTK_PLUGIN_${type}_OUTPUT_DIRECTORY) + list(APPEND mitk_optional_cache_args -DCTK_PLUGIN_${type}_OUTPUT_DIRECTORY:PATH=${CTK_PLUGIN_${type}_OUTPUT_DIRECTORY}) + endif() +endforeach() -SET(proj MITK-Configure) +set(proj MITK-Configure) ExternalProject_Add(${proj} LIST_SEPARATOR ^^ DOWNLOAD_COMMAND "" CMAKE_GENERATOR ${gen} CMAKE_CACHE_ARGS ${ep_common_args} ${mitk_superbuild_boolean_args} ${mitk_optional_cache_args} -DMITK_USE_SUPERBUILD:BOOL=OFF -DMITK_CMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${MITK_CMAKE_LIBRARY_OUTPUT_DIRECTORY} -DMITK_CMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${MITK_CMAKE_RUNTIME_OUTPUT_DIRECTORY} -DMITK_CMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${MITK_CMAKE_ARCHIVE_OUTPUT_DIRECTORY} -DCTEST_USE_LAUNCHERS:BOOL=${CTEST_USE_LAUNCHERS} -DMITK_CTEST_SCRIPT_MODE:STRING=${MITK_CTEST_SCRIPT_MODE} -DMITK_SUPERBUILD_BINARY_DIR:PATH=${MITK_BINARY_DIR} -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -DMITK_KWSTYLE_EXECUTABLE:FILEPATH=${MITK_KWSTYLE_EXECUTABLE} -DMITK_MODULES_TO_BUILD:INTERNAL=${MITK_MODULES_TO_BUILD} -DCTK_DIR:PATH=${CTK_DIR} -DDCMTK_DIR:PATH=${DCMTK_DIR} -DVTK_DIR:PATH=${VTK_DIR} # FindVTK expects VTK_DIR -DITK_DIR:PATH=${ITK_DIR} # FindITK expects ITK_DIR -DOpenCV_DIR:PATH=${OpenCV_DIR} -DGDCM_DIR:PATH=${GDCM_DIR} -DBOOST_ROOT:PATH=${BOOST_ROOT} -DMITK_USE_Boost_LIBRARIES:STRING=${MITK_USE_Boost_LIBRARIES} -DMITK_DATA_DIR:PATH=${MITK_DATA_DIR} -DMITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES:STRING=${MITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES} -DMITK_ACCESSBYITK_FLOATING_PIXEL_TYPES:STRING=${MITK_ACCESSBYITK_FLOATING_PIXEL_TYPES} -DMITK_ACCESSBYITK_COMPOSITE_PIXEL_TYPES:STRING=${MITK_ACCESSBYITK_COMPOSITE_PIXEL_TYPES} -DMITK_ACCESSBYITK_DIMENSIONS:STRING=${MITK_ACCESSBYITK_DIMENSIONS} CMAKE_ARGS ${mitk_initial_cache_arg} SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} BINARY_DIR ${CMAKE_BINARY_DIR}/MITK-build BUILD_COMMAND "" INSTALL_COMMAND "" DEPENDS MITK-Utilities ) #----------------------------------------------------------------------------- # MITK #----------------------------------------------------------------------------- -IF(CMAKE_GENERATOR MATCHES ".*Makefiles.*") - SET(mitk_build_cmd "$(MAKE)") -ELSE() - SET(mitk_build_cmd ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/MITK-build --config ${CMAKE_CFG_INTDIR}) -ENDIF() +if(CMAKE_GENERATOR MATCHES ".*Makefiles.*") + set(mitk_build_cmd "$(MAKE)") +else() + set(mitk_build_cmd ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/MITK-build --config ${CMAKE_CFG_INTDIR}) +endif() -IF(NOT DEFINED SUPERBUILD_EXCLUDE_MITKBUILD_TARGET OR NOT SUPERBUILD_EXCLUDE_MITKBUILD_TARGET) - SET(MITKBUILD_TARGET_ALL_OPTION "ALL") -ELSE() - SET(MITKBUILD_TARGET_ALL_OPTION "") -ENDIF() +if(NOT DEFINED SUPERBUILD_EXCLUDE_MITKBUILD_TARGET OR NOT SUPERBUILD_EXCLUDE_MITKBUILD_TARGET) + set(MITKBUILD_TARGET_ALL_OPTION "ALL") +else() + set(MITKBUILD_TARGET_ALL_OPTION "") +endif() -ADD_CUSTOM_TARGET(MITK-build ${MITKBUILD_TARGET_ALL_OPTION} +add_custom_target(MITK-build ${MITKBUILD_TARGET_ALL_OPTION} COMMAND ${mitk_build_cmd} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/MITK-build DEPENDS MITK-Configure ) #----------------------------------------------------------------------------- # Custom target allowing to drive the build of the MITK project itself #----------------------------------------------------------------------------- -ADD_CUSTOM_TARGET(MITK +add_custom_target(MITK COMMAND ${mitk_build_cmd} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/MITK-build ) diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt index 3160b9de00..b7db4ff132 100644 --- a/Utilities/CMakeLists.txt +++ b/Utilities/CMakeLists.txt @@ -1,49 +1,49 @@ SUPPRESS_ALL_WARNINGS() # most stuff of these uses itk_zlib.h (via mitkIpPic.h) -FIND_PACKAGE(ITK) -INCLUDE(${ITK_USE_FILE}) +find_package(ITK) +include(${ITK_USE_FILE}) # some legacy util files include in the old style with prefixed directory, # like #include -INCLUDE_DIRECTORIES(.) +include_directories(.) -SUBDIRS( +subdirs( ann ipSegmentation IIL4MITK pic2vtk tinyxml Poco qwt qxt mbilog glew vecmath qtsingleapplication ) # mbilog is independent of mitk, and cant use mitk macros # configuring happens through mbilog/mbilogConfig.cmake.in -SET(mbilog_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/mbilog" "${CMAKE_CURRENT_BINARY_DIR}/mbilog") -SET(mbilog_CONFIG_FILE "${PROJECT_BINARY_DIR}/${MODULES_CONF_DIRNAME}/mbilogConfig.cmake" CACHE INTERNAL "Path to module config" FORCE) -CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/mbilog/mbilogConfig.cmake.in" "${mbilog_CONFIG_FILE}") +set(mbilog_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/mbilog" "${CMAKE_CURRENT_BINARY_DIR}/mbilog") +set(mbilog_CONFIG_FILE "${PROJECT_BINARY_DIR}/${MODULES_CONF_DIRNAME}/mbilogConfig.cmake" CACHE INTERNAL "Path to module config" FORCE) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mbilog/mbilogConfig.cmake.in" "${mbilog_CONFIG_FILE}") -# IF(NOT MITK_CHILI_PLUGIN) -SUBDIRS(ipPic ipFunc) -ADD_SUBDIRECTORY(KWStyle) -# ENDIF(NOT MITK_CHILI_PLUGIN) +# if(NOT MITK_CHILI_PLUGIN) +subdirs(ipPic ipFunc) +add_subdirectory(KWStyle) +# endif(NOT MITK_CHILI_PLUGIN) -SET(Poco_INCLUDE_DIR +set(Poco_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Poco CACHE PATH "top-level directory containing the poco include directories. E.g /usr/local/include/ or c:\\poco\\include\\poco-1.3.2" ) -SET(Poco_LIBRARY_DIR +set(Poco_LIBRARY_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} CACHE PATH "top-level directory containing the poco libraries." ) diff --git a/Utilities/IIL4MITK/CMakeLists.txt b/Utilities/IIL4MITK/CMakeLists.txt index ae9abe0443..d6bd1c912c 100644 --- a/Utilities/IIL4MITK/CMakeLists.txt +++ b/Utilities/IIL4MITK/CMakeLists.txt @@ -1,16 +1,16 @@ -FIND_PACKAGE(VTK) -INCLUDE(${VTK_USE_FILE}) +find_package(VTK) +include(${VTK_USE_FILE}) # mitkGL.h is in Core/Rendering :( -FIND_PACKAGE(OpenGL) -IF(NOT OPENGL_FOUND) - MESSAGE("GL is required for MITK rendering") -ENDIF(NOT OPENGL_FOUND ) -INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) -INCLUDE_DIRECTORIES(../ipPic) +find_package(OpenGL) +if(NOT OPENGL_FOUND) + message("GL is required for MITK rendering") +endif(NOT OPENGL_FOUND ) +include_directories(${OPENGL_INCLUDE_DIR}) +include_directories(../ipPic) -ADD_LIBRARY(IIL4MITK ${MITK_WIN32_FORCE_STATIC} image.cpp item.cpp picimage.cpp texture.cpp) -TARGET_LINK_LIBRARIES(IIL4MITK ${OPENGL_LIBRARIES} ${IPPIC_LIBRARIES}) +add_library(IIL4MITK ${MITK_WIN32_FORCE_STATIC} image.cpp item.cpp picimage.cpp texture.cpp) +target_link_libraries(IIL4MITK ${OPENGL_LIBRARIES} ${IPPIC_LIBRARIES}) MITK_CREATE_MODULE_CONF(IIL4MITK DEPENDS mitkIpPic ) diff --git a/Utilities/KWStyle/CMakeLists.txt b/Utilities/KWStyle/CMakeLists.txt index 75c823cb6b..1efe3f7ede 100644 --- a/Utilities/KWStyle/CMakeLists.txt +++ b/Utilities/KWStyle/CMakeLists.txt @@ -1,9 +1,9 @@ -IF(UNIX) - CONFIGURE_FILE(${MITK_SOURCE_DIR}/Utilities/KWStyle/doAllStyle.csh.in +if(UNIX) + configure_file(${MITK_SOURCE_DIR}/Utilities/KWStyle/doAllStyle.csh.in ${MITK_BINARY_DIR}/doAllStyle.csh @ONLY IMMEDIATE) - EXEC_PROGRAM(chmod ARGS 755 \"${MITK_BINARY_DIR}/doAllStyle.csh\" + exec_program(chmod ARGS 755 \"${MITK_BINARY_DIR}/doAllStyle.csh\" OUTPUT_VARIABLE MITK_EXEC_PLEASE_BE_QUIET) -ENDIF(UNIX) -INCLUDE(KWStyle.cmake) +endif(UNIX) +include(KWStyle.cmake) diff --git a/Utilities/KWStyle/KWStyle.cmake b/Utilities/KWStyle/KWStyle.cmake index 0dae6a786f..2e2079f471 100644 --- a/Utilities/KWStyle/KWStyle.cmake +++ b/Utilities/KWStyle/KWStyle.cmake @@ -1,117 +1,117 @@ -OPTION(MITK_USE_KWSTYLE "Enable the use of KWStyle for checking coding style." OFF) -IF(MITK_USE_KWSTYLE) +option(MITK_USE_KWSTYLE "Enable the use of KWStyle for checking coding style." OFF) +if(MITK_USE_KWSTYLE) # Set the required KWStyle version -SET(KWSTYLE_REQ_MAJOR 1) -SET(KWSTYLE_REQ_MINOR 0) -SET(KWSTYLE_REQ_PATCH 1) +set(KWSTYLE_REQ_MAJOR 1) +set(KWSTYLE_REQ_MINOR 0) +set(KWSTYLE_REQ_PATCH 1) -OPTION(KWSTYLE_USE_VIM_FORMAT "Set KWStyle to generate errors with a VIM-compatible format." OFF) -OPTION(KWSTYLE_USE_MSVC_FORMAT "Set KWStyle to generate errors with a VisualStudio-compatible format." OFF) +option(KWSTYLE_USE_VIM_FORMAT "Set KWStyle to generate errors with a VIM-compatible format." OFF) +option(KWSTYLE_USE_MSVC_FORMAT "Set KWStyle to generate errors with a VisualStudio-compatible format." OFF) -FIND_PROGRAM(KWSTYLE_EXECUTABLE +find_program(KWSTYLE_EXECUTABLE NAMES KWStyle PATHS /usr/local/bin ) -IF(KWSTYLE_EXECUTABLE) +if(KWSTYLE_EXECUTABLE) - EXECUTE_PROCESS( + execute_process( COMMAND ${KWSTYLE_EXECUTABLE} -version OUTPUT_VARIABLE KWSTYLE_VERSION_TEXT ) string(STRIP ${KWSTYLE_VERSION_TEXT} KWSTYLE_VERSION_TEXT) -IF(KWSTYLE_VERSION_TEXT STREQUAL "Version: Not defined") - MESSAGE("This project requires a newer version of KWStyle. Please upgrade the KWStyle executable.") -ELSE(${KWSTYLE_VERSION_TEXT} STREQUAL "Version: Not defined") +if(KWSTYLE_VERSION_TEXT STREQUAL "Version: Not defined") + message("This project requires a newer version of KWStyle. Please upgrade the KWStyle executable.") +else(${KWSTYLE_VERSION_TEXT} STREQUAL "Version: Not defined") string(LENGTH ${KWSTYLE_VERSION_TEXT} KWSTYLE_VERSION_LENGTH) math(EXPR KWSTYLE_VERSION_FINAL_LENGTH "${KWSTYLE_VERSION_LENGTH}-9") string(SUBSTRING ${KWSTYLE_VERSION_TEXT} 9 ${KWSTYLE_VERSION_FINAL_LENGTH} KWSTYLE_VERSION) # now parse the parts of the user given version string into variables - STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" KWSTYLE_MAJOR_VERSION "${KWSTYLE_VERSION}") - STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" KWSTYLE_MINOR_VERSION "${KWSTYLE_VERSION}") - STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" KWSTYLE_PATCH_VERSION "${KWSTYLE_VERSION}") + string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" KWSTYLE_MAJOR_VERSION "${KWSTYLE_VERSION}") + string(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" KWSTYLE_MINOR_VERSION "${KWSTYLE_VERSION}") + string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" KWSTYLE_PATCH_VERSION "${KWSTYLE_VERSION}") - MATH(EXPR KWSTYLE_REQ_VERSION "${KWSTYLE_REQ_MAJOR}*10000 + ${KWSTYLE_REQ_MINOR}*100 + ${KWSTYLE_REQ_PATCH}") - MATH(EXPR KWSTYLE_LONG_VERSION "${KWSTYLE_MAJOR_VERSION}*10000 + ${KWSTYLE_MINOR_VERSION}*100 + ${KWSTYLE_PATCH_VERSION}") + math(EXPR KWSTYLE_REQ_VERSION "${KWSTYLE_REQ_MAJOR}*10000 + ${KWSTYLE_REQ_MINOR}*100 + ${KWSTYLE_REQ_PATCH}") + math(EXPR KWSTYLE_LONG_VERSION "${KWSTYLE_MAJOR_VERSION}*10000 + ${KWSTYLE_MINOR_VERSION}*100 + ${KWSTYLE_PATCH_VERSION}") # Set the minimum require version for batchmake - IF(KWSTYLE_LONG_VERSION LESS KWSTYLE_REQ_VERSION) - MESSAGE(FATAL_ERROR "This project requires a newer version of KWStyle. Please upgrade the KWStyle executable.") - ELSE(KWSTYLE_LONG_VERSION LESS KWSTYLE_REQ_VERSION) - SET(KWSTYLE_FOUND 1) - ENDIF(KWSTYLE_LONG_VERSION LESS KWSTYLE_REQ_VERSION) -ENDIF(KWSTYLE_VERSION_TEXT STREQUAL "Version: Not defined") - -IF(KWSTYLE_FOUND) + if(KWSTYLE_LONG_VERSION LESS KWSTYLE_REQ_VERSION) + message(FATAL_ERROR "This project requires a newer version of KWStyle. Please upgrade the KWStyle executable.") + else(KWSTYLE_LONG_VERSION LESS KWSTYLE_REQ_VERSION) + set(KWSTYLE_FOUND 1) + endif(KWSTYLE_LONG_VERSION LESS KWSTYLE_REQ_VERSION) +endif(KWSTYLE_VERSION_TEXT STREQUAL "Version: Not defined") + +if(KWSTYLE_FOUND) # # Define file names # -SET(KWSTYLE_CONFIGURATION_FILE +set(KWSTYLE_CONFIGURATION_FILE ${PROJECT_BINARY_DIR}/Utilities/KWStyle/MITK.kws.xml) -SET(KWSTYLE_MITK_FILES_LIST +set(KWSTYLE_MITK_FILES_LIST ${PROJECT_BINARY_DIR}/Utilities/KWStyle/MITKFiles.txt) -SET(KWSTYLE_MITK_OVERWRITE_FILE +set(KWSTYLE_MITK_OVERWRITE_FILE ${PROJECT_SOURCE_DIR}/Utilities/KWStyle/MITKOverwrite.txt ) # # Configure the files # -CONFIGURE_FILE( +configure_file( ${PROJECT_SOURCE_DIR}/Utilities/KWStyle/MITKFiles.txt.in ${KWSTYLE_MITK_FILES_LIST}) -CONFIGURE_FILE( +configure_file( ${PROJECT_SOURCE_DIR}/Utilities/KWStyle/MITK.kws.xml.in ${KWSTYLE_CONFIGURATION_FILE}) # # Define formatting for error messages # -SET(KWSTYLE_EDITOR_FORMAT " ") -SET(KWSTYLE_EDITOR_FORMAT "") +set(KWSTYLE_EDITOR_FORMAT " ") +set(KWSTYLE_EDITOR_FORMAT "") -IF(${CMAKE_CXX_COMPILER} MATCHES "cl.exe$") - SET(KWSTYLE_USE_MSVC_FORMAT 1) -ENDIF(${CMAKE_CXX_COMPILER} MATCHES "cl.exe$") +if(${CMAKE_CXX_COMPILER} MATCHES "cl.exe$") + set(KWSTYLE_USE_MSVC_FORMAT 1) +endif(${CMAKE_CXX_COMPILER} MATCHES "cl.exe$") -IF(${CMAKE_C_COMPILER} MATCHES "g[cx][cx]$") - SET(KWSTYLE_USE_VIM_FORMAT 1) -ENDIF(${CMAKE_C_COMPILER} MATCHES "g[cx][cx]$") +if(${CMAKE_C_COMPILER} MATCHES "g[cx][cx]$") + set(KWSTYLE_USE_VIM_FORMAT 1) +endif(${CMAKE_C_COMPILER} MATCHES "g[cx][cx]$") -IF(KWSTYLE_USE_VIM_FORMAT) - SET(KWSTYLE_EDITOR_FORMAT -vim) -ENDIF(KWSTYLE_USE_VIM_FORMAT) +if(KWSTYLE_USE_VIM_FORMAT) + set(KWSTYLE_EDITOR_FORMAT -vim) +endif(KWSTYLE_USE_VIM_FORMAT) -IF(KWSTYLE_USE_MSVC_FORMAT) - SET(KWSTYLE_EDITOR_FORMAT -msvc) -ENDIF(KWSTYLE_USE_MSVC_FORMAT) +if(KWSTYLE_USE_MSVC_FORMAT) + set(KWSTYLE_EDITOR_FORMAT -msvc) +endif(KWSTYLE_USE_MSVC_FORMAT) -SET(KWSTYLE_ARGUMENTS_CODE +set(KWSTYLE_ARGUMENTS_CODE -xml ${KWSTYLE_CONFIGURATION_FILE} -v -D ${KWSTYLE_MITK_FILES_LIST} -o ${KWSTYLE_MITK_OVERWRITE_FILE} ${KWSTYLE_EDITOR_FORMAT} ) -ADD_CUSTOM_COMMAND( +add_custom_command( OUTPUT ${MITK_BINARY_DIR}/KWStyleCodeReport.txt COMMAND ${KWSTYLE_EXECUTABLE} ARGS ${KWSTYLE_ARGUMENTS_CODE} COMMENT "Coding Style Checker" ) -ADD_CUSTOM_TARGET(StyleCheckCode DEPENDS ${MITK_BINARY_DIR}/KWStyleCodeReport.txt) +add_custom_target(StyleCheckCode DEPENDS ${MITK_BINARY_DIR}/KWStyleCodeReport.txt) -ADD_TEST(KWStyleCodeTest ${KWSTYLE_EXECUTABLE} ${KWSTYLE_ARGUMENTS_CODE}) +add_test(KWStyleCodeTest ${KWSTYLE_EXECUTABLE} ${KWSTYLE_ARGUMENTS_CODE}) -ENDIF(KWSTYLE_FOUND) -ENDIF(KWSTYLE_EXECUTABLE) -ENDIF(MITK_USE_KWSTYLE) +endif(KWSTYLE_FOUND) +endif(KWSTYLE_EXECUTABLE) +endif(MITK_USE_KWSTYLE) diff --git a/Utilities/Poco/CMakeLists.txt b/Utilities/Poco/CMakeLists.txt index d90a1925fb..789482f151 100755 --- a/Utilities/Poco/CMakeLists.txt +++ b/Utilities/Poco/CMakeLists.txt @@ -1,120 +1,120 @@ -PROJECT(poco) +project(poco) cmake_minimum_required(VERSION 2.6) set(CPACK_PACKAGE_VERSION_MAJOR "1") set(CPACK_PACKAGE_VERSION_MINOR "3") set(CPACK_PACKAGE_VERSION_PATCH "5") set(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) set(RELEASE_NAME "Poco 1.3.5") set(PROJECT_VERSION ${COMPLETE_VERSION}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "" CACHE PATH "The single directory for all runtime files") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "" CACHE PATH "The single directory for all library files") #set(COMMON_CXX "-Wall -Wno-sign-compare") set(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX} ${CMAKE_CXX_FLAGS_DEBUG}") set(CMAKE_CXX_FLAGS_MINSIZEREL "${COMMON_CXX} ${CMAKE_CXX_FLAGS_MINSIZEREL}") #see Bug #5281 -IF(NOT MSVC) +if(NOT MSVC) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG") -ENDIF(NOT MSVC) +endif(NOT MSVC) # Set the library postfix set(CMAKE_DEBUG_POSTFIX "d") # Uncomment from next two lines to force statitc or dynamic library, default is autodetection if(POCO_STATIC) set( LIB_MODE STATIC ) else(POCO_STATIC) set( LIB_MODE SHARED ) endif(POCO_STATIC) # whether unit tests should be build -set (POCO_ENABLE_TESTS FALSE CACHE BOOL "Build the Poco unit tests") +set(POCO_ENABLE_TESTS FALSE CACHE BOOL "Build the Poco unit tests") mark_as_advanced(POCO_ENABLE_TESTS) set(ENABLE_TESTS ${POCO_ENABLE_TESTS}) -IF (ENABLE_TESTS) - ENABLE_TESTING() -ENDIF (ENABLE_TESTS) +if(ENABLE_TESTS) + enable_testing() +endif(ENABLE_TESTS) # Set local include path #include_directories( CppUnit/include Foundation/include XML/include Net/include NetSSL_OpenSSL/include Util/include Data/include WebWidgets/include Zip/include) include_directories( CppUnit/include CppUnit/WinTestRunner/include Foundation/include XML/include Util/include Zip/include) include(CheckTypeSize) include(FindCygwin) #include(FindOpenSSL) include(CMakeDetermineCompilerId) #include(contrib/cmake/FindMySQL.cmake) #include(contrib/cmake/FindAPR.cmake) #include(contrib/cmake/FindApache2.cmake) # OS Detection if(CMAKE_SYSTEM MATCHES "Windows") add_definitions( -DPOCO_OS_FAMILY_WINDOWS )# -DPOCO_WIN32_UTF8) add_definitions( -DPOCO_NO_AUTOMATIC_LIBS ) set(SYSLIBS iphlpapi gdi32) endif(CMAKE_SYSTEM MATCHES "Windows") -if (CMAKE_SYSTEM MATCHES "Linux") +if(CMAKE_SYSTEM MATCHES "Linux") add_definitions( -DPOCO_OS_FAMILY_UNIX ) # Standard 'must be' defines add_definitions( -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) set(SYSLIBS pthread dl rt) endif(CMAKE_SYSTEM MATCHES "Linux") -if (CMAKE_SYSTEM MATCHES "SunOS") +if(CMAKE_SYSTEM MATCHES "SunOS") add_definitions( -DPOCO_OS_FAMILY_UNIX ) # Standard 'must be' defines add_definitions( -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ) set(SYSLIBS pthread socket xnet nsl resolv rt dl) endif(CMAKE_SYSTEM MATCHES "SunOS") -if (CMAKE_COMPILER_IS_MINGW) +if(CMAKE_COMPILER_IS_MINGW) add_definitions(-DWC_NO_BEST_FIT_CHARS=0x400) add_definitions(-mno-cygwin -D_WIN32 -DMINGW32 -DWINVER=0x500 -DODBCVER=0x0300 -DPOCO_THREAD_STACK_SIZE -DFoundation_Config_INCLUDED ) #link_directories(/usr/local/lib /usr/lib) #include_directories(/usr/local/include /usr/include) -endif (CMAKE_COMPILER_IS_MINGW) +endif(CMAKE_COMPILER_IS_MINGW) -if (CMAKE_COMPILER_IS_CYGWIN) +if(CMAKE_COMPILER_IS_CYGWIN) # add_definitions(-DWC_NO_BEST_FIT_CHARS=0x400) -endif (CMAKE_COMPILER_IS_CYGWIN) +endif(CMAKE_COMPILER_IS_CYGWIN) # SunPro C++ -if (${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro") +if(${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro") add_definitions( -D_BSD_SOURCE -library=stlport4) -endif (${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro") +endif(${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro") add_subdirectory(Foundation) add_subdirectory(XML) add_subdirectory(Util) add_subdirectory(CppUnit) #add_subdirectory(Net) #if(OPENSSL_FOUND) # add_subdirectory(NetSSL_OpenSSL) # add_subdirectory(Crypto) #endif(OPENSSL_FOUND) #add_subdirectory(Data) #add_subdirectory(WebWidgets) add_subdirectory(Zip) -if (ENABLE_TESTS) +if(ENABLE_TESTS) add_subdirectory(Foundation/testsuite) add_subdirectory(XML/testsuite) add_subdirectory(Util/testsuite) add_subdirectory(Zip/testsuite) -endif (ENABLE_TESTS) +endif(ENABLE_TESTS) # Enable packaging -INCLUDE(InstallRequiredSystemLibraries) +include(InstallRequiredSystemLibraries) diff --git a/Utilities/Poco/CppUnit/CMakeLists.txt b/Utilities/Poco/CppUnit/CMakeLists.txt index 2f3d00afdf..a250156834 100755 --- a/Utilities/Poco/CppUnit/CMakeLists.txt +++ b/Utilities/Poco/CppUnit/CMakeLists.txt @@ -1,22 +1,22 @@ set(LIBNAME "CppUnit") #set(LIBNAMED "${LIBNAME}d") aux_source_directory(src SRCS) add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) set_target_properties( ${LIBNAME} PROPERTIES # COMPILE_FLAGS ${RELEASE_CXX_FLAGS} VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH} SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) #add_library( ${LIBNAMED} ${LIB_MODE} ${SRCS} ) #set_target_properties( ${LIBNAMED} # PROPERTIES COMPILE_FLAGS "${DEBUG_CXX_FLAGS}" # VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH} # SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) #target_link_libraries( ${LIBNAMED} ) # Needs MFC headers, so exclude it to be able to compile on VS Express Edition -#IF (WIN32 AND NOT MINGW) +#if(WIN32 AND NOT MINGW) # add_subdirectory(WinTestRunner) -#ENDIF() +#endif() diff --git a/Utilities/Poco/Foundation/CMakeLists.txt b/Utilities/Poco/Foundation/CMakeLists.txt index 4be3c54343..0e0947c680 100755 --- a/Utilities/Poco/Foundation/CMakeLists.txt +++ b/Utilities/Poco/Foundation/CMakeLists.txt @@ -1,215 +1,215 @@ set(LIBNAME "PocoFoundation") #set(LIBNAMED "${LIBNAME}d") set( BASE_SRCS src/AtomicCounter.cpp src/ASCIIEncoding.cpp src/AbstractObserver.cpp src/ActiveDispatcher.cpp src/ArchiveStrategy.cpp src/AsyncChannel.cpp src/Base64Decoder.cpp src/Base64Encoder.cpp src/BinaryReader.cpp src/BinaryWriter.cpp src/Bugcheck.cpp src/ByteOrder.cpp src/Channel.cpp src/Checksum.cpp src/Condition.cpp src/Configurable.cpp src/ConsoleChannel.cpp src/CountingStream.cpp src/DateTime.cpp src/DateTimeFormat.cpp src/DateTimeFormatter.cpp src/DateTimeParser.cpp src/Debugger.cpp src/DeflatingStream.cpp src/DigestEngine.cpp src/DigestStream.cpp src/DirectoryIterator.cpp src/DynamicAny.cpp src/DynamicAnyHolder.cpp src/Environment.cpp src/ErrorHandler.cpp src/Event.cpp src/EventArgs.cpp src/Exception.cpp src/FPEnvironment.cpp src/File.cpp src/FileChannel.cpp src/FileStream.cpp src/FileStreamFactory.cpp src/Format.cpp src/Formatter.cpp src/FormattingChannel.cpp src/Glob.cpp src/Hash.cpp src/HashStatistic.cpp src/HexBinaryDecoder.cpp src/HexBinaryEncoder.cpp src/InflatingStream.cpp src/Latin1Encoding.cpp src/Latin9Encoding.cpp src/LineEndingConverter.cpp src/LocalDateTime.cpp src/LogFile.cpp src/LogStream.cpp src/Logger.cpp src/LoggingFactory.cpp src/LoggingRegistry.cpp src/MD2Engine.cpp src/MD4Engine.cpp src/MD5Engine.cpp src/Manifest.cpp src/MemoryPool.cpp src/Message.cpp src/Mutex.cpp src/NamedEvent.cpp src/NamedMutex.cpp src/NestedDiagnosticContext.cpp src/Notification.cpp src/NotificationCenter.cpp src/NotificationQueue.cpp src/TimedNotificationQueue.cpp src/PriorityNotificationQueue.cpp src/NullChannel.cpp src/NullStream.cpp src/NumberFormatter.cpp src/NumberParser.cpp # src/OpcomChannel.cpp src/Path.cpp src/PatternFormatter.cpp src/Pipe.cpp src/PipeImpl.cpp src/PipeStream.cpp src/Process.cpp src/PurgeStrategy.cpp src/RWLock.cpp src/Random.cpp src/RandomStream.cpp src/RefCountedObject.cpp src/RegularExpression.cpp src/RotateStrategy.cpp src/Runnable.cpp src/SHA1Engine.cpp src/Semaphore.cpp src/SharedLibrary.cpp src/SharedMemory.cpp src/SignalHandler.cpp src/SimpleFileChannel.cpp src/SplitterChannel.cpp src/Stopwatch.cpp src/StreamChannel.cpp src/StreamConverter.cpp src/StreamCopier.cpp src/StreamTokenizer.cpp src/String.cpp src/StringTokenizer.cpp src/SynchronizedObject.cpp src/Task.cpp src/TaskManager.cpp src/TaskNotification.cpp src/TeeStream.cpp src/TemporaryFile.cpp src/TextConverter.cpp src/TextEncoding.cpp src/TextIterator.cpp src/Thread.cpp src/ThreadTarget.cpp src/ThreadLocal.cpp src/ThreadPool.cpp src/Timer.cpp src/Timespan.cpp src/Timestamp.cpp src/Timezone.cpp src/Token.cpp src/URI.cpp src/URIStreamFactory.cpp src/URIStreamOpener.cpp src/UTF16Encoding.cpp src/UTF8Encoding.cpp src/UTF8String.cpp src/UUID.cpp src/UUIDGenerator.cpp src/Unicode.cpp src/UnicodeConverter.cpp # src/Var.cpp # src/VarHolder.cpp src/Void.cpp src/Windows1252Encoding.cpp src/adler32.c src/compress.c src/crc32.c src/deflate.c src/gzio.c src/infback.c src/inffast.c src/inflate.c src/inftrees.c src/pcre_chartables.c src/pcre_compile.c src/pcre_exec.c src/pcre_fullinfo.c src/pcre_globals.c src/pcre_maketables.c src/pcre_newline.c src/pcre_ord2utf8.c src/pcre_study.c src/pcre_tables.c src/pcre_try_flipped.c src/pcre_ucd.c src/pcre_valid_utf8.c src/pcre_xclass.c src/pocomsg.mc src/trees.c src/zutil.c ) set(WIN_SRCS src/EventLogChannel.cpp src/WindowsConsoleChannel.cpp ) set(LIN_SRCS src/SyslogChannel.cpp ) if(CMAKE_SYSTEM MATCHES "Windows") set(SRCS ${BASE_SRCS} ${WIN_SRCS}) #add_definitions( -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC) -else (CMAKE_SYSTEM MATCHES "Windows") +else(CMAKE_SYSTEM MATCHES "Windows") set(SRCS ${BASE_SRCS} ${LIN_SRCS}) add_definitions( -DPCRE_STATIC) endif(CMAKE_SYSTEM MATCHES "Windows") if(CMAKE_COMPILER_IS_MINGW) add_definitions( -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC) endif() add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) set_target_properties( ${LIBNAME} PROPERTIES DEFINE_SYMBOL Foundation_EXPORTS #COMPILE_FLAGS ${RELEASE_CXX_FLAGS} VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH} SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) -if (${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro") +if(${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro") set_target_properties( ${LIBNAME} PROPERTIES LINK_FLAGS "-library=stlport4") -endif (${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro") +endif(${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro") target_link_libraries( ${LIBNAME} ${SYSLIBS}) #add_library( ${LIBNAMED} ${LIB_MODE} ${SRCS} ) #set_target_properties( ${LIBNAMED} # PROPERTIES COMPILE_FLAGS "${DEBUG_CXX_FLAGS}" # DEFINE_SYMBOL Foundation_EXPORTS # VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH} # SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) -#if (${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro") +#if(${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro") # set_target_properties( ${LIBNAMED} PROPERTIES LINK_FLAGS "-library=stlport4") -#endif (${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro") +#endif(${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro") #target_link_libraries( ${LIBNAMED} ${SYSLIBS}) diff --git a/Utilities/Poco/Foundation/testsuite/CMakeLists.txt b/Utilities/Poco/Foundation/testsuite/CMakeLists.txt index 84d6355fee..19b6e2761c 100755 --- a/Utilities/Poco/Foundation/testsuite/CMakeLists.txt +++ b/Utilities/Poco/Foundation/testsuite/CMakeLists.txt @@ -1,31 +1,31 @@ -INCLUDE(files.cmake) +include(files.cmake) # Additional "test data" -ADD_LIBRARY(TestLibrary ${LIB_MODE} src/TestPlugin.cpp src/TestLibrary.cpp) -SET_TARGET_PROPERTIES(TestLibrary PROPERTIES PREFIX "") -TARGET_LINK_LIBRARIES(TestLibrary PocoFoundation) +add_library(TestLibrary ${LIB_MODE} src/TestPlugin.cpp src/TestLibrary.cpp) +set_target_properties(TestLibrary PROPERTIES PREFIX "") +target_link_libraries(TestLibrary PocoFoundation) -ADD_EXECUTABLE(TestApp src/TestApp.cpp) -SET_TARGET_PROPERTIES(TestApp PROPERTIES +add_executable(TestApp src/TestApp.cpp) +set_target_properties(TestApp PROPERTIES DEBUG_OUTPUT_NAME TestAppd) # The test runner -ADD_EXECUTABLE(PocoTestRunnerFoundation ${CPP_FILES}) -TARGET_LINK_LIBRARIES(PocoTestRunnerFoundation PocoFoundation CppUnit) -ADD_DEPENDENCIES(PocoTestRunnerFoundation TestLibrary TestApp) +add_executable(PocoTestRunnerFoundation ${CPP_FILES}) +target_link_libraries(PocoTestRunnerFoundation PocoFoundation CppUnit) +add_dependencies(PocoTestRunnerFoundation TestLibrary TestApp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_SOURCE_DIR}/../../Foundation/include ${CMAKE_CURRENT_SOURCE_DIR}/../../CppUnit/include ) -IF (WIN32) - TARGET_LINK_LIBRARIES(PocoTestRunnerFoundation +if(WIN32) + target_link_libraries(PocoTestRunnerFoundation WinTestRunner ) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../CppUnit/WinTestRunner/include) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../CppUnit/WinTestRunner/include) add_definitions(-D_AFXDLL) -ENDIF(WIN32) -#SET_TARGET_PROPERTIES(PocoTestRunnerFoundation PROPERTIES COMPILE_FLAGS "${POCO_UNIX_COMPILE_FLAGS}") +endif(WIN32) +#set_target_properties(PocoTestRunnerFoundation PROPERTIES COMPILE_FLAGS "${POCO_UNIX_COMPILE_FLAGS}") -CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/data/testdata.txt" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/data/testdata.txt" COPYONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/data/testdata.txt" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/data/testdata.txt" COPYONLY) diff --git a/Utilities/Poco/Foundation/testsuite/files.cmake b/Utilities/Poco/Foundation/testsuite/files.cmake index 88eedd76c7..caba4abf95 100755 --- a/Utilities/Poco/Foundation/testsuite/files.cmake +++ b/Utilities/Poco/Foundation/testsuite/files.cmake @@ -1,44 +1,44 @@ -SET(CPP_BASE_FILENAMES +set(CPP_BASE_FILENAMES ActiveMethodTest ActivityTest ActiveDispatcherTest AutoPtrTest SharedPtrTest AutoReleasePoolTest Base64Test BinaryReaderWriterTest LineEndingConverterTest ByteOrderTest ChannelTest ClassLoaderTest CoreTest CoreTestSuite CountingStreamTest CryptTestSuite DateTimeFormatterTest DateTimeParserTest DateTimeTest LocalDateTimeTest DateTimeTestSuite DigestStreamTest Driver DynamicFactoryTest FPETest FileChannelTest FileTest GlobTest FilesystemTestSuite FoundationTestSuite HMACEngineTest HexBinaryTest LoggerTest LoggingFactoryTest LoggingRegistryTest LoggingTestSuite LogStreamTest NamedEventTest NamedMutexTest ProcessesTestSuite ProcessTest MemoryPoolTest MD2EngineTest MD4EngineTest MD5EngineTest ManifestTest NDCTest NotificationCenterTest NotificationQueueTest NotificationsTestSuite NullStreamTest NumberFormatterTest NumberParserTest PathTest PatternFormatterTest RWLockTest RandomStreamTest RandomTest RegularExpressionTest SHA1EngineTest SemaphoreTest ConditionTest SharedLibraryTest SharedLibraryTestSuite SimpleFileChannelTest StopwatchTest StreamConverterTest StreamCopierTest StreamTokenizerTest StreamsTestSuite StringTest StringTokenizerTest TaskTestSuite TaskTest TaskManagerTest TestChannel TeeStreamTest UTF8StringTest TextConverterTest TextIteratorTest TextTestSuite TextEncodingTest ThreadLocalTest ThreadPoolTest ThreadTest ThreadingTestSuite TimerTest TimespanTest TimestampTest TimezoneTest URIStreamOpenerTest URITest URITestSuite UUIDGeneratorTest UUIDTest UUIDTestSuite ZLibTest TestPlugin DummyDelegate BasicEventTest FIFOEventTest PriorityEventTest EventTestSuite LRUCacheTest ExpireCacheTest ExpireLRUCacheTest CacheTestSuite AnyTest FormatTest HashingTestSuite HashTableTest SimpleHashTableTest LinearHashTableTest HashSetTest HashMapTest SharedMemoryTest PriorityNotificationQueueTest UniqueExpireCacheTest UniqueExpireLRUCacheTest TimedNotificationQueueTest TuplesTest NamedTuplesTest TypeListTest DynamicAnyTest FileStreamTest ) -IF(WIN32) - SET(CPP_BASE_FILENAMES +if(WIN32) + set(CPP_BASE_FILENAMES WinDriver ${CPP_BASE_FILENAMES} ) -ENDIF(WIN32) +endif(WIN32) -SET(CPP_FILES "") -FOREACH(basename ${CPP_BASE_FILENAMES}) - SET(CPP_FILES ${CPP_FILES} src/${basename}) -ENDFOREACH(basename ${CPP_BASE_FILENAMES}) +set(CPP_FILES "") +foreach(basename ${CPP_BASE_FILENAMES}) + set(CPP_FILES ${CPP_FILES} src/${basename}) +endforeach(basename ${CPP_BASE_FILENAMES}) diff --git a/Utilities/Poco/Util/CMakeLists.txt b/Utilities/Poco/Util/CMakeLists.txt index b04ce97771..b2a74aff48 100755 --- a/Utilities/Poco/Util/CMakeLists.txt +++ b/Utilities/Poco/Util/CMakeLists.txt @@ -1,61 +1,61 @@ set(LIBNAME "PocoUtil") #set(LIBNAMED "${LIBNAME}d") set( BASE_SRCS src/AbstractConfiguration.cpp src/Application.cpp src/ConfigurationMapper.cpp src/ConfigurationView.cpp src/FilesystemConfiguration.cpp src/HelpFormatter.cpp src/IniFileConfiguration.cpp src/IntValidator.cpp src/LayeredConfiguration.cpp src/LoggingConfigurator.cpp src/LoggingSubsystem.cpp src/MapConfiguration.cpp src/Option.cpp src/OptionCallback.cpp src/OptionException.cpp src/OptionProcessor.cpp src/OptionSet.cpp src/PropertyFileConfiguration.cpp src/RegExpValidator.cpp src/ServerApplication.cpp src/Subsystem.cpp src/SystemConfiguration.cpp src/Validator.cpp src/XMLConfiguration.cpp src/Timer.cpp src/TimerTask.cpp ) set( WIN_SRCS src/WinRegistryConfiguration.cpp src/WinRegistryKey.cpp src/WinService.cpp ) if(CMAKE_SYSTEM MATCHES "Windows") set(SRCS ${BASE_SRCS} ${WIN_SRCS}) add_definitions( -DUtil_EXPORTS ) -else (CMAKE_SYSTEM MATCHES "Windows") +else(CMAKE_SYSTEM MATCHES "Windows") set(SRCS ${BASE_SRCS}) endif(CMAKE_SYSTEM MATCHES "Windows") add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) set_target_properties( ${LIBNAME} PROPERTIES #COMPILE_FLAGS ${RELEASE_CXX_FLAGS} VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH} SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) target_link_libraries( ${LIBNAME} PocoXML PocoFoundation) #add_library( ${LIBNAMED} ${LIB_MODE} ${SRCS} ) #set_target_properties( ${LIBNAMED} # PROPERTIES COMPILE_FLAGS "${DEBUG_CXX_FLAGS}" # DEFINE_SYMBOL Util_EXPORTS # VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH} # SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) #target_link_libraries( ${LIBNAMED} PocoXMLd PocoFoundationd ) diff --git a/Utilities/Poco/Util/testsuite/CMakeLists.txt b/Utilities/Poco/Util/testsuite/CMakeLists.txt index 55f0edae2c..14460013ed 100755 --- a/Utilities/Poco/Util/testsuite/CMakeLists.txt +++ b/Utilities/Poco/Util/testsuite/CMakeLists.txt @@ -1,24 +1,24 @@ -INCLUDE(files.cmake) +include(files.cmake) -ADD_Executable(PocoTestRunnerUtil ${CPP_FILES}) -TARGET_LINK_LIBRARIES(PocoTestRunnerUtil +add_executable(PocoTestRunnerUtil ${CPP_FILES}) +target_link_libraries(PocoTestRunnerUtil PocoUtil PocoXML PocoFoundation CppUnit) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_SOURCE_DIR}/../../Foundation/include ${CMAKE_CURRENT_SOURCE_DIR}/../../XML/include ${CMAKE_CURRENT_SOURCE_DIR}/../../CppUnit/include ) -IF (WIN32) - TARGET_LINK_LIBRARIES(PocoTestRunnerUtil +if(WIN32) + target_link_libraries(PocoTestRunnerUtil WinTestRunner ) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../CppUnit/WinTestRunner/include) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../CppUnit/WinTestRunner/include) add_definitions(-D_AFXDLL) -ENDIF(WIN32) +endif(WIN32) -#SET_TARGET_PROPERTIES(PocoTestRunnerUtil PROPERTIES COMPILE_FLAGS "${POCO_UNIX_COMPILE_FLAGS}") +#set_target_properties(PocoTestRunnerUtil PROPERTIES COMPILE_FLAGS "${POCO_UNIX_COMPILE_FLAGS}") diff --git a/Utilities/Poco/Util/testsuite/files.cmake b/Utilities/Poco/Util/testsuite/files.cmake index d7a652629b..3f40e07d8f 100755 --- a/Utilities/Poco/Util/testsuite/files.cmake +++ b/Utilities/Poco/Util/testsuite/files.cmake @@ -1,24 +1,24 @@ -SET(CPP_BASE_FILENAMES +set(CPP_BASE_FILENAMES AbstractConfigurationTest ConfigurationTestSuite ConfigurationMapperTest ConfigurationViewTest Driver HelpFormatterTest IniFileConfigurationTest LayeredConfigurationTest LoggingConfiguratorTest MapConfigurationTest OptionProcessorTest OptionSetTest OptionTest OptionsTestSuite PropertyFileConfigurationTest SystemConfigurationTest UtilTestSuite XMLConfigurationTest FilesystemConfigurationTest ValidatorTest TimerTestSuite TimerTest ) -IF(WIN32) -SET(CPP_BASE_FILENAMES +if(WIN32) +set(CPP_BASE_FILENAMES WinDriver WindowsTestSuite WinConfigurationTest WinRegistryTest ${CPP_BASE_FILENAMES} ) -ENDIF(WIN32) +endif(WIN32) -SET(CPP_FILES "") -FOREACH(basename ${CPP_BASE_FILENAMES}) - SET(CPP_FILES ${CPP_FILES} src/${basename}) -ENDFOREACH(basename ${CPP_BASE_FILENAMES}) +set(CPP_FILES "") +foreach(basename ${CPP_BASE_FILENAMES}) + set(CPP_FILES ${CPP_FILES} src/${basename}) +endforeach(basename ${CPP_BASE_FILENAMES}) diff --git a/Utilities/Poco/XML/testsuite/CMakeLists.txt b/Utilities/Poco/XML/testsuite/CMakeLists.txt index 56fe5e2815..a8611be378 100755 --- a/Utilities/Poco/XML/testsuite/CMakeLists.txt +++ b/Utilities/Poco/XML/testsuite/CMakeLists.txt @@ -1,20 +1,20 @@ -INCLUDE(files.cmake) +include(files.cmake) -ADD_Executable(PocoTestRunnerXML ${CPP_FILES}) -TARGET_LINK_LIBRARIES(PocoTestRunnerXML PocoXML PocoFoundation CppUnit) +add_executable(PocoTestRunnerXML ${CPP_FILES}) +target_link_libraries(PocoTestRunnerXML PocoXML PocoFoundation CppUnit) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_SOURCE_DIR}/../../Foundation/include ${CMAKE_CURRENT_SOURCE_DIR}/../../XML/include ${CMAKE_CURRENT_SOURCE_DIR}/../../CppUnit/include ) -IF (WIN32) - TARGET_LINK_LIBRARIES(PocoTestRunnerXML +if(WIN32) + target_link_libraries(PocoTestRunnerXML WinTestRunner ) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../CppUnit/WinTestRunner/include) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../CppUnit/WinTestRunner/include) add_definitions(-D_AFXDLL) -ENDIF(WIN32) +endif(WIN32) -#SET_TARGET_PROPERTIES(PocoTestRunnerXML PROPERTIES COMPILE_FLAGS "${POCO_UNIX_COMPILE_FLAGS}") +#set_target_properties(PocoTestRunnerXML PROPERTIES COMPILE_FLAGS "${POCO_UNIX_COMPILE_FLAGS}") diff --git a/Utilities/Poco/XML/testsuite/files.cmake b/Utilities/Poco/XML/testsuite/files.cmake index 10505699a5..d86d94aad4 100755 --- a/Utilities/Poco/XML/testsuite/files.cmake +++ b/Utilities/Poco/XML/testsuite/files.cmake @@ -1,19 +1,19 @@ -SET(CPP_BASE_FILENAMES +set(CPP_BASE_FILENAMES AttributesImplTest ChildNodesTest DOMTestSuite DocumentTest DocumentTypeTest Driver ElementTest EventTest NamePoolTest NameTest NamespaceSupportTest NodeIteratorTest NodeTest ParserWriterTest SAXParserTest SAXTestSuite TextTest TreeWalkerTest XMLTestSuite XMLWriterTest NodeAppenderTest ) -IF(WIN32) - SET(CPP_BASE_FILENAMES +if(WIN32) + set(CPP_BASE_FILENAMES WinDriver ${CPP_BASE_FILENAMES} ) -ENDIF(WIN32) +endif(WIN32) -SET(CPP_FILES "") -FOREACH(basename ${CPP_BASE_FILENAMES}) - SET(CPP_FILES ${CPP_FILES} src/${basename}) -ENDFOREACH(basename ${CPP_BASE_FILENAMES}) +set(CPP_FILES "") +foreach(basename ${CPP_BASE_FILENAMES}) + set(CPP_FILES ${CPP_FILES} src/${basename}) +endforeach(basename ${CPP_BASE_FILENAMES}) diff --git a/Utilities/Poco/Zip/testsuite/CMakeLists.txt b/Utilities/Poco/Zip/testsuite/CMakeLists.txt index 697b32f1a9..042f021691 100644 --- a/Utilities/Poco/Zip/testsuite/CMakeLists.txt +++ b/Utilities/Poco/Zip/testsuite/CMakeLists.txt @@ -1,34 +1,34 @@ -INCLUDE(files.cmake) +include(files.cmake) -ADD_Executable(PocoTestRunnerZip ${CPP_FILES}) -TARGET_LINK_LIBRARIES(PocoTestRunnerZip +add_executable(PocoTestRunnerZip ${CPP_FILES}) +target_link_libraries(PocoTestRunnerZip PocoUtil PocoZip PocoFoundation CppUnit) -IF (WIN32) - TARGET_LINK_LIBRARIES(PocoTestRunnerZip +if(WIN32) + target_link_libraries(PocoTestRunnerZip WinTestRunner ) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../CppUnit/WinTestRunner/include) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../CppUnit/WinTestRunner/include) add_definitions(-D_AFXDLL) -ENDIF(WIN32) +endif(WIN32) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_SOURCE_DIR}/../../Foundation/include ${CMAKE_CURRENT_SOURCE_DIR}/../../XML/include ${CMAKE_CURRENT_SOURCE_DIR}/../../Zip/include ${CMAKE_CURRENT_SOURCE_DIR}/../../CppUnit/include ) -SET(_zipdata_files +set(_zipdata_files data.zip doc.zip java.zip test.zip ) -FOREACH(_zipdata ${_zipdata_files}) - CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/data/${_zipdata}" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/data/${_zipdata}" COPYONLY) -ENDFOREACH() +foreach(_zipdata ${_zipdata_files}) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/data/${_zipdata}" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/data/${_zipdata}" COPYONLY) +endforeach() diff --git a/Utilities/Poco/Zip/testsuite/files.cmake b/Utilities/Poco/Zip/testsuite/files.cmake index 184d4b74b3..4b41c7f631 100644 --- a/Utilities/Poco/Zip/testsuite/files.cmake +++ b/Utilities/Poco/Zip/testsuite/files.cmake @@ -1,19 +1,19 @@ -SET(CPP_BASE_FILENAMES +set(CPP_BASE_FILENAMES CompressTest Driver PartialStreamTest ZipTest ZipTestSuite ) -IF(WIN32) - SET(CPP_BASE_FILENAMES +if(WIN32) + set(CPP_BASE_FILENAMES WinDriver ${CPP_BASE_FILENAMES} ) -ENDIF(WIN32) +endif(WIN32) -SET(CPP_FILES "") -FOREACH(basename ${CPP_BASE_FILENAMES}) - SET(CPP_FILES ${CPP_FILES} src/${basename}) -ENDFOREACH(basename ${CPP_BASE_FILENAMES}) +set(CPP_FILES "") +foreach(basename ${CPP_BASE_FILENAMES}) + set(CPP_FILES ${CPP_FILES} src/${basename}) +endforeach(basename ${CPP_BASE_FILENAMES}) diff --git a/Utilities/ann/CMakeLists.txt b/Utilities/ann/CMakeLists.txt index f1462f4ea6..64b95de780 100644 --- a/Utilities/ann/CMakeLists.txt +++ b/Utilities/ann/CMakeLists.txt @@ -1,34 +1,34 @@ -PROJECT(ANN) +project(ANN) -SET(ANN_HEADERS +set(ANN_HEADERS include/ANN/ANN.h include/ANN/ANNperf.h include/ANN/ANNx.h ) -SET(ANN_SOURCES +set(ANN_SOURCES src/ANN.cpp src/bd_fix_rad_search.cpp src/bd_pr_search.cpp src/bd_search.cpp src/bd_tree.cpp src/brute.cpp src/kd_dump.cpp src/kd_fix_rad_search.cpp src/kd_pr_search.cpp src/kd_search.cpp src/kd_split.cpp src/kd_tree.cpp src/kd_util.cpp src/perf.cpp ) -INCLUDE_DIRECTORIES(${ANN_SOURCE_DIR}/include) -IF(NOT BUILD_SHARED_LIBS) - ADD_DEFINITIONS( -DANN_STATIC_LIB ) -ENDIF() -ADD_LIBRARY(ann ${ANN_HEADERS} ${ANN_SOURCES}) +include_directories(${ANN_SOURCE_DIR}/include) +if(NOT BUILD_SHARED_LIBS) + add_definitions( -DANN_STATIC_LIB ) +endif() +add_library(ann ${ANN_HEADERS} ${ANN_SOURCES}) MITK_CREATE_MODULE_CONF(ann INCLUDE_DIRS include ) diff --git a/Utilities/glew/files.cmake b/Utilities/glew/files.cmake index 413acd68a9..31a58fc0e8 100644 --- a/Utilities/glew/files.cmake +++ b/Utilities/glew/files.cmake @@ -1,7 +1,7 @@ -SET(CPP_FILES +set(CPP_FILES mitkGlew.c ) diff --git a/Utilities/ipFunc/CMakeLists.txt b/Utilities/ipFunc/CMakeLists.txt index 85fc538a7b..4245d5c7a5 100644 --- a/Utilities/ipFunc/CMakeLists.txt +++ b/Utilities/ipFunc/CMakeLists.txt @@ -1,46 +1,46 @@ -SET(IPFUNC_FILES +set(IPFUNC_FILES AddC.c AddI.c AddSl.c And.c Border.c BorderX.c Box.c Box2d.c Box3d.c Canny.c Close.c CompressM.c Conv.c Convert.c CopyTags.c Curtosis.c CurtosisR.c Dila.c DivC.c DivI.c DrawPoly.c Equal.c Ero.c Error.c Exp.c ExtT.c ExtrC.c ExtrR.c ExtrROI.c Extrema.c FillArea.c Frame.c GaussF.c Grad.c Grav.c Hist.c Histo.c HitMiss.c HitMissI.c Inertia.c Inv.c LN.c Label.c Laplace.c LevWind.c Log.c MakePicName.c Malloc.c Mean.c MeanC.c MeanF.c MeanR.c MeanROI.c Median.c Morph.c MultC.c MultI.c Norm.c NormXY.c Not.c OpCl.c Open.c Or.c Pot.c Range.c Rank.c Refl.c RegGrow.c Roberts.c Rotate.c SDev.c SDevC.c SDevR.c SDevROI.c ScBl.c ScFact.c ScNN.c Scale.c SelInv.c SelMM.c Select.c SetErrno.c SetTag.c Shp.c Skewness.c SkewnessR.c Sobel.c Sqrt.c SubC.c SubI.c Thresh.c Transpose.c Var.c VarC.c VarR.c VarROI.c Window.c WindowR.c Xchange.c ZeroCr.c _BorderX.c _DrawPoly.c ipGetANew.c ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} +include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ipPic) -ADD_LIBRARY(mitkIpFunc ${MITK_WIN32_FORCE_STATIC} ${IPFUNC_FILES}) -TARGET_LINK_LIBRARIES(mitkIpFunc mitkIpPic ) -IF(UNIX) - TARGET_LINK_LIBRARIES(mitkIpFunc m ) -ENDIF(UNIX) +add_library(mitkIpFunc ${MITK_WIN32_FORCE_STATIC} ${IPFUNC_FILES}) +target_link_libraries(mitkIpFunc mitkIpPic ) +if(UNIX) + target_link_libraries(mitkIpFunc m ) +endif(UNIX) MITK_CREATE_MODULE_CONF(mitkIpFunc INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS mitkIpPic ) diff --git a/Utilities/ipPic/CMakeLists.txt b/Utilities/ipPic/CMakeLists.txt index 123ecb1112..da54989652 100644 --- a/Utilities/ipPic/CMakeLists.txt +++ b/Utilities/ipPic/CMakeLists.txt @@ -1,31 +1,31 @@ -FIND_PACKAGE(ITK) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +find_package(ITK) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -ADD_DEFINITIONS(-DMITK_IPPIC_COMPILE) +add_definitions(-DMITK_IPPIC_COMPILE) -SET(IPPIC_FILES +set(IPPIC_FILES ipPicInfo.c ipPicType.c ipPicAddT.c ipPicQueryT.c ipPicDelT.c ipPicGetT.c ipPicOldGet.c ipPicOldGetH.c ipPicOldGetS.c ipPicGet.c ipPicGetH.c ipPicGetS.c ipPicPut.c ipPicPutS.c ipPicGetMem.c ipPicPutMem.c ipPicCopyS.c ipPicCopyH.c ipPicNew.c ipPicClear.c ipPicFree.c ipPicClone.c ipEndian.c ipFRead.c ipFWrite.c ipError.c ipPicSize.c ipPicElements.c ipPicTSVSize.c ipPicTSVElements.c ) -ADD_LIBRARY(mitkIpPic ${MITK_WIN32_FORCE_STATIC} ${IPPIC_FILES}) -IF(USE_ITKZLIB) - TARGET_LINK_LIBRARIES(mitkIpPic itkzlib) -ELSE(USE_ITKZLIB) - TARGET_LINK_LIBRARIES(mitkIpPic z) -ENDIF(USE_ITKZLIB) +add_library(mitkIpPic ${MITK_WIN32_FORCE_STATIC} ${IPPIC_FILES}) +if(USE_ITKZLIB) + target_link_libraries(mitkIpPic itkzlib) +else(USE_ITKZLIB) + target_link_libraries(mitkIpPic z) +endif(USE_ITKZLIB) MITK_CREATE_MODULE_CONF(mitkIpPic INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ) diff --git a/Utilities/ipSegmentation/CMakeLists.txt b/Utilities/ipSegmentation/CMakeLists.txt index 7f80d53992..4c3afa4d58 100644 --- a/Utilities/ipSegmentation/CMakeLists.txt +++ b/Utilities/ipSegmentation/CMakeLists.txt @@ -1,24 +1,24 @@ -SET(IPSEGMENTATION_FILES +set(IPSEGMENTATION_FILES ipSegmentationError.c ipSegmentationNew.c ipSegmentationFree.c ipSegmentationClear.c ipSegmentationCombineRegion.c ipSegmentationRegionGrower.cpp ipSegmentationContourExtraction.cpp ipSegmentationReplaceRegion.cpp ipSegmentationRegionCutter.cpp ipSegmentationGrowerHistory.cpp ipSegmentationContourUtils.cpp ipSegmentationInterpolate.c ipSegmentationUndo.c ) -INCLUDE_DIRECTORIES(.. ../ann/include ${MITK_INCLUDE_DIRS} ${ANN_INCLUDE_DIR} ../ipPic) -ADD_LIBRARY(ipSegmentation${LIBPOSTFIX} ${MITK_WIN32_FORCE_STATIC} ${IPSEGMENTATION_FILES}) -TARGET_LINK_LIBRARIES(ipSegmentation ann mitkIpPic) +include_directories(.. ../ann/include ${MITK_INCLUDE_DIRS} ${ANN_INCLUDE_DIR} ../ipPic) +add_library(ipSegmentation${LIBPOSTFIX} ${MITK_WIN32_FORCE_STATIC} ${IPSEGMENTATION_FILES}) +target_link_libraries(ipSegmentation ann mitkIpPic) MITK_CREATE_MODULE_CONF(ipSegmentation DEPENDS mitkIpPic ann ) diff --git a/Utilities/mbilog/CMakeLists.txt b/Utilities/mbilog/CMakeLists.txt index 40c4cb1283..f2c19cdf3c 100644 --- a/Utilities/mbilog/CMakeLists.txt +++ b/Utilities/mbilog/CMakeLists.txt @@ -1,33 +1,33 @@ -PROJECT(mbilog) +project(mbilog) -SET(MBILOG_HEADERS +set(MBILOG_HEADERS mbilog.h ) -SET(MBILOG_SOURCES +set(MBILOG_SOURCES mbilog.cpp ) -OPTION(MBILOG_ENABLE_DEBUG_MESSAGES "Enable extra debug log output" OFF) -MARK_AS_ADVANCED(MBILOG_ENABLE_DEBUG_MESSAGES) +option(MBILOG_ENABLE_DEBUG_MESSAGES "Enable extra debug log output" OFF) +mark_as_advanced(MBILOG_ENABLE_DEBUG_MESSAGES) -IF(MBILOG_ENABLE_DEBUG_MESSAGES) - SET(_define_enable_debug "#define MBILOG_ENABLE_DEBUG") -ENDIF(MBILOG_ENABLE_DEBUG_MESSAGES) +if(MBILOG_ENABLE_DEBUG_MESSAGES) + set(_define_enable_debug "#define MBILOG_ENABLE_DEBUG") +endif(MBILOG_ENABLE_DEBUG_MESSAGES) -SET(mbilog_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}") +set(mbilog_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}") -CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/mbilogConfig.cmake.in" +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mbilogConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/mbilogConfig.cmake" @ONLY) -CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/mbilogConfig.h.in" +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mbilogConfig.h.in" "${CMAKE_CURRENT_BINARY_DIR}/mbilogConfig.h" @ONLY) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) -ADD_LIBRARY(mbilog ${MBILOG_HEADERS} ${MBILOG_SOURCES}) +add_library(mbilog ${MBILOG_HEADERS} ${MBILOG_SOURCES}) # mbilog is independent of mitk, and cant use mitk macros i.e. MITK_CREATE_MODULE_CONF( mbilog ) # configuring happens through ../CMakeList.txt and mbilogConfig.cmake.in diff --git a/Utilities/mbilog/mbilogConfig.cmake.in b/Utilities/mbilog/mbilogConfig.cmake.in index 515430655c..572c95a189 100644 --- a/Utilities/mbilog/mbilogConfig.cmake.in +++ b/Utilities/mbilog/mbilogConfig.cmake.in @@ -1,7 +1,7 @@ -SET(mbilog_IS_ENABLED "1") -SET(mbilog_INCLUDE_DIRS "@mbilog_INCLUDE_DIRS@") -SET(mbilog_PROVIDES "mbilog") -SET(mbilog_DEPENDS "") -SET(mbilog_PACKAGE_DEPENDS "") -SET(mbilog_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") +set(mbilog_IS_ENABLED "1") +set(mbilog_INCLUDE_DIRS "@mbilog_INCLUDE_DIRS@") +set(mbilog_PROVIDES "mbilog") +set(mbilog_DEPENDS "") +set(mbilog_PACKAGE_DEPENDS "") +set(mbilog_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") diff --git a/Utilities/pic2vtk/CMakeLists.txt b/Utilities/pic2vtk/CMakeLists.txt index 2da5cf4609..a86e67f69c 100644 --- a/Utilities/pic2vtk/CMakeLists.txt +++ b/Utilities/pic2vtk/CMakeLists.txt @@ -1,11 +1,11 @@ -FIND_PACKAGE(VTK) -INCLUDE(${VTK_USE_FILE}) +find_package(VTK) +include(${VTK_USE_FILE}) -INCLUDE_DIRECTORIES(.. ../ipPic) -ADD_LIBRARY(pic2vtk ${MITK_WIN32_FORCE_STATIC} pic2vtk.cpp) -TARGET_LINK_LIBRARIES(pic2vtk mitkIpPic vtkIO) +include_directories(.. ../ipPic) +add_library(pic2vtk ${MITK_WIN32_FORCE_STATIC} pic2vtk.cpp) +target_link_libraries(pic2vtk mitkIpPic vtkIO) MITK_CREATE_MODULE_CONF(pic2vtk DEPENDS mitkIpPic ) diff --git a/Utilities/qtsingleapplication/CMakeLists.txt b/Utilities/qtsingleapplication/CMakeLists.txt index 4e8e69229a..fd206ea7c6 100644 --- a/Utilities/qtsingleapplication/CMakeLists.txt +++ b/Utilities/qtsingleapplication/CMakeLists.txt @@ -1,37 +1,37 @@ if(MITK_USE_QT) # only if MITK is built with Qt project(QtSingleApplication) set(_MOC_HEADERS qtlocalpeer.h qtsingleapplication.h qtsinglecoreapplication.h ) set(_HEADERS qthandlenewappinstance.h qtlockedfile.h ) set(_SOURCES qthandlenewappinstance.cpp qtlocalpeer.cpp qtsingleapplication.cpp qtsinglecoreapplication.cpp ) find_package(Qt4 REQUIRED) set(QT_USE_QTNETWORKING 1) include(${QT_USE_FILE}) qt4_wrap_cpp(_SOURCES ${_MOC_HEADERS}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) add_library(qtsingleapplication STATIC ${_SOURCES}) target_link_libraries(qtsingleapplication ${QT_LIBRARIES}) MITK_CREATE_MODULE_CONF(qtsingleapplication) -ENDIF(MITK_USE_QT) # only if MITK is built with Qt +endif(MITK_USE_QT) # only if MITK is built with Qt diff --git a/Utilities/qwt/CMakeLists.txt b/Utilities/qwt/CMakeLists.txt index 9420e0673d..3414fc857a 100644 --- a/Utilities/qwt/CMakeLists.txt +++ b/Utilities/qwt/CMakeLists.txt @@ -1,198 +1,198 @@ -IF(MITK_USE_QT) # only if MITK is built with Qt +if(MITK_USE_QT) # only if MITK is built with Qt -PROJECT(QWT) +project(QWT) -SET(QWT_MOC_HEADERS +set(QWT_MOC_HEADERS include/qwt_abstract_slider.h include/qwt_analog_clock.h include/qwt_compass.h include/qwt_counter.h include/qwt_dial.h include/qwt_dyngrid_layout.h include/qwt_knob.h include/qwt_legend.h include/qwt_legend_item.h include/qwt_magnifier.h include/qwt_panner.h include/qwt_picker.h include/qwt_plot_canvas.h include/qwt_plot.h include/qwt_plot_magnifier.h include/qwt_plot_panner.h include/qwt_plot_picker.h include/qwt_plot_zoomer.h include/qwt_scale_widget.h include/qwt_slider.h include/qwt_text_label.h include/qwt_thermo.h include/qwt_wheel.h ) -SET(QWT_HEADERS +set(QWT_HEADERS include/qwt_abstract_scale_draw.h include/qwt_data.h include/qwt_layout_metrics.h include/qwt_plot_curve.h include/qwt_plot_scaleitem.h include/qwt_scale_widget.h include/qwt_abstract_scale.h include/qwt_dial.h include/qwt_legend.h include/qwt_plot_dict.h include/qwt_plot_spectrogram.h include/qwt_slider.h include/qwt_abstract_slider.h include/qwt_dial_needle.h include/qwt_legend_item.h include/qwt_plot_grid.h include/qwt_plot_svgitem.h include/qwt_spline.h include/qwt_analog_clock.h include/qwt_double_interval.h include/qwt_legend_itemmanager.h include/qwt_plot.h include/qwt_plot_zoomer.h include/qwt_plot_rescaler.h include/qwt_symbol.h include/qwt_array.h include/qwt_double_range.h include/qwt_magnifier.h include/qwt_plot_item.h include/qwt_polygon.h include/qwt_text_engine.h include/qwt_arrow_button.h include/qwt_double_rect.h include/qwt_math.h include/qwt_plot_layout.h include/qwt_raster_data.h include/qwt_text.h include/qwt_clipper.h include/qwt_dyngrid_layout.h include/qwt_paint_buffer.h include/qwt_plot_magnifier.h include/qwt_rect.h include/qwt_text_label.h include/qwt_color_map.h include/qwt_event_pattern.h include/qwt_painter.h include/qwt_plot_marker.h include/qwt_round_scale_draw.h include/qwt_thermo.h include/qwt_compass.h include/qwt_global.h include/qwt_panner.h include/qwt_plot_panner.h include/qwt_scale_div.h include/qwt_valuelist.h include/qwt_compass_rose.h include/qwt.h include/qwt_picker.h include/qwt_plot_picker.h include/qwt_scale_draw.h include/qwt_wheel.h include/qwt_counter.h include/qwt_interval_data.h include/qwt_picker_machine.h include/qwt_plot_printfilter.h include/qwt_scale_engine.h include/qwt_curve_fitter.h include/qwt_knob.h include/qwt_plot_canvas.h include/qwt_plot_rasteritem.h include/qwt_scale_map.h ) -SET(QWT_SOURCES +set(QWT_SOURCES src/qwt_abstract_scale.cpp src/qwt_double_interval.cpp src/qwt_panner.cpp src/qwt_plot_picker.cpp src/qwt_plot_rescaler.cpp src/qwt_scale_engine.cpp src/qwt_abstract_scale_draw.cpp src/qwt_double_range.cpp src/qwt_picker.cpp src/qwt_plot_print.cpp src/qwt_scale_map.cpp src/qwt_abstract_slider.cpp src/qwt_double_rect.cpp src/qwt_picker_machine.cpp src/qwt_plot_printfilter.cpp src/qwt_scale_widget.cpp src/qwt_analog_clock.cpp src/qwt_dyngrid_layout.cpp src/qwt_plot_axis.cpp src/qwt_plot_rasteritem.cpp src/qwt_slider.cpp src/qwt_arrow_button.cpp src/qwt_event_pattern.cpp src/qwt_plot_canvas.cpp src/qwt_plot_scaleitem.cpp src/qwt_spline.cpp src/qwt_clipper.cpp src/qwt_interval_data.cpp src/qwt_plot.cpp src/qwt_plot_spectrogram.cpp src/qwt_symbol.cpp src/qwt_color_map.cpp src/qwt_knob.cpp src/qwt_plot_curve.cpp src/qwt_plot_svgitem.cpp src/qwt_text.cpp src/qwt_compass.cpp src/qwt_layout_metrics.cpp src/qwt_plot_dict.cpp src/qwt_plot_xml.cpp src/qwt_text_engine.cpp src/qwt_compass_rose.cpp src/qwt_legend.cpp src/qwt_plot_grid.cpp src/qwt_plot_zoomer.cpp src/qwt_text_label.cpp src/qwt_counter.cpp src/qwt_legend_item.cpp src/qwt_plot_item.cpp src/qwt_raster_data.cpp src/qwt_thermo.cpp src/qwt_curve_fitter.cpp src/qwt_magnifier.cpp src/qwt_plot_layout.cpp src/qwt_rect.cpp src/qwt_wheel.cpp src/qwt_data.cpp src/qwt_math.cpp src/qwt_plot_magnifier.cpp src/qwt_round_scale_draw.cpp src/qwt_dial.cpp src/qwt_paint_buffer.cpp src/qwt_plot_marker.cpp src/qwt_scale_div.cpp src/qwt_dial_needle.cpp src/qwt_painter.cpp src/qwt_plot_panner.cpp src/qwt_scale_draw.cpp ) -SET(QT_MT_REQUIRED TRUE) -SET(QWT_INCLUDE_DIR ${QWT_SOURCE_DIR}/include CACHE PATH "MITK internal qwt include directory") -INCLUDE_DIRECTORIES(${QWT_INCLUDE_DIR}) +set(QT_MT_REQUIRED TRUE) +set(QWT_INCLUDE_DIR ${QWT_SOURCE_DIR}/include CACHE PATH "MITK internal qwt include directory") +include_directories(${QWT_INCLUDE_DIR}) -FIND_PACKAGE(Qt4 REQUIRED) -SET(QT_USE_QTSVG 1) -INCLUDE(${QT_USE_FILE}) +find_package(Qt4 REQUIRED) +set(QT_USE_QTSVG 1) +include(${QT_USE_FILE}) QT4_WRAP_CPP(QWT_SOURCES ${QWT_MOC_HEADERS}) -ADD_DEFINITIONS(-DQWT_DLL) -ADD_DEFINITIONS(-DQWT_MAKEDLL) -ADD_LIBRARY(qwt ${QWT_SOURCES}) -TARGET_LINK_LIBRARIES(qwt ${QT_LIBRARIES}) +add_definitions(-DQWT_DLL) +add_definitions(-DQWT_MAKEDLL) +add_library(qwt ${QWT_SOURCES}) +target_link_libraries(qwt ${QT_LIBRARIES}) # install only if shared lib (for now) MITK_CREATE_MODULE_CONF(qwt INCLUDE_DIRS include ) -ENDIF(MITK_USE_QT) # only if MITK is built with Qt +endif(MITK_USE_QT) # only if MITK is built with Qt diff --git a/Utilities/qxt/CMakeLists.txt b/Utilities/qxt/CMakeLists.txt index 321627d943..c0a6b0f97c 100644 --- a/Utilities/qxt/CMakeLists.txt +++ b/Utilities/qxt/CMakeLists.txt @@ -1,136 +1,136 @@ -IF(MITK_USE_QT) # only if MITK is built with Qt +if(MITK_USE_QT) # only if MITK is built with Qt -PROJECT(QXT) +project(QXT) -SET(QXT_MOC_HEADERS +set(QXT_MOC_HEADERS include/qxtnamespace.h include/qxtbasespinbox.h include/qxtcheckcombobox.h include/qxtcheckcombobox_p.h include/qxtconfigdialog.h include/qxtconfigdialog_p.h include/qxtconfirmationmessage.h include/qxtcrumbview.h include/qxtcrumbview_p.h include/qxtdockwidget.h include/qxtflowview.h include/qxtflowview_p.h include/qxtgroupbox.h include/qxtheaderview.h include/qxtitemdelegate.h include/qxtitemdelegate_p.h include/qxtlabel.h include/qxtlanguagecombobox.h include/qxtlanguagecombobox_p.h include/qxtletterboxwidget.h include/qxtletterboxwidget_p.h include/qxtlistwidget.h include/qxtlistwidget_p.h include/qxtprogresslabel.h include/qxtpushbutton.h include/qxtscheduleheaderwidget.h include/qxtscheduleitemdelegate.h include/qxtscheduleview.h include/qxtscheduleviewheadermodel_p.h include/qxtscheduleview_p.h include/qxtsortfilterproxymodel.h include/qxtspanslider.h include/qxtspanslider_p.h include/qxtstars.h include/qxtstringspinbox.h include/qxtstringvalidator.h include/qxttabbar.h include/qxttablewidget.h include/qxttablewidget_p.h include/qxttabwidget.h include/qxttabwidget_p.h include/qxttooltip_p.h include/qxttreewidget.h include/qxttreewidget_p.h ) -SET(QXT_HEADERS +set(QXT_HEADERS include/qxtglobal.h include/qxtconfig.h include/qxtpimpl.h include/qxtgui.h include/qxtitemeditorcreator.h include/qxtitemeditorcreatorbase.h include/qxtlistwidgetitem.h include/qxtnativeeventfilter.h include/qxtproxystyle.h include/qxtstandarditemeditorcreator.h include/qxtstringvalidator_p.h include/qxtstyleoptionscheduleviewitem.h include/qxttablewidgetitem.h include/qxttooltip.h include/qxttreewidgetitem.h ) -SET(QXT_SOURCES +set(QXT_SOURCES src/qxtglobal.cpp src/qxtbasespinbox.cpp src/qxtcheckcombobox.cpp src/qxtconfigdialog.cpp src/qxtconfirmationmessage.cpp src/qxtcrumbview.cpp src/qxtdockwidget.cpp src/qxtflowview.cpp src/qxtflowview_p.cpp src/qxtgroupbox.cpp src/qxtheaderview.cpp src/qxtitemdelegate.cpp src/qxtlabel.cpp src/qxtlanguagecombobox.cpp src/qxtletterboxwidget.cpp src/qxtlistwidget.cpp src/qxtlistwidgetitem.cpp src/qxtprogresslabel.cpp src/qxtproxystyle.cpp src/qxtpushbutton.cpp src/qxtscheduleheaderwidget.cpp src/qxtscheduleitemdelegate.cpp src/qxtscheduleview.cpp src/qxtscheduleviewheadermodel_p.cpp src/qxtscheduleview_p.cpp src/qxtsortfilterproxymodel.cpp src/qxtspanslider.cpp src/qxtstars.cpp src/qxtstringspinbox.cpp src/qxtstringvalidator.cpp src/qxtstyleoptionscheduleviewitem.cpp src/qxttabbar.cpp src/qxttablewidget.cpp src/qxttablewidgetitem.cpp src/qxttabwidget.cpp src/qxttooltip.cpp src/qxttreewidget.cpp src/qxttreewidgetitem.cpp ) -SET(QT_MT_REQUIRED TRUE) -SET(QXT_INCLUDE_DIR ${QXT_SOURCE_DIR}/include CACHE PATH "MITK internal qxt include directory") -INCLUDE_DIRECTORIES(${QXT_INCLUDE_DIR}) +set(QT_MT_REQUIRED TRUE) +set(QXT_INCLUDE_DIR ${QXT_SOURCE_DIR}/include CACHE PATH "MITK internal qxt include directory") +include_directories(${QXT_INCLUDE_DIR}) -FIND_PACKAGE(Qt4 REQUIRED) -SET(QT_USE_QTSVG 1) -INCLUDE(${QT_USE_FILE}) +find_package(Qt4 REQUIRED) +set(QT_USE_QTSVG 1) +include(${QT_USE_FILE}) QT4_WRAP_CPP(QXT_SOURCES ${QXT_MOC_HEADERS}) -ADD_DEFINITIONS(-DBUILD_QXT_GUI) -ADD_DEFINITIONS(-DBUILD_QXT_CORE) +add_definitions(-DBUILD_QXT_GUI) +add_definitions(-DBUILD_QXT_CORE) -ADD_LIBRARY(qxt ${QXT_SOURCES}) -TARGET_LINK_LIBRARIES(qxt ${QT_LIBRARIES}) +add_library(qxt ${QXT_SOURCES}) +target_link_libraries(qxt ${QT_LIBRARIES}) # install only if shared lib (for now) MITK_CREATE_MODULE_CONF(qxt INCLUDE_DIRS include ) -ENDIF(MITK_USE_QT) # only if MITK is built with Qt +endif(MITK_USE_QT) # only if MITK is built with Qt diff --git a/Utilities/tinyxml/CMakeLists.txt b/Utilities/tinyxml/CMakeLists.txt index 465d58c422..62b6059264 100644 --- a/Utilities/tinyxml/CMakeLists.txt +++ b/Utilities/tinyxml/CMakeLists.txt @@ -1,18 +1,18 @@ -PROJECT(TINY_XML) +project(TINY_XML) -SET(TINY_XML_HEADERS +set(TINY_XML_HEADERS tinystr.h tinyxml.h ) -SET(TINY_XML_SOURCES +set(TINY_XML_SOURCES tinyxml.cpp tinyxmlparser.cpp tinyxmlerror.cpp tinystr.cpp ) -ADD_DEFINITIONS(-DTIXML_USE_STL) -ADD_LIBRARY(tinyxml${LIBPOSTFIX} ${MITK_WIN32_FORCE_STATIC} ${TINY_XML_HEADERS} ${TINY_XML_SOURCES}) +add_definitions(-DTIXML_USE_STL) +add_library(tinyxml${LIBPOSTFIX} ${MITK_WIN32_FORCE_STATIC} ${TINY_XML_HEADERS} ${TINY_XML_SOURCES}) MITK_CREATE_MODULE_CONF( tinyxml ) diff --git a/Utilities/tinyxml/MITK_CHANGES.txt b/Utilities/tinyxml/MITK_CHANGES.txt index f5066f053c..a44335dbbe 100644 --- a/Utilities/tinyxml/MITK_CHANGES.txt +++ b/Utilities/tinyxml/MITK_CHANGES.txt @@ -1,18 +1,18 @@ Changes made to the source code of TinyXML (should be checked when updating the source code) ================================================================================ We set the flag TIXML_USE_XML when compiling the library. Since most headers look differnt depending on whether this flag ist set or not we changed the headers by adding a #define TIXML_USE_XML at the top of each header. If we wouldn't do this change in the original headers, we would have to put a line -ADD_DEFINITIONS(-DTIXML_USE_XML) +add_definitions(-DTIXML_USE_XML) into each MITK module/application that wants to use TinyXML with STL strings. diff --git a/Wrapping/CMakeLists.txt b/Wrapping/CMakeLists.txt index 07245f67d6..a20ab40a53 100644 --- a/Wrapping/CMakeLists.txt +++ b/Wrapping/CMakeLists.txt @@ -1,36 +1,36 @@ -PROJECT(mitkWrap) +project(mitkWrap) cmake_minimum_required(VERSION 2.6) -INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/mitkWrapSetup.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/mitkWrapSetup.cmake) # Find wrapping language API libraries. -IF(MITK_USE_Python) - INCLUDE(${CMAKE_ROOT}/Modules/FindPythonLibs.cmake) - FIND_PROGRAM(PYTHON_EXECUTABLE +if(MITK_USE_Python) + include(${CMAKE_ROOT}/Modules/FindPythonLibs.cmake) + find_program(PYTHON_EXECUTABLE NAMES python python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath] [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath] [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath] [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath] [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.6\\InstallPath] [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath] ) - MARK_AS_ADVANCED(PYTHON_EXECUTABLE) -ENDIF(MITK_USE_Python) + mark_as_advanced(PYTHON_EXECUTABLE) +endif(MITK_USE_Python) -MARK_AS_ADVANCED(MITK_USE_Python) -MARK_AS_ADVANCED(CABLE_INDEX) -MARK_AS_ADVANCED(CSWIG) -MARK_AS_ADVANCED(GCCXML) +mark_as_advanced(MITK_USE_Python) +mark_as_advanced(CABLE_INDEX) +mark_as_advanced(CSWIG) +mark_as_advanced(GCCXML) # set a variable to determine if # the CSwig directory should be used -SET(MITK_CSWIG_DIR 0) -IF(MITK_USE_Python) - SET(MITK_CSWIG_DIR 1) -ENDIF(MITK_USE_Python) +set(MITK_CSWIG_DIR 0) +if(MITK_USE_Python) + set(MITK_CSWIG_DIR 1) +endif(MITK_USE_Python) -IF(MITK_CSWIG_DIR) - SUBDIRS(CSwig) -ENDIF(MITK_CSWIG_DIR) +if(MITK_CSWIG_DIR) + subdirs(CSwig) +endif(MITK_CSWIG_DIR) diff --git a/Wrapping/CSwig/CMakeLists.txt b/Wrapping/CSwig/CMakeLists.txt index f4307c8966..19eb58b447 100644 --- a/Wrapping/CSwig/CMakeLists.txt +++ b/Wrapping/CSwig/CMakeLists.txt @@ -1,524 +1,524 @@ -IF(CMAKE_COMPILER_IS_GNUCXX) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") -ENDIF(CMAKE_COMPILER_IS_GNUCXX) +if(CMAKE_COMPILER_IS_GNUCXX) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") +endif(CMAKE_COMPILER_IS_GNUCXX) -IF(MITK_USE_Python) +if(MITK_USE_Python) # Python include directory. - SET(MITK_INCLUDE_DIRS ${MITK_INCLUDE_DIRS} + set(MITK_INCLUDE_DIRS ${MITK_INCLUDE_DIRS} ${PYTHON_INCLUDE_PATH}) -ENDIF(MITK_USE_Python) +endif(MITK_USE_Python) # We have found CableSwig. Use the settings. -SET(CABLE_INDEX ${CableSwig_cableidx_EXE}) -SET(CSWIG ${CableSwig_cswig_EXE}) -SET(GCCXML ${CableSwig_gccxml_EXE}) -SET(MITK_WRAPPING_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) -SET(MITK_WRAPPING_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) - -#SET(MITK_WRAP_NEEDS_DEPEND 1) -#IF(${CMAKE_MAKE_PROGRAM} MATCHES make) - #SET(MITK_WRAP_NEEDS_DEPEND 0) -#ENDIF(${CMAKE_MAKE_PROGRAM} MATCHES make) -SET(MITK_TOP ${MITK_SOURCE_DIR}) -SET(MITK_SWIG_DEFAULT_LIB ${CableSwig_DIR}/Swig/Lib ) -SET(MITK_WRAP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) -SET(MITK_WRAP_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) - -SET(CSWIG_EXTRA_LINKFLAGS ) -IF(CMAKE_BUILD_TOOL MATCHES "(msdev|devenv|nmake)") - SET(CSWIG_EXTRA_LINKFLAGS "/IGNORE:4049") -ENDIF(CMAKE_BUILD_TOOL MATCHES "(msdev|devenv|nmake)") - -IF(CMAKE_SYSTEM MATCHES "IRIX.*") - IF(CMAKE_CXX_COMPILER MATCHES "CC") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -woff 1552") - ENDIF(CMAKE_CXX_COMPILER MATCHES "CC") -ENDIF(CMAKE_SYSTEM MATCHES "IRIX.*") - -IF(CMAKE_COMPILER_IS_GNUCXX) - STRING(REGEX REPLACE "-Wcast-qual" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - -SET(IGNORE_WARNINGS -w362 -w389 -w503 -w508 -w509 -w516) +set(CABLE_INDEX ${CableSwig_cableidx_EXE}) +set(CSWIG ${CableSwig_cswig_EXE}) +set(GCCXML ${CableSwig_gccxml_EXE}) +set(MITK_WRAPPING_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +set(MITK_WRAPPING_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) + +#set(MITK_WRAP_NEEDS_DEPEND 1) +#if(${CMAKE_MAKE_PROGRAM} MATCHES make) + #set(MITK_WRAP_NEEDS_DEPEND 0) +#endif(${CMAKE_MAKE_PROGRAM} MATCHES make) +set(MITK_TOP ${MITK_SOURCE_DIR}) +set(MITK_SWIG_DEFAULT_LIB ${CableSwig_DIR}/Swig/Lib ) +set(MITK_WRAP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +set(MITK_WRAP_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) + +set(CSWIG_EXTRA_LINKFLAGS ) +if(CMAKE_BUILD_TOOL MATCHES "(msdev|devenv|nmake)") + set(CSWIG_EXTRA_LINKFLAGS "/IGNORE:4049") +endif(CMAKE_BUILD_TOOL MATCHES "(msdev|devenv|nmake)") + +if(CMAKE_SYSTEM MATCHES "IRIX.*") + if(CMAKE_CXX_COMPILER MATCHES "CC") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -woff 1552") + endif(CMAKE_CXX_COMPILER MATCHES "CC") +endif(CMAKE_SYSTEM MATCHES "IRIX.*") + +if(CMAKE_COMPILER_IS_GNUCXX) + string(REGEX REPLACE "-Wcast-qual" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +endif(CMAKE_COMPILER_IS_GNUCXX) + +set(IGNORE_WARNINGS -w362 -w389 -w503 -w508 -w509 -w516) # define macros for wrapping commands -MACRO(GCCXML_CREATE_XML_FILE Source Bin Input Output Library) +macro(GCCXML_CREATE_XML_FILE Source Bin Input Output Library) # if the make program is not an IDE then include # the depend file in a way that will make cmake # re-run if it changes - SET(CABLE_SWIG_DEPEND) - SET(CABLE_SWIG_DEPEND_REGENERATE) - IF(${CMAKE_MAKE_PROGRAM} MATCHES "make") - IF(EXISTS ${Bin}/${Output}.depend) - ELSE(EXISTS ${Bin}/${Output}.depend) - CONFIGURE_FILE( + set(CABLE_SWIG_DEPEND) + set(CABLE_SWIG_DEPEND_REGENERATE) + if(${CMAKE_MAKE_PROGRAM} MATCHES "make") + if(EXISTS ${Bin}/${Output}.depend) + else(EXISTS ${Bin}/${Output}.depend) + configure_file( ${MITK_SOURCE_DIR}/Wrapping/CSwig/empty.depend.in ${Bin}/${Output}.depend @ONLY IMMEDIATE) - ENDIF(EXISTS ${Bin}/${Output}.depend) - INCLUDE(${Bin}/${Output}.depend) - ELSE(${CMAKE_MAKE_PROGRAM} MATCHES "make") + endif(EXISTS ${Bin}/${Output}.depend) + include(${Bin}/${Output}.depend) + else(${CMAKE_MAKE_PROGRAM} MATCHES "make") # for IDE generators like MS dev only include the depend files # if they exist. This is to prevent ecessive reloading of # workspaces after each build. This also means # that the depends will not be correct until cmake # is run once after the build has completed once. # the depend files are created in the wrap tcl/python sections # when the .xml file is parsed. - INCLUDE(${Bin}/${Output}.depend OPTIONAL) - ENDIF(${CMAKE_MAKE_PROGRAM} MATCHES "make") + include(${Bin}/${Output}.depend OPTIONAL) + endif(${CMAKE_MAKE_PROGRAM} MATCHES "make") - IF(CABLE_SWIG_DEPEND) + if(CABLE_SWIG_DEPEND) # There are dependencies. Make sure all the files are present. # If not, force the rule to re-run to update the dependencies. - FOREACH(f ${CABLE_SWIG_DEPEND}) - IF(EXISTS ${f}) - ELSE(EXISTS ${f}) - SET(CABLE_SWIG_DEPEND_REGENERATE 1) - ENDIF(EXISTS ${f}) - ENDFOREACH(f) - ELSE(CABLE_SWIG_DEPEND) + foreach(f ${CABLE_SWIG_DEPEND}) + if(EXISTS ${f}) + else(EXISTS ${f}) + set(CABLE_SWIG_DEPEND_REGENERATE 1) + endif(EXISTS ${f}) + endforeach(f) + else(CABLE_SWIG_DEPEND) # No dependencies, make the output depend on the dependency file # itself, which should cause the rule to re-run. - SET(CABLE_SWIG_DEPEND_REGENERATE 1) - ENDIF(CABLE_SWIG_DEPEND) - IF(CABLE_SWIG_DEPEND_REGENERATE) - SET(CABLE_SWIG_DEPEND ${Bin}/${Output}.depend) - CONFIGURE_FILE( + set(CABLE_SWIG_DEPEND_REGENERATE 1) + endif(CABLE_SWIG_DEPEND) + if(CABLE_SWIG_DEPEND_REGENERATE) + set(CABLE_SWIG_DEPEND ${Bin}/${Output}.depend) + configure_file( ${MITK_SOURCE_DIR}/Wrapping/CSwig/empty.depend.in ${Bin}/${Output}.depend @ONLY IMMEDIATE) - ENDIF(CABLE_SWIG_DEPEND_REGENERATE) - SET(OutDir "Debug") + endif(CABLE_SWIG_DEPEND_REGENERATE) + set(OutDir "Debug") - IF(WIN32) - SET(OS -DWIN32) - ENDIF(WIN32) + if(WIN32) + set(OS -DWIN32) + endif(WIN32) - ADD_CUSTOM_COMMAND( + add_custom_command( COMMENT "${Output} from " SOURCE ${Source}/${Input} COMMAND ${GCCXML} ARGS -fxml-start=_cable_ -fxml=${Bin}/${Output} --gccxml-gcc-options ${SWIG_INC_FILE} ${OS} -DCSWIG -DCABLE_CONFIGURATION ${Source}/${Input} TARGET ${Library} OUTPUTS ${Bin}/${Output} DEPENDS ${GCCXML} ${CABLE_SWIG_DEPEND}) -ENDMACRO(GCCXML_CREATE_XML_FILE) +endmacro(GCCXML_CREATE_XML_FILE) -MACRO(CINDEX_CREATE_IDX_FILE Bin Input Output Library) - ADD_CUSTOM_COMMAND( +macro(CINDEX_CREATE_IDX_FILE Bin Input Output Library) + add_custom_command( COMMENT "${Output} from " SOURCE ${Bin}/${Input} COMMAND ${CABLE_INDEX} ARGS ${Bin}/${Input} ${Bin}/${Output} TARGET ${Library} OUTPUTS ${Bin}/${Output} DEPENDS ${Bin}/${Input} ${CABLE_INDEX} ) -ENDMACRO(CINDEX_CREATE_IDX_FILE) - -SET(MITK_USE_Python_NO_EXCEPTION_REGEX "(ContinuousIndex|Python)\\.xml$") - -MACRO(CSWIG_CREATE_PYTHON_CXX_FILE Bin MasterIdx InputIdx InputXml OutputPythonCxx Library LibraryIndexFiles) - SET(CINDEX) - FOREACH(MIDX ${MasterIdx}) - SET(CINDEX ${CINDEX} -Cindex "${MIDX}") - ENDFOREACH(MIDX) - IF("${InputXml}" MATCHES "${MITK_USE_Python_NO_EXCEPTION_REGEX}") - SET(MITK_SWG_FILE "") - ELSE("${InputXml}" MATCHES "${MITK_USE_Python_NO_EXCEPTION_REGEX}") - SET(MITK_SWG_FILE "-l${MITK_CSWIG_SOURCE_DIR}/mitk.swg" "-l${MITK_CSWIG_SOURCE_DIR}/mitkvtk.swg") - ENDIF("${InputXml}" MATCHES "${MITK_USE_Python_NO_EXCEPTION_REGEX}") - STRING(REPLACE "_" "" LIB_PYTHON_FILES ${Library}) - - #MESSAGE(STATUS "CMAKE_CFG_INTDIR: ${CMAKE_CFG_INTDIR}") - #MESSAGE(STATUS "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${LIB_PYTHON_FILES}") - #MAKE_DIRECTORY(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${LIB_PYTHON_FILES}) - MAKE_DIRECTORY(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${LIB_PYTHON_FILES}) - FILE(WRITE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${LIB_PYTHON_FILES}/__init__.py "from mitkCorePython import *") - - ADD_CUSTOM_COMMAND( +endmacro(CINDEX_CREATE_IDX_FILE) + +set(MITK_USE_Python_NO_EXCEPTION_REGEX "(ContinuousIndex|Python)\\.xml$") + +macro(CSWIG_CREATE_PYTHON_CXX_FILE Bin MasterIdx InputIdx InputXml OutputPythonCxx Library LibraryIndexFiles) + set(CINDEX) + foreach(MIDX ${MasterIdx}) + set(CINDEX ${CINDEX} -Cindex "${MIDX}") + endforeach(MIDX) + if("${InputXml}" MATCHES "${MITK_USE_Python_NO_EXCEPTION_REGEX}") + set(MITK_SWG_FILE "") + else("${InputXml}" MATCHES "${MITK_USE_Python_NO_EXCEPTION_REGEX}") + set(MITK_SWG_FILE "-l${MITK_CSWIG_SOURCE_DIR}/mitk.swg" "-l${MITK_CSWIG_SOURCE_DIR}/mitkvtk.swg") + endif("${InputXml}" MATCHES "${MITK_USE_Python_NO_EXCEPTION_REGEX}") + string(REPLACE "_" "" LIB_PYTHON_FILES ${Library}) + + #message(STATUS "CMAKE_CFG_INTDIR: ${CMAKE_CFG_INTDIR}") + #message(STATUS "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${LIB_PYTHON_FILES}") + #make_directory(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${LIB_PYTHON_FILES}) + make_directory(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${LIB_PYTHON_FILES}) + file(WRITE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${LIB_PYTHON_FILES}/__init__.py "from mitkCorePython import *") + + add_custom_command( COMMENT "${OutputPythonCxx} from " SOURCE ${Bin}/${InputIdx} COMMAND ${CSWIG} ARGS ${MITK_SWG_FILE} -I${MITK_SWIG_DEFAULT_LIB} -I${MITK_SWIG_DEFAULT_LIB}/python -noruntime -dirprot #-keyword ${CINDEX} ${IGNORE_WARNINGS} -depend ${Bin}/${InputXml}.depend -outdir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CFG_INTDIR}/${LIB_PYTHON_FILES}" -o ${Bin}/${OutputPythonCxx} -python -c++ ${Bin}/${InputXml} TARGET ${Library} OUTPUTS ${Bin}/${OutputPythonCxx} DEPENDS ${LibraryIndexFiles} ${MITK_CSWIG_SOURCE_DIR}/mitk.swg ${MITK_CSWIG_SOURCE_DIR}/mitk.swg ${Bin}/${InputXml} ${CSWIG} ) -ENDMACRO(CSWIG_CREATE_PYTHON_CXX_FILE) +endmacro(CSWIG_CREATE_PYTHON_CXX_FILE) # macro to create .xml, .idx and Python.cxx files -MACRO(WRAP_PYTHON_SOURCES Source Bin BaseName LibraryName MasterIdx LibraryIndexFiles) +macro(WRAP_PYTHON_SOURCES Source Bin BaseName LibraryName MasterIdx LibraryIndexFiles) GCCXML_CREATE_XML_FILE(${Source} ${Bin} ${BaseName}.cxx ${BaseName}.xml ${LibraryName}) CINDEX_CREATE_IDX_FILE(${Bin} ${BaseName}.xml ${BaseName}.idx ${LibraryName}) CSWIG_CREATE_PYTHON_CXX_FILE(${Bin} "${MasterIdx}" ${BaseName}.idx ${BaseName}.xml ${BaseName}Python.cxx ${LibraryName} "${LibraryIndexFiles}") -ENDMACRO(WRAP_PYTHON_SOURCES) +endmacro(WRAP_PYTHON_SOURCES) # make sure required stuff is set -IF(NOT EXECUTABLE_OUTPUT_PATH) - SET (EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE INTERNAL "Single output directory for building all executables.") -ENDIF(NOT EXECUTABLE_OUTPUT_PATH) - -SET(MITK_CSWIG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) -SET(MITK_CSWIG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - -IF(MITK_LIBRARY_DIRS) - STRING(REGEX REPLACE "^/" "" MITK_INSTALL_LIBRARY_DIR "${MITK_LIBRARY_DIRS}") -ENDIF(MITK_LIBRARY_DIRS) -IF(MITK_BINARY_DIR) - STRING(REGEX REPLACE "^/" "" MITK_INSTALL_BIN_DIR "${MITK_BINARY_DIR}") -ENDIF(MITK_BINARY_DIR) -SET(CSWIG_MISSING_VALUES) -IF(NOT CSWIG) - SET(CSWIG_MISSING_VALUES "${CSWIG_MISSING_VALUES} CSWIG ") -ENDIF(NOT CSWIG) -IF(NOT CABLE_INDEX) - SET(CSWIG_MISSING_VALUES "${CSWIG_MISSING_VALUES} CABLE_INDEX ") -ENDIF(NOT CABLE_INDEX) -IF(NOT GCCXML) - SET(CSWIG_MISSING_VALUES "${CSWIG_MISSING_VALUES} GCCXML ") -ENDIF(NOT GCCXML) -IF(CSWIG_MISSING_VALUES) - MESSAGE(SEND_ERROR "To use cswig wrapping, CSWIG, CABLE_INDEX, and GCCXML executables must be specified. If they are all in the same directory, only specifiy one of them, and then run cmake configure again and the others should be found.\nCurrently, you are missing the following:\n ${CSWIG_MISSING_VALUES}") -ENDIF(CSWIG_MISSING_VALUES) - - -IF(MITK_USE_Python) - INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} ) -ENDIF(MITK_USE_Python) - -SET(SWIG_INC +if(NOT EXECUTABLE_OUTPUT_PATH) + set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE INTERNAL "Single output directory for building all executables.") +endif(NOT EXECUTABLE_OUTPUT_PATH) + +set(MITK_CSWIG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) +set(MITK_CSWIG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + +if(MITK_LIBRARY_DIRS) + string(REGEX REPLACE "^/" "" MITK_INSTALL_LIBRARY_DIR "${MITK_LIBRARY_DIRS}") +endif(MITK_LIBRARY_DIRS) +if(MITK_BINARY_DIR) + string(REGEX REPLACE "^/" "" MITK_INSTALL_BIN_DIR "${MITK_BINARY_DIR}") +endif(MITK_BINARY_DIR) +set(CSWIG_MISSING_VALUES) +if(NOT CSWIG) + set(CSWIG_MISSING_VALUES "${CSWIG_MISSING_VALUES} CSWIG ") +endif(NOT CSWIG) +if(NOT CABLE_INDEX) + set(CSWIG_MISSING_VALUES "${CSWIG_MISSING_VALUES} CABLE_INDEX ") +endif(NOT CABLE_INDEX) +if(NOT GCCXML) + set(CSWIG_MISSING_VALUES "${CSWIG_MISSING_VALUES} GCCXML ") +endif(NOT GCCXML) +if(CSWIG_MISSING_VALUES) + message(SEND_ERROR "To use cswig wrapping, CSWIG, CABLE_INDEX, and GCCXML executables must be specified. If they are all in the same directory, only specifiy one of them, and then run cmake configure again and the others should be found.\nCurrently, you are missing the following:\n ${CSWIG_MISSING_VALUES}") +endif(CSWIG_MISSING_VALUES) + + +if(MITK_USE_Python) + include_directories(${PYTHON_INCLUDE_PATH} ) +endif(MITK_USE_Python) + +set(SWIG_INC ${MITK_INCLUDE_DIRS_BUILD_TREE} ${MITK_INCLUDE_DIRS_BUILD_TREE_CXX} ${MITK_INCLUDE_DIRS} ${MITK_TOP}/Wrapping/CSwig ${MITK_TOP}/Wrapping/CSwig/Core ) -ADD_DEFINITIONS(-DSWIG_GLOBAL) +add_definitions(-DSWIG_GLOBAL) -INCLUDE(PythonMITKModules.cmake) +include(PythonMITKModules.cmake) -ADD_SUBDIRECTORY(SwigRuntime) +add_subdirectory(SwigRuntime) -IF(UNIX) - SET(MITK_CSWIG_LIBNAME_PREFIX "lib") -ELSE(UNIX) - SET(MITK_CSWIG_LIBNAME_PREFIX "") -ENDIF(UNIX) +if(UNIX) + set(MITK_CSWIG_LIBNAME_PREFIX "lib") +else(UNIX) + set(MITK_CSWIG_LIBNAME_PREFIX "") +endif(UNIX) -SET(MITK_CSWIG_PACKAGE_DIR_BUILD "${MITK_LIBRARY_PATH}") +set(MITK_CSWIG_PACKAGE_DIR_BUILD "${MITK_LIBRARY_PATH}") #----------------------------------------------------------------------------- # Configure python packages. -SET(MITK_CSWIG_DATA_ROOT "'${MITK_DATA_ROOT}'") -SET(MITK_CSWIG_TEST_ROOT "'${MITK_BINARY_DIR}/Testing'") -#IF(MITK_CSWIG_CONFIGURATION_TYPES) - #FOREACH(config ${MITK_CSWIG_CONFIGURATION_TYPES}) - #SET(ITK_CSWIG_PACKAGE_DIR "'${MITK_CSWIG_PACKAGE_DIR_BUILD}/${config}'") - #CONFIGURE_FILE("${MITK_SOURCE_DIR}/Wrapping/CSwig/Python/mitkbase.py.in" +set(MITK_CSWIG_DATA_ROOT "'${MITK_DATA_ROOT}'") +set(MITK_CSWIG_TEST_ROOT "'${MITK_BINARY_DIR}/Testing'") +#if(MITK_CSWIG_CONFIGURATION_TYPES) + #foreach(config ${MITK_CSWIG_CONFIGURATION_TYPES}) + #set(ITK_CSWIG_PACKAGE_DIR "'${MITK_CSWIG_PACKAGE_DIR_BUILD}/${config}'") + #configure_file("${MITK_SOURCE_DIR}/Wrapping/CSwig/Python/mitkbase.py.in" #"${MITK_BINARY_DIR}/Wrapping/CSwig/Python/${config}/mitkbase.py" #@ONLY IMMEDIATE) - #ENDFOREACH(config) -#ELSE(MITK_CSWIG_CONFIGURATION_TYPES) - #SET(MITK_CSWIG_PACKAGE_DIR "'${MITK_CSWIG_PACKAGE_DIR_BUILD}'") - #CONFIGURE_FILE("${MITK_SOURCE_DIR}/Wrapping/CSwig/Python/mitkbase.py.in" + #endforeach(config) +#else(MITK_CSWIG_CONFIGURATION_TYPES) + #set(MITK_CSWIG_PACKAGE_DIR "'${MITK_CSWIG_PACKAGE_DIR_BUILD}'") + #configure_file("${MITK_SOURCE_DIR}/Wrapping/CSwig/Python/mitkbase.py.in" #"${MITK_BINARY_DIR}/Wrapping/CSwig/Python/mitkbase.py" #@ONLY IMMEDIATE) -#ENDIF(MITK_CSWIG_CONFIGURATION_TYPES) +#endif(MITK_CSWIG_CONFIGURATION_TYPES) # Handle out-of-source builds correctly. # # 1. Create a list of Python files to be installed/copied. # 2. Copy them to ITK_BINARY_DIR if it is different from ITK_SOURCE_DIR. # 3. Use Python's compileall to compile the copied files. # # *** Step 1 has to be done carefully to avoid missing out files *** -IF(PYTHON_EXECUTABLE AND MITK_USE_Python) +if(PYTHON_EXECUTABLE AND MITK_USE_Python) - #FILE(WRITE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mitk.py "") - #CONFIGURE_FILE(Python/mitk.py.in ${CMAKE_CURRENT_BINARY_DIR}/mitk.py) - FILE(COPY Python/mitkCast.py DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE) + #file(WRITE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mitk.py "") + #configure_file(Python/mitk.py.in ${CMAKE_CURRENT_BINARY_DIR}/mitk.py) + file(COPY Python/mitkCast.py DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE) - SET(CMAKE_MODULE_PATH ${MITK_SOURCE_DIR}/CMake) - ADD_CUSTOM_TARGET(mitkpython_pyc ALL echo "...") + set(CMAKE_MODULE_PATH ${MITK_SOURCE_DIR}/CMake) + add_custom_target(mitkpython_pyc ALL echo "...") # Make the necessary directories. - MAKE_DIRECTORY(${MITK_BINARY_DIR}/Wrapping/CSwig/Python) + make_directory(${MITK_BINARY_DIR}/Wrapping/CSwig/Python) # Now create a list of Python files. - SET(MITK_PYTHON_FILES) + set(MITK_PYTHON_FILES) # Wrapping/CSwig/Python/*.py - SET(MITK_PYTHON_FILES + set(MITK_PYTHON_FILES ${MITK_PYTHON_FILES} mitk ) # Done listing files. # Now copy these files if necessary. - SET(MITK_PYTHON_SOURCE_FILES) - SET(MITK_PYTHON_OUTPUT_FILES) - #IF(MITK_CSWIG_CONFIGURATION_TYPES) - #FOREACH(file ${MITK_PYTHON_FILES}) - #SET(src "${MITK_BINARY_DIR}/Wrapping/CSwig/Python/${CMAKE_CFG_INTDIR}/${file}.py") - #SET(MITK_PYTHON_SOURCE_FILES ${MITK_PYTHON_SOURCE_FILES} ${src}) - #ENDFOREACH(file) - #ELSE(MITK_CSWIG_CONFIGURATION_TYPES) - #FOREACH(file ${MITK_PYTHON_FILES}) - #SET(src "${MITK_BINARY_DIR}/Wrapping/CSwig/Python/${file}.py") - #SET(ITK_PYTHON_SOURCE_FILES ${MITK_PYTHON_SOURCE_FILES} ${src}) - #ENDFOREACH(file) - #ENDIF(MITK_CSWIG_CONFIGURATION_TYPES) - #IF ("${MITK_BINARY_DIR}" MATCHES "^${MITK_SOURCE_DIR}$") - #MESSAGE("In source build -- no need to copy Python files.") - #ELSE ("${MITK_BINARY_DIR}" MATCHES "^${MITK_SOURCE_DIR}$") - #IF(MITK_CSWIG_CONFIGURATION_TYPES) - #FOREACH(file ${MITK_PYTHON_FILES}) - #SET(src "${MITK_SOURCE_DIR}/Wrapping/CSwig/Python/${file}.py") - #SET(tgt "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${file}.py") - #ADD_CUSTOM_COMMAND(SOURCE ${src} + set(MITK_PYTHON_SOURCE_FILES) + set(MITK_PYTHON_OUTPUT_FILES) + #if(MITK_CSWIG_CONFIGURATION_TYPES) + #foreach(file ${MITK_PYTHON_FILES}) + #set(src "${MITK_BINARY_DIR}/Wrapping/CSwig/Python/${CMAKE_CFG_INTDIR}/${file}.py") + #set(MITK_PYTHON_SOURCE_FILES ${MITK_PYTHON_SOURCE_FILES} ${src}) + #endforeach(file) + #else(MITK_CSWIG_CONFIGURATION_TYPES) + #foreach(file ${MITK_PYTHON_FILES}) + #set(src "${MITK_BINARY_DIR}/Wrapping/CSwig/Python/${file}.py") + #set(ITK_PYTHON_SOURCE_FILES ${MITK_PYTHON_SOURCE_FILES} ${src}) + #endforeach(file) + #endif(MITK_CSWIG_CONFIGURATION_TYPES) + #if("${MITK_BINARY_DIR}" MATCHES "^${MITK_SOURCE_DIR}$") + #message("In source build -- no need to copy Python files.") + #else("${MITK_BINARY_DIR}" MATCHES "^${MITK_SOURCE_DIR}$") + #if(MITK_CSWIG_CONFIGURATION_TYPES) + #foreach(file ${MITK_PYTHON_FILES}) + #set(src "${MITK_SOURCE_DIR}/Wrapping/CSwig/Python/${file}.py") + #set(tgt "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${file}.py") + #add_custom_command(SOURCE ${src} #COMMAND ${CMAKE_COMMAND} #ARGS -E copy ${src} ${tgt} #OUTPUTS ${tgt} #TARGET copy #COMMENT "source copy") - #ENDFOREACH(file) - #ELSE(MITK_CSWIG_CONFIGURATION_TYPES) - #FOREACH(file ${MITK_PYTHON_FILES}) - #SET(src "${MITK_SOURCE_DIR}/Wrapping/CSwig/Python/${file}.py") - #SET(tgt "${MITK_BINARY_DIR}/Wrapping/CSwig/Python/${file}.py") - #ADD_CUSTOM_COMMAND(SOURCE ${src} + #endforeach(file) + #else(MITK_CSWIG_CONFIGURATION_TYPES) + #foreach(file ${MITK_PYTHON_FILES}) + #set(src "${MITK_SOURCE_DIR}/Wrapping/CSwig/Python/${file}.py") + #set(tgt "${MITK_BINARY_DIR}/Wrapping/CSwig/Python/${file}.py") + #add_custom_command(SOURCE ${src} #COMMAND ${CMAKE_COMMAND} #ARGS -E copy ${src} ${tgt} #OUTPUTS ${tgt} #TARGET mitkpython_pyc #COMMENT "source copy") - #ENDFOREACH(file) - #ENDIF(MITK_CSWIG_CONFIGURATION_TYPES) - #ENDIF ("${MITK_BINARY_DIR}" MATCHES "^${MITK_SOURCE_DIR}$") + #endforeach(file) + #endif(MITK_CSWIG_CONFIGURATION_TYPES) + #endif("${MITK_BINARY_DIR}" MATCHES "^${MITK_SOURCE_DIR}$") # Byte compile the Python files. - WRITE_FILE(${MITK_BINARY_DIR}/Wrapping/CSwig/Python/compile_all_mitk + write_file(${MITK_BINARY_DIR}/Wrapping/CSwig/Python/compile_all_mitk "import compileall\n" "compileall.compile_dir('${MITK_BINARY_DIR}/Wrapping/CSwig/Python')\n" "file = open('${MITK_BINARY_DIR}/Wrapping/CSwig/Python/mitk_compile_complete', 'w')\n" "file.write('Done')\n") - ADD_CUSTOM_COMMAND( + add_custom_command( SOURCE ${MITK_BINARY_DIR}/Wrapping/CSwig/Python/compile_all_mitk COMMAND ${PYTHON_EXECUTABLE} ARGS ${MITK_BINARY_DIR}/Wrapping/CSwig/Python/compile_all_mitk DEPENDS ${MITK_PYTHON_SOURCE_FILES} OUTPUTS "${MITK_BINARY_DIR}/Wrapping/CSwig/Python/mitk_compile_complete" TARGET mitkpython_pyc ) - ADD_CUSTOM_COMMAND( + add_custom_command( SOURCE mitkpython_pyc DEPENDS "${MITK_BINARY_DIR}/Wrapping/CSwig/Python/mitk_compile_complete" TARGET mitkpython_pyc ) -ENDIF(PYTHON_EXECUTABLE AND MITK_USE_Python) +endif(PYTHON_EXECUTABLE AND MITK_USE_Python) -IF(MITK_USE_Python) +if(MITK_USE_Python) # Install the python files created at build time. - IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STREQUAL "2.4") + if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STREQUAL "2.4") # Old-style installation. - CONFIGURE_FILE( + configure_file( "${MITK_CSWIG_SOURCE_DIR}/pythonfiles_install.cmake.in" "${MITK_CSWIG_BINARY_DIR}/pythonfiles_install.cmake" @ONLY IMMEDIATE) - ADD_CUSTOM_TARGET(python_install) - SET_TARGET_PROPERTIES(python_install PROPERTIES + add_custom_target(python_install) + set_target_properties(python_install PROPERTIES POST_INSTALL_SCRIPT "${MITK_CSWIG_BINARY_DIR}/pythonfiles_install.cmake") - ELSE("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STREQUAL "2.4") + else("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STREQUAL "2.4") # Use CMake 2.6 FILES_MATCHING feature to install correctly. - IF(MITK_CSWIG_CONFIGURATION_TYPES) - SET(_FROMDIR ${EXECUTABLE_OUTPUT_PATH}/\${CMAKE_INSTALL_CONFIG_NAME}) - ELSE(MITK_CSWIG_CONFIGURATION_TYPES) - SET(_FROMDIR ${EXECUTABLE_OUTPUT_PATH}) - ENDIF(MITK_CSWIG_CONFIGURATION_TYPES) - IF(MITK_INSTALL_LIBRARY_DIR) - INSTALL( + if(MITK_CSWIG_CONFIGURATION_TYPES) + set(_FROMDIR ${EXECUTABLE_OUTPUT_PATH}/\${CMAKE_INSTALL_CONFIG_NAME}) + else(MITK_CSWIG_CONFIGURATION_TYPES) + set(_FROMDIR ${EXECUTABLE_OUTPUT_PATH}) + endif(MITK_CSWIG_CONFIGURATION_TYPES) + if(MITK_INSTALL_LIBRARY_DIR) + install( DIRECTORY ${_FROMDIR}/ DESTINATION ${MITK_INSTALL_LIBRARY_DIR} COMPONENT "RuntimeLibraries" FILES_MATCHING PATTERN "*.py" ) - ENDIF(MITK_INSTALL_LIBRARY_DIR) - ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STREQUAL "2.4") + endif(MITK_INSTALL_LIBRARY_DIR) + endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STREQUAL "2.4") # Install the package python files. - #FOREACH(file ${MITK_PYTHON_FILES}) - #IF(MITK_CSWIG_CONFIGURATION_TYPES) - #INSTALL(FILES "${MITK_BINARY_DIR}/Wrapping/CSwig/Python/\${CMAKE_INSTALL_CONFIG_NAME}/${file}.py" + #foreach(file ${MITK_PYTHON_FILES}) + #if(MITK_CSWIG_CONFIGURATION_TYPES) + #install(FILES "${MITK_BINARY_DIR}/Wrapping/CSwig/Python/\${CMAKE_INSTALL_CONFIG_NAME}/${file}.py" #DESTINATION ${MITK_INSTALL_LIBRARY_DIR}/python #COMPONENT RuntimeLibraries) - #ELSE(MITK_CSWIG_CONFIGURATION_TYPES) - #INSTALL(FILES "${MITK_BINARY_DIR}/Wrapping/CSwig/Python/${file}.py" + #else(MITK_CSWIG_CONFIGURATION_TYPES) + #install(FILES "${MITK_BINARY_DIR}/Wrapping/CSwig/Python/${file}.py" #DESTINATION ${MITK_INSTALL_LIBRARY_DIR}/python #COMPONENT RuntimeLibraries) - #ENDIF(MITK_CSWIG_CONFIGURATION_TYPES) - #ENDFOREACH(file) + #endif(MITK_CSWIG_CONFIGURATION_TYPES) + #endforeach(file) - SET(MITK_CSWIG_PACKAGE_DIR "os.path.dirname(selfpath)") - SET(MITK_CSWIG_DATA_ROOT "os.path.join(os.path.dirname(selfpath),'Data')") - SET(MITK_CSWIG_TEST_ROOT "''") - #CONFIGURE_FILE("${MITK_SOURCE_DIR}/Wrapping/CSwig/Python/mitkbase.py.in" + set(MITK_CSWIG_PACKAGE_DIR "os.path.dirname(selfpath)") + set(MITK_CSWIG_DATA_ROOT "os.path.join(os.path.dirname(selfpath),'Data')") + set(MITK_CSWIG_TEST_ROOT "''") + #configure_file("${MITK_SOURCE_DIR}/Wrapping/CSwig/Python/mitkbase.py.in" #"${MITK_BINARY_DIR}/Wrapping/CSwig/Python/InstallOnly/mitkbase.py" #@ONLY IMMEDIATE) - #INSTALL(FILES "${MITK_BINARY_DIR}/Wrapping/CSwig/Python/InstallOnly/mitkbase.py" + #install(FILES "${MITK_BINARY_DIR}/Wrapping/CSwig/Python/InstallOnly/mitkbase.py" #DESTINATION ${MITK_INSTALL_LIBRARY_DIR}/python #COMPONENT RuntimeLibraries) -ENDIF(MITK_USE_Python) +endif(MITK_USE_Python) -MACRO(MITK_WRAP_LIBRARY WRAP_SOURCES LIBRARY_NAME DIRECTORY DEPEND_LIBRARY EXTRA_SOURCES MITK_LINK_LIBRARIES) +macro(MITK_WRAP_LIBRARY WRAP_SOURCES LIBRARY_NAME DIRECTORY DEPEND_LIBRARY EXTRA_SOURCES MITK_LINK_LIBRARIES) # loop over cable config files creating two lists: # WRAP_PYTHON_SOURCES: list of generated files - FOREACH(Source ${WRAP_SOURCES}) - SET(WRAP_PYTHON_SOURCES ${WRAP_PYTHON_SOURCES} ${Source}Python.cxx) - SET(ALL_IDX_FILES ${ALL_IDX_FILES} ${MITK_WRAP_BINARY_DIR}/${DIRECTORY}/${Source}.idx ) - SET(INDEX_FILE_CONTENT "${INDEX_FILE_CONTENT}${MITK_CSWIG_BINARY_DIR}/${DIRECTORY}/${Source}.idx\n") - ENDFOREACH(Source) + foreach(Source ${WRAP_SOURCES}) + set(WRAP_PYTHON_SOURCES ${WRAP_PYTHON_SOURCES} ${Source}Python.cxx) + set(ALL_IDX_FILES ${ALL_IDX_FILES} ${MITK_WRAP_BINARY_DIR}/${DIRECTORY}/${Source}.idx ) + set(INDEX_FILE_CONTENT "${INDEX_FILE_CONTENT}${MITK_CSWIG_BINARY_DIR}/${DIRECTORY}/${Source}.idx\n") + endforeach(Source) # add the package wrappers - SET(WRAP_PYTHON_SOURCES ${WRAP_PYTHON_SOURCES} wrap_${LIBRARY_NAME}PythonPython.cxx) - IF(MITK_EXTRA_PYTHON_WRAP) - FOREACH( extraPython ${MITK_EXTRA_PYTHON_WRAP}) - SET(WRAP_PYTHON_SOURCES ${WRAP_PYTHON_SOURCES} ${extraPython}Python.cxx) - ENDFOREACH( extraPython ) - ENDIF(MITK_EXTRA_PYTHON_WRAP) + set(WRAP_PYTHON_SOURCES ${WRAP_PYTHON_SOURCES} wrap_${LIBRARY_NAME}PythonPython.cxx) + if(MITK_EXTRA_PYTHON_WRAP) + foreach( extraPython ${MITK_EXTRA_PYTHON_WRAP}) + set(WRAP_PYTHON_SOURCES ${WRAP_PYTHON_SOURCES} ${extraPython}Python.cxx) + endforeach( extraPython ) + endif(MITK_EXTRA_PYTHON_WRAP) # set the generated sources as generated - SET_SOURCE_FILES_PROPERTIES( + set_source_files_properties( ${WRAP_PYTHON_SOURCES} GENERATED ) - SET(EXTRA_LIBS ${MITK_LINK_LIBRARIES}) - IF("${MITK_LINK_LIBRARIES}" MATCHES "^$") - #SET(EXTRA_LIBS ${LIBRARY_NAME}) - ENDIF("${MITK_LINK_LIBRARIES}" MATCHES "^$") + set(EXTRA_LIBS ${MITK_LINK_LIBRARIES}) + if("${MITK_LINK_LIBRARIES}" MATCHES "^$") + #set(EXTRA_LIBS ${LIBRARY_NAME}) + endif("${MITK_LINK_LIBRARIES}" MATCHES "^$") - FILE(APPEND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mitk.py + file(APPEND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mitk.py "from ${LIBRARY_NAME}Python import *\n") - SET(DEPENDENCIES mitkIpPic mbilog tinyxml) - SET(DEPENDS ${DEPENDENCIES}) + set(DEPENDENCIES mitkIpPic mbilog tinyxml) + set(DEPENDS ${DEPENDENCIES}) MITK_CHECK_MODULE(_MISSING_DEP ${DEPENDENCIES}) MITK_USE_MODULE("Mitk") - SET(ALL_INCLUDE_DIRECTORIES ${ALL_INCLUDE_DIRECTORIES} ${MITK_INCLUDE_DIRS} ${MITK_WRAP_SOURCE_DIR} ${GDCM_INCLUDE_DIRS} ) + set(ALL_INCLUDE_DIRECTORIES ${ALL_INCLUDE_DIRECTORIES} ${MITK_INCLUDE_DIRS} ${MITK_WRAP_SOURCE_DIR} ${GDCM_INCLUDE_DIRS} ) # "D:/MITK/mitk/CoreUI/Bundles/org.mitk.gui.qt.common/src" "D:/MITK/mitk/BlueBerry/Bundles/org.blueberry.ui.qt/src" "D:/MITK/mitk/BlueBerry/Bundles/org.blueberry.ui/src" "D:/MITK/mitk/BlueBerry/Bundles/org.blueberry.core.runtime/src" "D:/MITK/mitk/CoreUI/Bundles/org.mitk.gui.common/src" "D:/MITK/mitk/BlueBerry/Bundles/org.blueberry.osgi/src" "D:/MITK/mitk/BlueBerry/Bundles/org.blueberry.osgi/src/service" "D:/MITK/mitk/Utilities/Poco/Foundation/include" "D:/binPython/BlueBerry/Bundles/org.blueberry.osgi" "D:/MITK/mitk/Utilities/Poco/Util/include" "V:/windows/x32/QT-4.6.2_VC9.0_Bin/include/QtGui" "V:/windows/x32/QT-4.6.2_VC9.0_Bin/include" - INCLUDE_DIRECTORIES(${ALL_INCLUDE_DIRECTORIES}) + include_directories(${ALL_INCLUDE_DIRECTORIES}) - IF(MITK_USE_Python) - IF(MITK_SWIG_FILE) - SET(SWIG_INC ${SWIG_INC} ${PYTHON_INCLUDE_PATH}) - SET_SOURCE_FILES_PROPERTIES(${MITK_SWIG_FILE_CXX}Python.cxx GENERATED) - SET(WRAP_FILE ${MITK_SWIG_FILE_CXX}Python.cxx ) - ENDIF(MITK_SWIG_FILE) + if(MITK_USE_Python) + if(MITK_SWIG_FILE) + set(SWIG_INC ${SWIG_INC} ${PYTHON_INCLUDE_PATH}) + set_source_files_properties(${MITK_SWIG_FILE_CXX}Python.cxx GENERATED) + set(WRAP_FILE ${MITK_SWIG_FILE_CXX}Python.cxx ) + endif(MITK_SWIG_FILE) - ADD_LIBRARY(_${LIBRARY_NAME}Python SHARED + add_library(_${LIBRARY_NAME}Python SHARED ${WRAP_PYTHON_SOURCES} ${MITK_EXTRA_PYTHON_SOURCES} ${WRAP_FILE} ${EXTRA_SOURCES}) - #TARGET_LINK_LIBRARIES(_${LIBRARY_NAME}Python ${DEPENDENCIES}) + #target_link_libraries(_${LIBRARY_NAME}Python ${DEPENDENCIES}) - IF(MITK_WRAP_NEEDS_DEPEND) - FOREACH(lib ${DEPEND_LIBRARY}) - ADD_DEPENDENCIES(_${LIBRARY_NAME}Python _${lib}Python) - ENDFOREACH(lib) - ENDIF(MITK_WRAP_NEEDS_DEPEND) - IF(MITK_LIBRARY_PROPERTIES) - SET_TARGET_PROPERTIES( _${LIBRARY_NAME}Python PROPERTIES PREFIX "" ${MITK_LIBRARY_PROPERTIES}) - ELSE(MITK_LIBRARY_PROPERTIES) - SET_TARGET_PROPERTIES( _${LIBRARY_NAME}Python PROPERTIES PREFIX "") - ENDIF(MITK_LIBRARY_PROPERTIES) + if(MITK_WRAP_NEEDS_DEPEND) + foreach(lib ${DEPEND_LIBRARY}) + add_dependencies(_${LIBRARY_NAME}Python _${lib}Python) + endforeach(lib) + endif(MITK_WRAP_NEEDS_DEPEND) + if(MITK_LIBRARY_PROPERTIES) + set_target_properties( _${LIBRARY_NAME}Python PROPERTIES PREFIX "" ${MITK_LIBRARY_PROPERTIES}) + else(MITK_LIBRARY_PROPERTIES) + set_target_properties( _${LIBRARY_NAME}Python PROPERTIES PREFIX "") + endif(MITK_LIBRARY_PROPERTIES) # Python extension modules on Windows must have the extension ".pyd" # instead of ".dll" as of Python 2.5. Older python versions do support # this suffix. - IF(WIN32 AND NOT CYGWIN) - SET_TARGET_PROPERTIES(_${LIBRARY_NAME}Python PROPERTIES DEBUG_POSTFIX "_d" SUFFIX ".pyd") - ENDIF(WIN32 AND NOT CYGWIN) - - IF(PYTHON_DEBUG_LIBRARY) - TARGET_LINK_LIBRARIES(_${LIBRARY_NAME}Python ${DEPENDENCIES} ${EXTRA_LIBS} SwigRuntimePython debug ${PYTHON_DEBUG_LIBRARY} optimized ${PYTHON_LIBRARY}) - ELSE(PYTHON_DEBUG_LIBRARY) - TARGET_LINK_LIBRARIES(_${LIBRARY_NAME}Python ${DEPENDENCIES} ${EXTRA_LIBS} SwigRuntimePython ${PYTHON_LIBRARY}) - ENDIF(PYTHON_DEBUG_LIBRARY) - IF(MITK_INSTALL_LIBRARY_DIR) - INSTALL(TARGETS _${LIBRARY_NAME}Python + if(WIN32 AND NOT CYGWIN) + set_target_properties(_${LIBRARY_NAME}Python PROPERTIES DEBUG_POSTFIX "_d" SUFFIX ".pyd") + endif(WIN32 AND NOT CYGWIN) + + if(PYTHON_DEBUG_LIBRARY) + target_link_libraries(_${LIBRARY_NAME}Python ${DEPENDENCIES} ${EXTRA_LIBS} SwigRuntimePython debug ${PYTHON_DEBUG_LIBRARY} optimized ${PYTHON_LIBRARY}) + else(PYTHON_DEBUG_LIBRARY) + target_link_libraries(_${LIBRARY_NAME}Python ${DEPENDENCIES} ${EXTRA_LIBS} SwigRuntimePython ${PYTHON_LIBRARY}) + endif(PYTHON_DEBUG_LIBRARY) + if(MITK_INSTALL_LIBRARY_DIR) + install(TARGETS _${LIBRARY_NAME}Python RUNTIME DESTINATION ${MITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries LIBRARY DESTINATION ${MITK_INSTALL_LIBRARY_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${MITK_INSTALL_LIBRARY_DIR} COMPONENT Development) - ENDIF(MITK_INSTALL_LIBRARY_DIR) - IF(MITK_SWIG_FILE) - ADD_CUSTOM_COMMAND( + endif(MITK_INSTALL_LIBRARY_DIR) + if(MITK_SWIG_FILE) + add_custom_command( COMMENT "run native swig on ${MITK_SWIG_FILE}" SOURCE ${MITK_SWIG_FILE} COMMAND ${CSWIG} ARGS -nocable -noruntime ${IGNORE_WARNINGS} -o ${WRAP_FILE} -outdir "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}" -python -c++ ${MITK_SWIG_FILE} TARGET _${LIBRARY_NAME}Python OUTPUTS ${WRAP_FILE} DEPENDS ${MITK_SWIG_FILE} ${CSWIG}) - ENDIF(MITK_SWIG_FILE) - ENDIF(MITK_USE_Python) + endif(MITK_SWIG_FILE) + endif(MITK_USE_Python) - CONFIGURE_FILE( + configure_file( ${MITK_CSWIG_SOURCE_DIR}/Master.mdx.in ${MITK_CSWIG_BINARY_DIR}/${DIRECTORY}/${LIBRARY_NAME}.mdx IMMEDIATE ) - SET(SWIG_INC_FILE ${MITK_CSWIG_BINARY_DIR}/${DIRECTORY}/SwigInc.txt) - SET(SWIG_INC_CONTENTS) - SET(SWIG_INC ${ALL_INCLUDE_DIRECTORIES}) - FOREACH(dir ${SWIG_INC}) - SET(SWIG_INC_CONTENTS "${SWIG_INC_CONTENTS}-I${dir}\n") - ENDFOREACH(dir) - CONFIGURE_FILE(${MITK_CSWIG_SOURCE_DIR}/SwigInc.txt.in ${SWIG_INC_FILE} + set(SWIG_INC_FILE ${MITK_CSWIG_BINARY_DIR}/${DIRECTORY}/SwigInc.txt) + set(SWIG_INC_CONTENTS) + set(SWIG_INC ${ALL_INCLUDE_DIRECTORIES}) + foreach(dir ${SWIG_INC}) + set(SWIG_INC_CONTENTS "${SWIG_INC_CONTENTS}-I${dir}\n") + endforeach(dir) + configure_file(${MITK_CSWIG_SOURCE_DIR}/SwigInc.txt.in ${SWIG_INC_FILE} @ONLY IMMEDIATE) - FOREACH(Source ${WRAP_SOURCES}) + foreach(Source ${WRAP_SOURCES}) - IF(MITK_USE_Python) + if(MITK_USE_Python) # python WRAP_PYTHON_SOURCES(${MITK_CSWIG_SOURCE_DIR}/${DIRECTORY} ${MITK_CSWIG_BINARY_DIR}/${DIRECTORY} ${Source} _${LIBRARY_NAME}Python "${MASTER_INDEX_FILES}" "${ALL_IDX_FILES}") - ENDIF(MITK_USE_Python) + endif(MITK_USE_Python) - ENDFOREACH(Source) + endforeach(Source) # wrap the package files for python - IF(MITK_USE_Python) + if(MITK_USE_Python) # python WRAP_PYTHON_SOURCES(${MITK_CSWIG_SOURCE_DIR}/${DIRECTORY} ${MITK_CSWIG_BINARY_DIR}/${DIRECTORY} wrap_${LIBRARY_NAME}Python _${LIBRARY_NAME}Python "${MASTER_INDEX_FILES}" "${ALL_IDX_FILES}") - IF(MITK_EXTRA_PYTHON_WRAP) - FOREACH( extraPython ${MITK_EXTRA_PYTHON_WRAP}) + if(MITK_EXTRA_PYTHON_WRAP) + foreach( extraPython ${MITK_EXTRA_PYTHON_WRAP}) WRAP_PYTHON_SOURCES(${MITK_CSWIG_SOURCE_DIR}/${DIRECTORY} ${MITK_CSWIG_BINARY_DIR}/${DIRECTORY} ${extraPython} _${LIBRARY_NAME}Python "${MASTER_INDEX_FILES}" "${ALL_IDX_FILES}") - ENDFOREACH( extraPython ) - ENDIF(MITK_EXTRA_PYTHON_WRAP) + endforeach( extraPython ) + endif(MITK_EXTRA_PYTHON_WRAP) - ENDIF(MITK_USE_Python) + endif(MITK_USE_Python) -ENDMACRO(MITK_WRAP_LIBRARY) +endmacro(MITK_WRAP_LIBRARY) diff --git a/Wrapping/CSwig/Core/CMakeLists.txt b/Wrapping/CSwig/Core/CMakeLists.txt index 53e314bb74..5d5225680d 100644 --- a/Wrapping/CSwig/Core/CMakeLists.txt +++ b/Wrapping/CSwig/Core/CMakeLists.txt @@ -1,12 +1,12 @@ # create the mitkCorePython libraries -INCLUDE(wrapSources.cmake) +include(wrapSources.cmake) -SET(MASTER_INDEX_FILES "${CMAKE_CURRENT_BINARY_DIR}/Mitk.mdx" +set(MASTER_INDEX_FILES "${CMAKE_CURRENT_BINARY_DIR}/Mitk.mdx" ) -SET(mitkCorePythonDependencies Mitk debug vtkCommonPythonD optimized vtkCommonPython) +set(mitkCorePythonDependencies Mitk debug vtkCommonPythonD optimized vtkCommonPython) MITK_WRAP_LIBRARY("${WRAP_SOURCES_TEST}" Mitk Core "" "" "${mitkCorePythonDependencies}") diff --git a/Wrapping/CSwig/Core/wrapSources.cmake b/Wrapping/CSwig/Core/wrapSources.cmake index ee4ad89f28..88e9b904c8 100644 --- a/Wrapping/CSwig/Core/wrapSources.cmake +++ b/Wrapping/CSwig/Core/wrapSources.cmake @@ -1,247 +1,247 @@ # create the mitkControllers libraries -SET(WRAP_SOURCES_TEST +set(WRAP_SOURCES_TEST #Algorithms: #wrap_itkImportMitkImageContainer //Template: can be wrapped; TODO: instantiate the needed templates #wrap_itkLocalVariationImageFilter //Template: can be wrapped; TODO: instantiate the needed templates #wrap_itkMITKScalarImageToHistogramGenerator //Template: can be wrapped; TODO: instantiate the needed templates #wrap_itkTotalVariationDenoisingImageFilter //Template: can be wrapped; TODO: instantiate the needed templates #wrap_itkTotalVariationSingleIterationImageFilter //Template: can be wrapped; TODO: instantiate the needed templates wrap_mitkBaseDataSource wrap_mitkBaseProcess wrap_mitkCoreObjectFactory wrap_mitkCoreObjectFactoryBase wrap_mitkDataNodeFactory wrap_mitkDataNodeSource wrap_mitkGeometry2DDataToSurfaceFilter wrap_mitkHistogramGenerator #wrap_mitkImageAccessByItk //Template: can be wrapped; TODO: instantiate the needed templates #wrap_mitkImageCast //Template: can be wrapped; TODO: instantiate the needed templates #wrap_mitkImageCastPart1 //Template: can be wrapped; TODO: instantiate the needed templates #wrap_mitkImageCastPart2 //Template: can be wrapped; TODO: instantiate the needed templates #wrap_mitkImageCastPart3 //Template: can be wrapped; TODO: instantiate the needed templates #wrap_mitkImageCastPart4 //Template: can be wrapped; TODO: instantiate the needed templates wrap_mitkImageChannelSelector wrap_mitkImageSliceSelector wrap_mitkImageSource wrap_mitkImageTimeSelector wrap_mitkImageToImageFilter wrap_mitkImageToItk #wrap_mitkInstantiateAccessFunctions // Macros wrap_mitkITKImageImport wrap_mitkPointSetSource wrap_mitkRGBToRGBACastImageFilter wrap_mitkSubImageSelector wrap_mitkSurfaceSource wrap_mitkSurfaceToSurfaceFilter wrap_mitkUIDGenerator wrap_mitkVolumeCalculator #Controllers: wrap_mitkBaseController wrap_mitkCallbackFromGUIThread wrap_mitkCameraController wrap_mitkCameraRotationController wrap_mitkFocusManager wrap_mitkLimitedLinearUndo wrap_mitkOperationEvent wrap_mitkProgressBar wrap_mitkProgressBarImplementation wrap_mitkReferenceCountWatcher wrap_mitkRenderingManager wrap_mitkRenderingManagerFactory wrap_mitkSliceNavigationController wrap_mitkSlicesCoordinator wrap_mitkSlicesRotator wrap_mitkSlicesSwiveller wrap_mitkStatusBar wrap_mitkStatusBarImplementation wrap_mitkStepper #wrap_mitkTestingMacros //Macros wrap_mitkTestManager wrap_mitkUndoController wrap_mitkUndoModel wrap_mitkVerboseLimitedLinearUndo wrap_mitkVtkInteractorCameraController wrap_mitkVtkLayerController #DataManagement: #wrap_itkVtkAbstractTransform //Template: can be wrapped; TODO: instantiate the needed templates wrap_mitkAbstractTransformGeometry wrap_mitkAnnotationProperty wrap_mitkApplicationCursor wrap_mitkBaseData wrap_mitkBaseDataTestImplementation wrap_mitkBaseProperty wrap_mitkClippingProperty wrap_mitkColorProperty #wrap_mitkCommon //Macros wrap_mitkDataNode wrap_mitkDataStorage wrap_mitkDisplayGeometry wrap_mitkEnumerationProperty wrap_mitkGenericLookupTable #wrap_mitkGenericProperty //Template: can be wrapped; TODO: instantiate the needed templates wrap_mitkGeometry2D wrap_mitkGeometry2DData wrap_mitkGeometry3D wrap_mitkGeometryData wrap_mitkGroupTagProperty wrap_mitkImage wrap_mitkImageDataItem #wrap_mitkItkMatrixHack //Template: can be wrapped; TODO: instantiate the needed templates wrap_mitkLandmarkBasedCurvedGeometry wrap_mitkLandmarkProjector wrap_mitkLandmarkProjectorBasedCurvedGeometry wrap_mitkLevelWindow wrap_mitkLevelWindowManager wrap_mitkLevelWindowPreset wrap_mitkLevelWindowProperty #wrap_mitkLine //Template: can be wrapped; TODO: instantiate the needed templates wrap_mitkLookupTable wrap_mitkLookupTables wrap_mitkMaterial #wrap_mitkMatrixConvert //Template: can be wrapped; TODO: instantiate the needed templates wrap_mitkMemoryUtilities wrap_mitkModalityProperty wrap_mitkModeOperation wrap_mitkNodePredicateAND wrap_mitkNodePredicateBase wrap_mitkNodePredicateCompositeBase wrap_mitkNodePredicateData wrap_mitkNodePredicateDataType wrap_mitkNodePredicateDimension wrap_mitkNodePredicateFirstLevel wrap_mitkNodePredicateNOT wrap_mitkNodePredicateOR wrap_mitkNodePredicateProperty wrap_mitkNodePredicateSource wrap_mitkPlaneOrientationProperty wrap_mitkPlaneGeometry wrap_mitkPlaneOperation wrap_mitkPointOperation wrap_mitkPointSet wrap_mitkProperties wrap_mitkPropertyList wrap_mitkResliceMethodProperty wrap_mitkRotationOperation wrap_mitkShaderProperty wrap_mitkSlicedData wrap_mitkSlicedGeometry3D wrap_mitkSmartPointerProperty wrap_mitkStandaloneDataStorage wrap_mitkStateTransitionOperation wrap_mitkStringProperty wrap_mitkSurface wrap_mitkSurfaceOperation wrap_mitkThinPlateSplineCurvedGeometry wrap_mitkTimeSlicedGeometry wrap_mitkTransferFunction wrap_mitkTransferFunctionProperty #wrap_mitkVector //Template: can be wrapped; TODO: instantiate the needed templates wrap_mitkVtkInterpolationProperty wrap_mitkVtkRepresentationProperty wrap_mitkVtkResliceInterpolationProperty wrap_mitkVtkScalarModeProperty wrap_mitkVtkVolumeRenderingProperty #wrap_mitkWeakPointer //Template: can be wrapped; TODO: instantiate the needed templates wrap_mitkWeakPointerProperty #Interactions: wrap_mitkAction wrap_mitkAffineInteractor wrap_mitkCoordinateSupplier wrap_mitkDisplayCoordinateOperation wrap_mitkDisplayInteractor wrap_mitkDisplayPositionEvent wrap_mitkDisplayVectorInteractor wrap_mitkEvent wrap_mitkEventDescription wrap_mitkEventMapper wrap_mitkGlobalInteraction wrap_mitkInteractor wrap_mitkKeyEvent #wrap_mitkMessage //Macros;Templates: can be wrapped; TODO: instantiate the needed templates wrap_mitkMouseMovePointSetInteractor wrap_mitkPointSetInteractor wrap_mitkPositionEvent wrap_mitkPositionTracker wrap_mitkState wrap_mitkStateEvent wrap_mitkStateMachine wrap_mitkStateMachineFactory wrap_mitkTransition wrap_mitkWheelEvent #IO: wrap_mitkBaseDataIOFactory wrap_mitkDicomSeriesReader wrap_mitkFileReader wrap_mitkFileSeriesReader wrap_mitkFileWriter wrap_mitkFileWriterWithInformation wrap_mitkImageWriter wrap_mitkImageWriterFactory #wrap_mitkIOAdapter //Template: can be wrapped; TODO: instantiate the needed templates wrap_mitkItkImageFileIOFactory wrap_mitkItkImageFileReader #wrap_mitkItkPictureWrite //Template: can be wrapped; TODO: instantiate the needed templates wrap_mitkLog wrap_mitkLookupTableProperty wrap_mitkOperation wrap_mitkOperationActor wrap_mitkPicFileIOFactory wrap_mitkPicFileReader wrap_mitkPicFileWriter wrap_mitkPicHelper wrap_mitkPicVolumeTimeSeriesIOFactory wrap_mitkPicVolumeTimeSeriesReader wrap_mitkPixelType wrap_mitkPointSetIOFactory wrap_mitkPointSetReader wrap_mitkPointSetWriter wrap_mitkPointSetWriterFactory #wrap_mitkRawImageFileReader // need to be modified; wrapper class tries to convert from 'std::string' to 'char *' wrap_mitkStandardFileLocations wrap_mitkSTLFileIOFactory wrap_mitkSTLFileReader #wrap_mitkSurfaceVtkWriter //Template: can be wrapped; TODO: instantiate the needed templates wrap_mitkSurfaceVtkWriterFactory wrap_mitkVtiFileIOFactory wrap_mitkVtiFileReader wrap_mitkVtkImageIOFactory wrap_mitkVtkImageReader wrap_mitkVtkSurfaceIOFactory wrap_mitkVtkSurfaceReader wrap_vtkPointSetXMLParser #Rendering: #wrap_mitkBaseRenderer //leads to a crash of cswig; after bug fixed in cswig -> circular import error wrap_mitkVtkMapper2D wrap_mitkVtkMapper3D wrap_mitkGeometry2DDataMapper2D wrap_mitkGeometry2DDataVtkMapper3D wrap_mitkGLMapper2D wrap_mitkGradientBackground wrap_mitkImageMapperGL2D wrap_mitkMapper wrap_mitkMapper2D wrap_mitkMapper3D wrap_mitkPointSetGLMapper2D wrap_mitkPointSetVtkMapper3D wrap_mitkPolyDataGLMapper2D wrap_mitkShaderRepository wrap_mitkSurfaceGLMapper2D wrap_mitkSurfaceVtkMapper3D wrap_mitkVolumeDataVtkMapper3D wrap_mitkVtkPropRenderer wrap_mitkVtkWidgetRendering wrap_vtkMitkRectangleProp wrap_vtkMitkRenderProp wrap_vtkMitkThickSlicesFilter wrap_mitkManufacturerLogo wrap_mitkCommonSuperclasses wrap_mitkImageCaster #wrap_qmitkFunctionality ) diff --git a/Wrapping/CSwig/PythonMITKModules.cmake b/Wrapping/CSwig/PythonMITKModules.cmake index e1b0893f0e..a4f3e34cd5 100644 --- a/Wrapping/CSwig/PythonMITKModules.cmake +++ b/Wrapping/CSwig/PythonMITKModules.cmake @@ -1,3 +1,3 @@ -SET(MITK_PYTHON_MODULES_DIRS Core) +set(MITK_PYTHON_MODULES_DIRS Core) -SUBDIRS(${MITK_PYTHON_MODULES_DIRS}) \ No newline at end of file +subdirs(${MITK_PYTHON_MODULES_DIRS}) \ No newline at end of file diff --git a/Wrapping/CSwig/SwigRuntime/CMakeLists.txt b/Wrapping/CSwig/SwigRuntime/CMakeLists.txt index e2cf8acee5..20bff587db 100644 --- a/Wrapping/CSwig/SwigRuntime/CMakeLists.txt +++ b/Wrapping/CSwig/SwigRuntime/CMakeLists.txt @@ -1,46 +1,46 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -MACRO(CREATE_SWIG_RUNTIME lang_option lang_postfix lang_link_libs) - SET(source_file "${CMAKE_CURRENT_BINARY_DIR}/swigrun${lang_postfix}.cxx") - SET(lib_name "SwigRuntime${lang_postfix}") +macro(CREATE_SWIG_RUNTIME lang_option lang_postfix lang_link_libs) + set(source_file "${CMAKE_CURRENT_BINARY_DIR}/swigrun${lang_postfix}.cxx") + set(lib_name "SwigRuntime${lang_postfix}") - ADD_LIBRARY(${lib_name} SHARED "${source_file}") - TARGET_LINK_LIBRARIES(${lib_name} ${lang_link_libs}) + add_library(${lib_name} SHARED "${source_file}") + target_link_libraries(${lib_name} ${lang_link_libs}) # work around linkage problem on some solaris systems - IF(CMAKE_SYSTEM MATCHES "SunOS-." AND CMAKE_COMPILER_IS_GNUCXX AND CMAKE_COMPILER_IS_GNUCC) - TARGET_LINK_LIBRARIES(${lib_name} stdc++) - ENDIF(CMAKE_SYSTEM MATCHES "SunOS-." AND CMAKE_COMPILER_IS_GNUCXX AND CMAKE_COMPILER_IS_GNUCC) + if(CMAKE_SYSTEM MATCHES "SunOS-." AND CMAKE_COMPILER_IS_GNUCXX AND CMAKE_COMPILER_IS_GNUCC) + target_link_libraries(${lib_name} stdc++) + endif(CMAKE_SYSTEM MATCHES "SunOS-." AND CMAKE_COMPILER_IS_GNUCXX AND CMAKE_COMPILER_IS_GNUCC) - INSTALL_TARGETS("${WRAP_ITK_INSTALL_PREFIX}/lib" ${lib_name}) - SET_TARGET_PROPERTIES(${lib_name} PROPERTIES LINK_FLAGS "${CSWIG_EXTRA_LINKFLAGS}") + install_targets("${WRAP_ITK_INSTALL_PREFIX}/lib" ${lib_name}) + set_target_properties(${lib_name} PROPERTIES LINK_FLAGS "${CSWIG_EXTRA_LINKFLAGS}") - ADD_CUSTOM_COMMAND( + add_custom_command( SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/swigrun.h COMMAND ${GCCXML} ARGS -fxml-start=_cable_ -DCABLE_CONFIGURATION ${CMAKE_CURRENT_SOURCE_DIR}/swigrun.h -fxml=${CMAKE_CURRENT_BINARY_DIR}/swigrun.xml TARGET ${lib_name} OUTPUTS ${CMAKE_CURRENT_BINARY_DIR}/swigrun.xml DEPENDS ${GCCXML}) - ADD_CUSTOM_COMMAND( + add_custom_command( SOURCE ${CMAKE_CURRENT_BINARY_DIR}/swigrun.xml COMMAND ${CSWIG} ARGS -o "${source_file}" ${lang_option} -c++ ${CMAKE_CURRENT_BINARY_DIR}/swigrun.xml TARGET ${lib_name} OUTPUTS "${source_file}" DEPENDS ${CSWIG}) -ENDMACRO(CREATE_SWIG_RUNTIME) +endmacro(CREATE_SWIG_RUNTIME) -IF(MITK_USE_Python) - SET(PYLIBS ${PYTHON_LIBRARY}) - IF(PYTHON_DEBUG_LIBRARY) - SET(PYLIBS debug ${PYTHON_DEBUG_LIBRARY} optimized ${PYTHON_LIBRARY}) - ENDIF() +if(MITK_USE_Python) + set(PYLIBS ${PYTHON_LIBRARY}) + if(PYTHON_DEBUG_LIBRARY) + set(PYLIBS debug ${PYTHON_DEBUG_LIBRARY} optimized ${PYTHON_LIBRARY}) + endif() #message(warning "PYLIBS: ${PYLIBS}") CREATE_SWIG_RUNTIME(-python Python "${PYLIBS}") -ENDIF(MITK_USE_Python) +endif(MITK_USE_Python) diff --git a/Wrapping/CSwig/wrapCore.cmake b/Wrapping/CSwig/wrapCore.cmake index d09893e98f..fd32e84c4f 100644 --- a/Wrapping/CSwig/wrapCore.cmake +++ b/Wrapping/CSwig/wrapCore.cmake @@ -1,15 +1,15 @@ # create the mitkCorePython libraries -INCLUDE(Controllers/wrapSources.cmake) -SET(WRAP_SOURCES_TEST +include(Controllers/wrapSources.cmake) +set(WRAP_SOURCES_TEST ${WRAP_SOURCES_TEST} wrap_mitkCorePython) -SET(MASTER_INDEX_FILES "${CMAKE_CURRENT_BINARY_DIR}/Mitk.mdx" +set(MASTER_INDEX_FILES "${CMAKE_CURRENT_BINARY_DIR}/Mitk.mdx" ) -FOREACH(source ${WRAP_SOURCES_TEST}) +foreach(source ${WRAP_SOURCES_TEST}) message("${source}") -ENDFOREACH(source) +endforeach(source) MITK_WRAP_LIBRARY("${WRAP_SOURCES_TEST}" Mitk Core "" "" Mitk) diff --git a/Wrapping/mitkWrapMacros.cmake b/Wrapping/mitkWrapMacros.cmake index 05f59503e2..ce3e132846 100644 --- a/Wrapping/mitkWrapMacros.cmake +++ b/Wrapping/mitkWrapMacros.cmake @@ -1,18 +1,18 @@ -MACRO(MITK_WRAP_OBJECT HEADERFILES CLASSNAME WRAPPERNAME DIRECTORY) -FILE(WRITE ${DIRECTORY}/wrap_${CLASSNAME}.cxx "#include "mitkCSwigMacros.h"\n") -FOREACH(f ${HEADERFILES}) - FILE(APPEND ${DIRECTORY}/wrap_${CLASSNAME}.cxx "#include "${f}"\n") -ENDFOREACH() -FILE(APPEND ${DIRECTORY}/wrap_${CLASSNAME}.cxx "#ifdef CABLE_CONFIGURATION +macro(MITK_WRAP_OBJECT HEADERFILES CLASSNAME WRAPPERNAME DIRECTORY) +file(WRITE ${DIRECTORY}/wrap_${CLASSNAME}.cxx "#include "mitkCSwigMacros.h"\n") +foreach(f ${HEADERFILES}) + file(APPEND ${DIRECTORY}/wrap_${CLASSNAME}.cxx "#include "${f}"\n") +endforeach() +file(APPEND ${DIRECTORY}/wrap_${CLASSNAME}.cxx "#ifdef CABLE_CONFIGURATION namespace _cable_ { const char* const group="${CLASSNAME}"; namespace wrappers { MITK_WRAP_OBJECT(${CLASSNAME}) } } #endif") -ENDMACRO() +endmacro() diff --git a/Wrapping/mitkWrapSetup.cmake b/Wrapping/mitkWrapSetup.cmake index de353a167d..9326c3151d 100644 --- a/Wrapping/mitkWrapSetup.cmake +++ b/Wrapping/mitkWrapSetup.cmake @@ -1,44 +1,44 @@ #----------------------------------------------------------------------------- # wrapper config -OPTION(MITK_USE_Python "Build cswig Python wrapper support (requires CableSwig)." OFF) +option(MITK_USE_Python "Build cswig Python wrapper support (requires CableSwig)." OFF) #----------------------------------------------------------------------------- # Do we need CableSwig? -SET(MITK_NEED_CableSwig 0) +set(MITK_NEED_CableSwig 0) -IF(MITK_USE_Python) - SET(MITK_NEED_CableSwig 1) -ENDIF(MITK_USE_Python) +if(MITK_USE_Python) + set(MITK_NEED_CableSwig 1) +endif(MITK_USE_Python) -IF(MITK_NEED_CableSwig) +if(MITK_NEED_CableSwig) - IF(NOT BUILD_SHARED_LIBS) - MESSAGE(FATAL_ERROR "Wrapping requires a shared build, change BUILD_SHARED_LIBS to ON") - ENDIF(NOT BUILD_SHARED_LIBS) + if(NOT BUILD_SHARED_LIBS) + message(FATAL_ERROR "Wrapping requires a shared build, change BUILD_SHARED_LIBS to ON") + endif(NOT BUILD_SHARED_LIBS) # Search first if CableSwig is in the MITK source tree - IF(EXISTS ${MITK_SOURCE_DIR}/Utilities/CableSwig) - SET(CMAKE_MODULE_PATH ${MITK_SOURCE_DIR}/Utilities/CableSwig/SWIG/CMake) + if(EXISTS ${MITK_SOURCE_DIR}/Utilities/CableSwig) + set(CMAKE_MODULE_PATH ${MITK_SOURCE_DIR}/Utilities/CableSwig/SWIG/CMake) # CableSwig is included in the source distribution. - SET(MITK_BUILD_CABLESWIG 1) - SET(CableSwig_DIR ${MITK_BINARY_DIR}/Utilities/CableSwig CACHE PATH "CableSwig_DIR: The directory containing CableSwigConfig.cmake.") - SET(CableSwig_FOUND 1) - SET(CableSwig_INSTALL_ROOT ${MITK_INSTALL_LIB_DIR}/CSwig) - INCLUDE(${CableSwig_DIR}/CableSwigConfig.cmake OPTIONAL) - SUBDIRS(Utilities/CableSwig) - ELSE(EXISTS ${MITK_SOURCE_DIR}/Utilities/CableSwig) + set(MITK_BUILD_CABLESWIG 1) + set(CableSwig_DIR ${MITK_BINARY_DIR}/Utilities/CableSwig CACHE PATH "CableSwig_DIR: The directory containing CableSwigConfig.cmake.") + set(CableSwig_FOUND 1) + set(CableSwig_INSTALL_ROOT ${MITK_INSTALL_LIB_DIR}/CSwig) + include(${CableSwig_DIR}/CableSwigConfig.cmake OPTIONAL) + subdirs(Utilities/CableSwig) + else(EXISTS ${MITK_SOURCE_DIR}/Utilities/CableSwig) # If CableSwig is not in the source tree, # then try to find a binary build of CableSwig - FIND_PACKAGE(CableSwig) - SET(CMAKE_MODULE_PATH ${CableSwig_DIR}/SWIG/CMake) - ENDIF(EXISTS ${MITK_SOURCE_DIR}/Utilities/CableSwig) + find_package(CableSwig) + set(CMAKE_MODULE_PATH ${CableSwig_DIR}/SWIG/CMake) + endif(EXISTS ${MITK_SOURCE_DIR}/Utilities/CableSwig) - IF(NOT CableSwig_FOUND) + if(NOT CableSwig_FOUND) # We have not found CableSwig. Complain. - MESSAGE(FATAL_ERROR "CableSwig is required for CSwig Wrapping.") - ENDIF(NOT CableSwig_FOUND) + message(FATAL_ERROR "CableSwig is required for CSwig Wrapping.") + endif(NOT CableSwig_FOUND) -ENDIF(MITK_NEED_CableSwig) +endif(MITK_NEED_CableSwig)