diff --git a/CMakeLists.txt b/CMakeLists.txt index 26e909d0ea..8d551e49b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,518 +1,536 @@ cmake_minimum_required(VERSION 2.8.2) project(MITK) #----------------------------------------------------------------------------- # 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) #----------------------------------------------------------------------------- include(mitkMacroEmptyExternalProject) include(mitkFunctionGenerateProjectXml) #----------------------------------------------------------------------------- # Superbuild Option - Enabled by default #----------------------------------------------------------------------------- option(MITK_USE_SUPERBUILD "Build MITK and the projects it depends on via SuperBuild.cmake." ON) #----------------------------------------------------------------------------- # 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(FATAL_ERROR "MITK_CMAKE_${type}_OUTPUT_DIRECTORY is set to a non-existing 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) else() 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) # some targets in Utilities also depend on Qt. Use this option # to decide if they should be build option(MITK_USE_QT "Use Trolltech's Qt library" ON) if(MITK_USE_QT) # find the package at the very beginning, so that QT4_FOUND is available find_package(Qt4 4.6.0 REQUIRED) endif() option(MITK_INSTALL_RPATH_RELATIVE "Use relative rpath entries for installation packages" OFF) option(MITK_BUILD_ALL_PLUGINS "Build all MITK plugins" OFF) option(MITK_BUILD_TUTORIAL "Build the MITK tutorial" ON) option(MITK_USE_Boost "Use the Boost C++ library" OFF) option(MITK_USE_GDCMIO "Use the GDCMIO class instead of ImageIO2 for DICOM" ON) option(MITK_USE_BLUEBERRY "Build the BlueBerry platform" ON) option(MITK_USE_CTK "EXEPERIMENTAL, superbuild only: Use CTK in MITK" OFF) option(MITK_USE_DCMTK "EXEPERIMENTAL, superbuild only: Use DCMTK in MITK" OFF) mark_as_advanced(MITK_INSTALL_RPATH_RELATIVE MITK_BUILD_ALL_PLUGINS MITK_USE_CTK MITK_USE_DCMTK ) #----------------------------------------------------------------------------- # 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-DTI MITK-Registration MITK-Modules # all modules not contained in a specific subproject MITK-Plugins # all plugins not contained in a specific subproject ) # Configure CTestConfigSubProject.cmake that could be used by CTest scripts configure_file(${MITK_SOURCE_DIR}/CTestConfigSubProject.cmake.in ${MITK_BINARY_DIR}/CTestConfigSubProject.cmake) # Generate Project.xml file expected by the CTest driver script mitkFunctionGenerateProjectXml(${MITK_BINARY_DIR} ${PROJECT_NAME} "${CTEST_PROJECT_SUBPROJECTS}" ${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) #----------------------------------------------------------------------------- include(mitkFunctionCheckCompilerFlags) include(mitkFunctionGetGccVersion) include(MacroParseArguments) include(mitkFunctionSuppressWarnings) # includes several functions include(mitkFunctionOrganizeSources) include(mitkFunctionGetVersion) include(mitkFunctionCreateWindowsBatchScript) include(mitkMacroCreateModuleConf) include(mitkMacroCreateModule) include(mitkMacroCheckModule) include(mitkMacroCreateModuleTests) include(mitkMacroUseModule) include(mitkMacroMultiplexPicType) include(mitkMacroInstall) include(mitkMacroInstallHelperApp) include(mitkMacroInstallTargets) include(mitkMacroGenerateToolsLibrary) #----------------------------------------------------------------------------- # Prerequesites #----------------------------------------------------------------------------- find_package(ITK REQUIRED) find_package(VTK REQUIRED) #----------------------------------------------------------------------------- # 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) #----------------------------------------------------------------------------- # Get MITK version info #----------------------------------------------------------------------------- mitkFunctionGetVersion(${MITK_SOURCE_DIR} MITK) #----------------------------------------------------------------------------- # 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 "${CMAKE_C_FLAGS} ${COVERAGE_C_FLAGS} ${ADDITIONAL_C_FLAGS}") set(MITK_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VISIBILITY_CXX_FLAGS} ${COVERAGE_CXX_FLAGS} ${ADDITIONAL_CXX_FLAGS}") if(CMAKE_COMPILER_IS_GNUCXX) set(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) 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_C_FLAGS "${cflags} ${MITK_C_FLAGS}") #set(MITK_CXX_FLAGS "${cflags} -Woverloaded-virtual -Wold-style-cast -Wstrict-null-sentinel -Wsign-promo ${MITK_CXX_FLAGS}") set(MITK_CXX_FLAGS "${cflags} -Woverloaded-virtual -Wstrict-null-sentinel ${MITK_CXX_FLAGS}") endif() #----------------------------------------------------------------------------- # MITK Modules #----------------------------------------------------------------------------- set(MITK_MODULES_CONF_DIR ${MITK_BINARY_DIR}/modulesConf CACHE INTERNAL "Modules Conf") 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() configure_file(mitkTestingConfig.h.in ${MITK_BINARY_DIR}/mitkTestingConfig.h) endif() #----------------------------------------------------------------------------- # 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 #----------------------------------------------------------------------------- add_subdirectory(Utilities) include(mitkSetupVariables) if(MITK_USE_BLUEBERRY) include(mitkSetupBlueBerry) endif() #----------------------------------------------------------------------------- # Set C/CXX Flags for MITK code #----------------------------------------------------------------------------- set(CMAKE_CXX_FLAGS ${MITK_CXX_FLAGS}) set(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}) add_custom_target(${subproject}) endif() endforeach() #----------------------------------------------------------------------------- # Add subdirectories #----------------------------------------------------------------------------- link_directories(${MITK_LINK_DIRECTORIES}) add_subdirectory(Core) if(MITK_USE_QT AND QT4_FOUND) add_subdirectory(CoreUI/Qmitk) endif() add_subdirectory(Modules) if(MITK_USE_BLUEBERRY) set(MITK_DEFAULT_SUBPROJECTS MITK-Plugins) include("${CMAKE_CURRENT_SOURCE_DIR}/CoreUI/Bundles/PluginList.cmake") set(mitk_core_plugins_fullpath ) foreach(core_plugin ${MITK_CORE_PLUGINS}) list(APPEND mitk_core_plugins_fullpath CoreUI/Bundles/${core_plugin}) endforeach() + if(BUILD_TESTING) + include(berryTestingHelpers) + + include("${CMAKE_CURRENT_SOURCE_DIR}/CoreUI/BundleTesting/PluginList.cmake") + foreach(core_test_plugin ${MITK_CORE_TEST_PLUGINS}) + list(APPEND mitk_core_plugins_fullpath CoreUI/BundleTesting/${core_test_plugin}) + endforeach() + + 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.application") + endif() + + include("${CMAKE_CURRENT_SOURCE_DIR}/Modules/Bundles/PluginList.cmake") set(mitk_ext_plugins_fullpath ) foreach(ext_plugin ${MITK_EXT_PLUGINS}) list(APPEND mitk_ext_plugins_fullpath Modules/Bundles/${ext_plugin}) endforeach() ctkMacroSetupExternalPlugins(${mitk_core_plugins_fullpath} ${mitk_ext_plugins_fullpath} BUILD_OPTION_PREFIX MITK_BUILD_ BUILD_ALL ${MITK_BUILD_ALL_PLUGINS} COMPACT_OPTIONS) set(MITK_COREAPP_PROVISIONING_FILE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/CoreApp.provisioning") FunctionCreateProvisioningInfo( OUTPUT prov_info INCLUDE "${BLUEBERRY_PLUGIN_PROVISIONING_FILE}" PLUGIN_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/plugins" PLUGINS ${mitk_core_plugins_fullpath} ) file(WRITE "${MITK_COREAPP_PROVISIONING_FILE}" "${prov_info}") set(MITK_EXTAPP_PROVISIONING_FILE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ExtApp.provisioning") FunctionCreateProvisioningInfo( OUTPUT prov_info INCLUDE "${MITK_COREAPP_PROVISIONING_FILE}" PLUGIN_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/plugins" PLUGINS ${mitk_ext_plugins_fullpath} ) file(WRITE "${MITK_EXTAPP_PROVISIONING_FILE}" "${prov_info}") set(MITK_PLUGIN_USE_FILE "${MITK_BINARY_DIR}/MitkPluginUseFile.cmake") ctkFunctionGeneratePluginUseFile(${MITK_PLUGIN_USE_FILE}) # Used in the export command further below GetMyTargetLibraries("${CTK_PLUGIN_LIBRARIES}" MITK_PLUGIN_TARGETS) # add legacy BlueBerry bundles add_subdirectory(Modules/Bundles) endif() add_subdirectory(Applications) #----------------------------------------------------------------------------- # 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 #----------------------------------------------------------------------------- if(MITK_INSTALL_RPATH_RELATIVE) set(CMAKE_INSTALL_RPATH ".") else() set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/bin") endif() # 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 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) set(enabled_plugins ${BLUEBERRY_PLUGIN_TARGETS} ${MITK_PLUGIN_TARGETS} ${MITK_MODULES_ENABLED_PLUGINS} ) # 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). foreach(plugin ${enabled_plugins}) string(REPLACE "." "_" plugin_target ${plugin}) export(TARGETS ${plugin_target} APPEND FILE ${MITK_EXPORTS_FILE}) endforeach() 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) configure_file(mitkConfig.h.in ${MITK_BINARY_DIR}/mitkConfig.h) configure_file(MITKConfig.cmake.in ${MITK_BINARY_DIR}/MITKConfig.cmake @ONLY) diff --git a/CoreUI/BundleTesting/CMakeLists.txt b/CoreUI/BundleTesting/CMakeLists.txt deleted file mode 100644 index 583e57c265..0000000000 --- a/CoreUI/BundleTesting/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -IF(MITK_USE_BLUEBERRY) - - IF(NOT BLUEBERRY_MFPARSER) - INCLUDE(${MITK_BINARY_DIR}/Bundles/MITKCoreBundleList.cmake) - ENDIF() - - INCLUDE(berryTestingHelpers) - - SET(BLUEBERRY_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/CoreApp") - GET_TARGET_PROPERTY(_is_macosx_bundle CoreApp MACOSX_BUNDLE) - IF(APPLE AND _is_macosx_bundle) - SET(BLUEBERRY_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/CoreApp.app/Contents/MacOS/CoreApp") - ENDIF() - - SET(BLUEBERRY_TEST_APP_ID "org.mitk.qt.application") - - MACRO_COLLECT_PLUGINS(OUTPUT_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/CoreBundles - CACHE_PLUGIN_SOURCE_DIRS MITK_CORE_PLUGIN_SOURCE_DIRS - CACHE_PLUGIN_OUTPUT_DIRS MITK_CORE_PLUGIN_OUTPUT_DIRS - CACHE_PLUGIN_TARGETS MITK_CORE_ENABLED_TEST_PLUGINS - CMAKE_CACHE_PREFIX "MITK" -# DEPENDS "${BLUEBERRY_PLUGINS_OUTPUT_DIR}" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/CoreBundles" - ${MITK_BUILD_ALL_PLUGINS_OPTION}) - -ENDIF(MITK_USE_BLUEBERRY) diff --git a/CoreUI/BundleTesting/PluginList.cmake b/CoreUI/BundleTesting/PluginList.cmake new file mode 100644 index 0000000000..cf83c4ddd7 --- /dev/null +++ b/CoreUI/BundleTesting/PluginList.cmake @@ -0,0 +1,3 @@ +set(MITK_CORE_TEST_PLUGINS + org.mitk.gui.qt.common.tests:ON + ) diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/CMakeLists.txt b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/CMakeLists.txt index 9be81e7896..cdbd7824f9 100644 --- a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/CMakeLists.txt +++ b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/CMakeLists.txt @@ -1,4 +1,13 @@ -MACRO_CREATE_MITK_PLUGIN(Qmitk) +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) MACRO_TEST_UIPLUGIN(${MITK_DEFAULT_SUBPROJECTS}) diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/META-INF/MANIFEST.MF b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/META-INF/MANIFEST.MF deleted file mode 100644 index aa6420a69e..0000000000 --- a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,7 +0,0 @@ -Manifest-Version: 1.0 -Bundle-Name: MITK Common GUI Qt Tests -Bundle-SymbolicName: org.mitk.gui.qt.common.tests -Bundle-Version: 0.9 -Bundle-Vendor: DKFZ, Medical and Biological Informatics -Require-Bundle: org.blueberry.uitest, org.mitk.gui.qt.common -Bundle-Activator: diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/files.cmake b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/files.cmake index 13c6f8a912..b7a94b74a1 100644 --- a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/files.cmake +++ b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/files.cmake @@ -1,30 +1,37 @@ +SET(MOC_H_FILES + src/QmitkQtCommonTestSuite.h + src/api/QmitkMockFunctionality.h + + src/internal/mitkPluginActivator.h +) + SET(SRC_CPP_FILES QmitkQtCommonTestSuite.cpp # API Tests api/QmitkFunctionalityTest.cpp api/QmitkMockFunctionality.cpp api/QmitkUiApiTestSuite.cpp ) SET(INTERNAL_CPP_FILES - + mitkPluginActivator.cpp ) -SET(CPP_FILES manifest.cpp) +SET(CPP_FILES ) SET(RESOURCE_FILES # icons/view.gif ) foreach(file ${SRC_CPP_FILES}) 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}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/manifest_headers.cmake b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/manifest_headers.cmake new file mode 100644 index 0000000000..7b73fbce22 --- /dev/null +++ b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/manifest_headers.cmake @@ -0,0 +1,6 @@ +set(Plugin-Name "MITK Common GUI Qt Tests") +set(Plugin-Version "0.9") +set(Plugin-Vendor "DKFZ, Medical and Biological Informatics") +set(Plugin-ContactAddress "http://www.mitk.org") +set(Require-Plugin org.blueberry.uitest org.mitk.gui.qt.common) + diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/QmitkQtCommonTestSuite.cpp b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/QmitkQtCommonTestSuite.cpp index 5da5de926c..8e0ebf1085 100644 --- a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/QmitkQtCommonTestSuite.cpp +++ b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/QmitkQtCommonTestSuite.cpp @@ -1,27 +1,34 @@ /*========================================================================= 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. =========================================================================*/ #include "QmitkQtCommonTestSuite.h" #include "api/QmitkUiApiTestSuite.h" +#include + QmitkQtCommonTestSuite::QmitkQtCommonTestSuite() : CppUnit::TestSuite("QmitkQtCommonTestSuite") { addTest(new QmitkUiApiTestSuite()); } +QmitkQtCommonTestSuite::QmitkQtCommonTestSuite(const QmitkQtCommonTestSuite& other) +{ + Q_UNUSED(other) + throw std::runtime_error("Copy constructor not implemented"); +} diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/QmitkQtCommonTestSuite.h b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/QmitkQtCommonTestSuite.h index 095a379170..a52864b998 100644 --- a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/QmitkQtCommonTestSuite.h +++ b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/QmitkQtCommonTestSuite.h @@ -1,31 +1,38 @@ /*========================================================================= 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. =========================================================================*/ #ifndef QMITKQTCOMMONTESTSUITE_H_ #define QMITKQTCOMMONTESTSUITE_H_ #include -class QmitkQtCommonTestSuite : public CppUnit::TestSuite -{ +#include + +Q_DECLARE_INTERFACE(CppUnit::Test, "CppUnit.Test") +class QmitkQtCommonTestSuite : public QObject, public CppUnit::TestSuite +{ + Q_OBJECT + Q_INTERFACES(CppUnit::Test) + public: QmitkQtCommonTestSuite(); + QmitkQtCommonTestSuite(const QmitkQtCommonTestSuite& other); }; #endif /* QMITKQTCOMMONTESTSUITE_H_ */ diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkMockFunctionality.cpp b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkMockFunctionality.cpp index 3d1b5e466e..27b9f271ad 100644 --- a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkMockFunctionality.cpp +++ b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkMockFunctionality.cpp @@ -1,47 +1,53 @@ /*========================================================================= 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. =========================================================================*/ #include "QmitkMockFunctionality.h" const std::string QmitkMockFunctionality::ID = "org.mitk.gui.qt.common.tests.api.MockFunctionality"; QmitkMockFunctionality::QmitkMockFunctionality() : callTrace(new berry::CallHistory()) { } +QmitkMockFunctionality::QmitkMockFunctionality(const QmitkMockFunctionality& other) +{ + Q_UNUSED(other) + throw std::runtime_error("Copy constructor not implemented"); +} + QmitkMockFunctionality::~QmitkMockFunctionality() { callTrace->Add("FunctionalityDestructor"); } berry::CallHistory::Pointer QmitkMockFunctionality::GetCallHistory() const { return callTrace; } void QmitkMockFunctionality::CreateQtPartControl(QWidget* parent) { callTrace->Add("CreateQtPartControl"); } void QmitkMockFunctionality::SetFocus() { QmitkFunctionality::SetFocus(); callTrace->Add("SetFocus"); } diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkMockFunctionality.h b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkMockFunctionality.h index 9443c497a1..e7e9856744 100644 --- a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkMockFunctionality.h +++ b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkMockFunctionality.h @@ -1,51 +1,54 @@ /*========================================================================= 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. =========================================================================*/ #ifndef QMITKMOCKFUNCTIONALITY_H_ #define QMITKMOCKFUNCTIONALITY_H_ #include #include class QmitkMockFunctionality : public QmitkFunctionality { + Q_OBJECT + public: berryObjectMacro(QmitkMockFunctionality) static const std::string ID; // = "org.mitk.gui.qt.common.tests.api.MockFunctionality"; QmitkMockFunctionality(); + QmitkMockFunctionality(const QmitkMockFunctionality& other); ~QmitkMockFunctionality(); berry::CallHistory::Pointer GetCallHistory() const; void SetFocus(); protected: void CreateQtPartControl(QWidget* parent); private: berry::CallHistory::Pointer callTrace; }; #endif /* QMITKMOCKFUNCTIONALITY_H_ */ diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/internal/mitkPluginActivator.cpp b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/internal/mitkPluginActivator.cpp new file mode 100644 index 0000000000..ad5bd9850f --- /dev/null +++ b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/internal/mitkPluginActivator.cpp @@ -0,0 +1,23 @@ +#include "mitkPluginActivator.h" + +#include + +#include "../QmitkQtCommonTestSuite.h" +#include "../api/QmitkMockFunctionality.h" + +namespace mitk { + +void PluginActivator::start(ctkPluginContext* context) +{ + BERRY_REGISTER_EXTENSION_CLASS(QmitkQtCommonTestSuite, context) + BERRY_REGISTER_EXTENSION_CLASS(QmitkMockFunctionality, context) +} + +void PluginActivator::stop(ctkPluginContext* context) +{ + Q_UNUSED(context) +} + +} + +Q_EXPORT_PLUGIN2(org_mitk_gui_qt_common.tests, mitk::PluginActivator) diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/internal/mitkPluginActivator.h b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/internal/mitkPluginActivator.h new file mode 100644 index 0000000000..a34be34be4 --- /dev/null +++ b/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/internal/mitkPluginActivator.h @@ -0,0 +1,23 @@ +#ifndef MITKPLUGINACTIVATOR_H +#define MITKPLUGINACTIVATOR_H + +#include + +namespace mitk { + +class PluginActivator : + public QObject, public ctkPluginActivator +{ + Q_OBJECT + Q_INTERFACES(ctkPluginActivator) + +public: + + void start(ctkPluginContext* context); + void stop(ctkPluginContext* context); + +}; // PluginActivator + +} + +#endif // MITKPLUGINACTIVATOR_H