Commit d92d6e98 authored by Emmanuel Promayon's avatar Emmanuel Promayon
Browse files

NEW CamiTK opensource is now "CamiTK community edition"

parent 0bad285f
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
#-------------------------------------------- #--------------------------------------------
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.0)
project(camitkopensource) project(camitkcommunityedition)
# Allow testing of the whole camitk-opensource project # Allow testing of the whole camitk-communityedition project
include(CTest) include(CTest)
enable_testing() enable_testing()
...@@ -21,14 +21,14 @@ set(CAMITK_COMMUNITY_EDITION_BUILD TRUE) ...@@ -21,14 +21,14 @@ set(CAMITK_COMMUNITY_EDITION_BUILD TRUE)
#-- This is a CEP set... #-- This is a CEP set...
set(CAMITK_EXTENSION_PROJECT_SET TRUE CACHE BOOL "Is this a CamiTK Extension Project Set?") set(CAMITK_EXTENSION_PROJECT_SET TRUE CACHE BOOL "Is this a CamiTK Extension Project Set?")
set(CAMITK_EXTENSION_PROJECT_SET_NAME "camitk-opensource" CACHE STRING "CEP Set Name") set(CAMITK_EXTENSION_PROJECT_SET_NAME "camitk-communityedition" CACHE STRING "CEP Set Name")
# Configure CamiTK Opensource packaging. # Configure CamiTK Opensource packaging.
# Must be done before parsing extensions CMakeLists.txt files. # Must be done before parsing extensions CMakeLists.txt files.
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/sdk/cmake/modules/macros ${CMAKE_CURRENT_SOURCE_DIR}/sdk/cmake/modules) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/sdk/cmake/modules/macros ${CMAKE_CURRENT_SOURCE_DIR}/sdk/cmake/modules)
set(CAMITK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(CAMITK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
include(camitk/packaging/CamiTKOpenSourcePackaging) include(camitk/packaging/CamiTKCommunityEditionPackaging)
camitk_opensource_packaging() camitk_communityedition_packaging()
# Configure include-what-you-use to check the current target # Configure include-what-you-use to check the current target
include(camitk/test/CamiTKIncludeWhatYouUse) include(camitk/test/CamiTKIncludeWhatYouUse)
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
## Then modify the CMakeLists.txt file in the root directory of your ## Then modify the CMakeLists.txt file in the root directory of your
## project to incorporate the testing dashboard. ## project to incorporate the testing dashboard.
## # The following are required to uses Dart and the Cdash dashboard ## # The following are required to uses Dart and the Cdash dashboard
set(CTEST_PROJECT_NAME "camitkopensource") set(CTEST_PROJECT_NAME "camitkcommunityedition")
set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC") set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
set(CTEST_DROP_METHOD "https") set(CTEST_DROP_METHOD "https")
set(CTEST_DROP_SITE "cdash-timc.imag.fr") set(CTEST_DROP_SITE "cdash-timc.imag.fr")
set(CTEST_DROP_LOCATION "/submit.php?project=camitk-opensource") set(CTEST_DROP_LOCATION "/submit.php?project=camitk-communityedition")
set(CTEST_DROP_SITE_CDASH TRUE) set(CTEST_DROP_SITE_CDASH TRUE)
## Disable CA certificates verification, until TIMC got valid certificate for this server ## Disable CA certificates verification, until TIMC got valid certificate for this server
...@@ -16,4 +16,4 @@ if (CTEST_DROP_METHOD STREQUAL "https") ...@@ -16,4 +16,4 @@ if (CTEST_DROP_METHOD STREQUAL "https")
"CURLOPT_SSL_VERIFYPEER_OFF" "CURLOPT_SSL_VERIFYPEER_OFF"
"CURLOPT_SSL_VERIFYHOST_OFF" "CURLOPT_SSL_VERIFYHOST_OFF"
) )
endif() endif()
\ No newline at end of file
...@@ -8,7 +8,7 @@ include(CamiTKConfig) ...@@ -8,7 +8,7 @@ include(CamiTKConfig)
camitk_extension_project(NAME "imaging" camitk_extension_project(NAME "imaging"
CONTACT "Celine.Fouard@univ-grenoble-alpes.fr,Emmanuel.Promayon@univ-grenoble-alpes.fr" CONTACT "Celine.Fouard@univ-grenoble-alpes.fr,Emmanuel.Promayon@univ-grenoble-alpes.fr"
DESCRIPTION "This CEP is part of CamiTK Open-Source. It provides action and component extensions that are useful for processing medical imaging: the dicom and itkimage components, the itk filters and itk segmentation actions. It depends on... ITK. " DESCRIPTION "This CamiTK Extension Project is part of CamiTK Community Edition. It provides action and component extensions that are useful for processing medical imaging: the dicom and itkimage components, the itk filters and itk segmentation actions. It depends on... ITK. "
) )
......
...@@ -21,5 +21,5 @@ endif() ...@@ -21,5 +21,5 @@ endif()
camitk_extension_project(NAME "modeling" camitk_extension_project(NAME "modeling"
CONTACT "Celine.Fouard@univ-grenoble-alpes.fr,Emmanuel.Promayon@univ-grenoble-alpes.fr" CONTACT "Celine.Fouard@univ-grenoble-alpes.fr,Emmanuel.Promayon@univ-grenoble-alpes.fr"
DESCRIPTION "The modeling CamiTK Extension Project contains all the action and component extensions that are useful for biomechanical processing. It provides the LML, PML and MML libraries, and the related components and actions." DESCRIPTION "This CamiTK Extension Project is part of CamiTK Community Edition. It contains all the action and component extensions that are useful for biomechanical processing. It provides the LML, PML and MML libraries, and the related components and actions."
) )
\ No newline at end of file
...@@ -26,25 +26,25 @@ endif() ...@@ -26,25 +26,25 @@ endif()
# include global install of SDK # include global install of SDK
# This is a SDK build => global install is done in CMAKE_INSTALL_PREFIX # This is a SDK build => global install is done in CMAKE_INSTALL_PREFIX
add_custom_target(camitk-sdk-global-install add_custom_target(camitk-ce-global-install
COMMAND ${CMAKE_COMMAND} -E echo "Global Installation in ${CMAKE_INSTALL_PREFIX}" COMMAND ${CMAKE_COMMAND} -E echo "Global Installation in ${CMAKE_INSTALL_PREFIX}"
# First remove the WIN32 system runtime libraries dependencies # First remove the WIN32 system runtime libraries dependencies
COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS:STRING=" " ${CMAKE_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS:STRING=" " ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E echo "Configuration for ${CMAKE_INSTALL_PREFIX} done." COMMAND ${CMAKE_COMMAND} -E echo "Configuration for ${CMAKE_INSTALL_PREFIX} done."
# Second cmake to install # Second cmake to install
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target install --config ${CMAKE_CFG_INTDIR} COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target install --config ${CMAKE_CFG_INTDIR}
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target camitk-sdk-copy-camitkdirtxt --config ${CMAKE_CFG_INTDIR} COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target camitk-ce-copy-camitkdirtxt --config ${CMAKE_CFG_INTDIR}
COMMAND ${CMAKE_COMMAND} -E echo "File installation done." COMMAND ${CMAKE_COMMAND} -E echo "File installation done."
COMMAND ${CMAKE_COMMAND} -E echo "Global installation in ${CMAKE_INSTALL_PREFIX} done." COMMAND ${CMAKE_COMMAND} -E echo "Global installation in ${CMAKE_INSTALL_PREFIX} done."
COMMENT "Global installation" COMMENT "Global installation"
) )
# The definition of SDK_TOP_LEVEL_SOURCE_DIR and SDK_TOP_LEVEL_BINARY_DIR are # The definition of SDK_TOP_LEVEL_SOURCE_DIR and SDK_TOP_LEVEL_BINARY_DIR are
# are needed to store the current source dir to pass as an argument to the ConfigureCamiTKDirTxt.cmake script in camitk-sdk-copy-camitkdirtxt # are needed to store the current source dir to pass as an argument to the ConfigureCamiTKDirTxt.cmake script in camitk-ce-copy-camitkdirtxt
set(SDK_TOP_LEVEL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(SDK_TOP_LEVEL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(SDK_TOP_LEVEL_BINARY_DIR ${CMAKE_BINARY_DIR}) set(SDK_TOP_LEVEL_BINARY_DIR ${CMAKE_BINARY_DIR})
# specific top-level target that prepare and copy the CamiTKDir.txt file in ${CAMITK_USER_DIR} # specific top-level target that prepare and copy the CamiTKDir.txt file in ${CAMITK_USER_DIR}
add_custom_target(camitk-sdk-copy-camitkdirtxt add_custom_target(camitk-ce-copy-camitkdirtxt
# prepare the CamiTKConfig.cmake for installation # prepare the CamiTKConfig.cmake for installation
COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DCAMITK_USER_DIR=${CAMITK_USER_DIR} -DCAMITK_USER_DIR=${CAMITK_USER_DIR}
...@@ -60,32 +60,32 @@ add_custom_target(camitk-sdk-copy-camitkdirtxt ...@@ -60,32 +60,32 @@ add_custom_target(camitk-sdk-copy-camitkdirtxt
COMMAND ${CMAKE_COMMAND} -E echo "CamiTKDir.txt [${CMAKE_INSTALL_PREFIX}] copied in ${CAMITK_USER_DIR}" COMMAND ${CMAKE_COMMAND} -E echo "CamiTKDir.txt [${CMAKE_INSTALL_PREFIX}] copied in ${CAMITK_USER_DIR}"
) )
# camitk-sdk-local-install == install in User Config directory # camitk-ce-local-install == install in User Config directory
add_custom_target(camitk-sdk-local-install add_custom_target(camitk-ce-local-install
COMMAND ${CMAKE_COMMAND} -E echo "Local Installation in ${CAMITK_USER_DIR}" COMMAND ${CMAKE_COMMAND} -E echo "Local Installation in ${CAMITK_USER_DIR}"
# First cmake to redefine install prefix # First cmake to redefine install prefix
COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${CAMITK_USER_DIR} ${CMAKE_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${CAMITK_USER_DIR} ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E echo "Configuration for ${CMAKE_INSTALL_PREFIX} done." COMMAND ${CMAKE_COMMAND} -E echo "Configuration for ${CMAKE_INSTALL_PREFIX} done."
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target install --config ${CMAKE_CFG_INTDIR} COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target install --config ${CMAKE_CFG_INTDIR}
COMMAND ${CMAKE_COMMAND} -E echo "File installation done." COMMAND ${CMAKE_COMMAND} -E echo "File installation done."
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target camitk-sdk-copy-camitkdirtxt --config ${CMAKE_CFG_INTDIR} COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target camitk-ce-copy-camitkdirtxt --config ${CMAKE_CFG_INTDIR}
COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} ${CMAKE_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E echo "Local Installation in ${CAMITK_USER_DIR} done." COMMAND ${CMAKE_COMMAND} -E echo "Local Installation in ${CAMITK_USER_DIR} done."
COMMENT "Local installation" COMMENT "Local installation"
) )
# camitk-sdk-update-translate == configure all the .qrc files for the different extensions of the SDK. # camitk-ce-update-translate == configure all the .qrc files for the different extensions of the SDK.
# .qrc files consider up to date .ts resources files for translation # .qrc files consider up to date .ts resources files for translation
add_custom_target(camitk-sdk-update-translate add_custom_target(camitk-ce-update-translate
COMMAND ${CMAKE_COMMAND} -E echo "Updating translation for CamiTK SDK" COMMAND ${CMAKE_COMMAND} -E echo "Updating translation for CamiTK Community Edition"
COMMAND ${CMAKE_COMMAND} -DCAMITK_TRANSLATE=TRUE ${CMAKE_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -DCAMITK_TRANSLATE=TRUE ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -DCAMITK_TRANSLATE=FALSE ${CMAKE_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -DCAMITK_TRANSLATE=FALSE ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E echo "Translation updated for CamiTK SDK" COMMAND ${CMAKE_COMMAND} -E echo "Translation updated for CamiTK Community Edition"
) )
# make sure a copy of the CamiTKDir.txt file is written to ${CAMITK_USER_DIR} # make sure a copy of the CamiTKDir.txt file is written to ${CAMITK_USER_DIR}
# even if the user is just invoking the "install" target (from the IDE or command line) # even if the user is just invoking the "install" target (from the IDE or command line)
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target camitk-sdk-copy-camitkdirtxt)") install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target camitk-ce-copy-camitkdirtxt)")
# include CamiTK auto-documentation generation # include CamiTK auto-documentation generation
include(CamiTKApiDoc) include(CamiTKApiDoc)
......
# CMake script to configure CamiTKDir.txt at installation time (executed by top-level target "camitk-sdk-copy-camitkdirtxt", see CMakeLists.txt) # CMake script to configure CamiTKDir.txt at installation time (executed by top-level target "camitk-ce-copy-camitkdirtxt", see CMakeLists.txt)
message(STATUS "Updating CamiTKDir.txt in User Config Directory [${CAMITK_USER_DIR}] to [${CMAKE_INSTALL_PREFIX}]") message(STATUS "Updating CamiTKDir.txt in User Config Directory [${CAMITK_USER_DIR}] to [${CMAKE_INSTALL_PREFIX}]")
configure_file(${SDK_TOP_LEVEL_SOURCE_DIR}/CamiTKDir.txt.in ${SDK_TOP_LEVEL_BINARY_DIR}/CamiTKDir.txt @ONLY) configure_file(${SDK_TOP_LEVEL_SOURCE_DIR}/CamiTKDir.txt.in ${SDK_TOP_LEVEL_BINARY_DIR}/CamiTKDir.txt @ONLY)
\ No newline at end of file
...@@ -14,7 +14,7 @@ set(CEP_DEFAULT_APPLICATION "camitk-imp") ...@@ -14,7 +14,7 @@ set(CEP_DEFAULT_APPLICATION "camitk-imp")
# postfix for MSVC debug version # postfix for MSVC debug version
set(CAMITK_DEBUG_POSTFIX "-debug") set(CAMITK_DEBUG_POSTFIX "-debug")
# define static version useful for package release (without any svn revision, see opensource top level CMakeLists.txt) # define static version useful for package release (without any svn revision, see communityedition top level CMakeLists.txt)
set(CAMITK_VERSION_STRING "${CAMITK_PROJECT_NAME} ${CAMITK_VERSION_MAJOR}.${CAMITK_VERSION_MINOR}.${CAMITK_VERSION_PATCH}") set(CAMITK_VERSION_STRING "${CAMITK_PROJECT_NAME} ${CAMITK_VERSION_MAJOR}.${CAMITK_VERSION_MINOR}.${CAMITK_VERSION_PATCH}")
# prepare the file for the camitk package source build # prepare the file for the camitk package source build
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libraries/core/CamiTKVersion.h.in ${CMAKE_BINARY_DIR}/CamiTKPackageVersion.h @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libraries/core/CamiTKVersion.h.in ${CMAKE_BINARY_DIR}/CamiTKPackageVersion.h @ONLY)
......
#-------------------------------------------- #--------------------------------------------
# #
# CamiTK Open Source CEP Set # test actions
# #
#-------------------------------------------- #--------------------------------------------
camitk_application( ADDITIONAL_SOURCES CommandLineOptions.cxx CommandLineOptions.hxx CommandLineOptions.ixx camitk_application( ADDITIONAL_SOURCES CommandLineOptions.cxx CommandLineOptions.hxx CommandLineOptions.ixx
......
#-------------------------------------------- #--------------------------------------------
# #
# CamiTK Open Source CEP Set # test components
# #
#-------------------------------------------- #--------------------------------------------
camitk_application( CEP_NAME SDK camitk_application( CEP_NAME SDK
......
...@@ -191,7 +191,7 @@ while (${CTEST_ELAPSED_TIME} LESS ${CONTINUOUS_BUILD_DURATION}) ...@@ -191,7 +191,7 @@ while (${CTEST_ELAPSED_TIME} LESS ${CONTINUOUS_BUILD_DURATION})
# Compute test coverage # Compute test coverage
message(STATUS "- Running test coverage...") message(STATUS "- Running test coverage...")
set(CTEST_BUILD_TARGET camitk-test-coverage) set(CTEST_BUILD_TARGET camitk-ce-test-coverage)
ctest_build() ctest_build()
if(NOT DEFINED CTEST_COVERAGE_COMMAND) if(NOT DEFINED CTEST_COVERAGE_COMMAND)
...@@ -207,7 +207,7 @@ while (${CTEST_ELAPSED_TIME} LESS ${CONTINUOUS_BUILD_DURATION}) ...@@ -207,7 +207,7 @@ while (${CTEST_ELAPSED_TIME} LESS ${CONTINUOUS_BUILD_DURATION})
ctest_submit(PARTS Coverage) ctest_submit(PARTS Coverage)
# Install locally this build version of CamiTK # Install locally this build version of CamiTK
set(CTEST_BUILD_TARGET camitk-sdk-local-install) set(CTEST_BUILD_TARGET camitk-ce-local-install)
ctest_build() ctest_build()
ctest_submit(PARTS Install) ctest_submit(PARTS Install)
......
...@@ -187,7 +187,7 @@ endforeach() ...@@ -187,7 +187,7 @@ endforeach()
# ------------------------ STEP 4: Test coverage ------------------------ # ------------------------ STEP 4: Test coverage ------------------------
message(STATUS "- Running test coverage ${subproject}...") message(STATUS "- Running test coverage ${subproject}...")
set(CTEST_BUILD_TARGET camitk-test-coverage) set(CTEST_BUILD_TARGET camitk-ce-test-coverage)
ctest_build() ctest_build()
if(NOT DEFINED CTEST_COVERAGE_COMMAND) if(NOT DEFINED CTEST_COVERAGE_COMMAND)
......
...@@ -171,7 +171,7 @@ foreach(subproject ${CAMITK_SUBPROJECTS}) ...@@ -171,7 +171,7 @@ foreach(subproject ${CAMITK_SUBPROJECTS})
endforeach() endforeach()
# build the api-doc # build the api-doc
set(CTEST_BUILD_TARGET camitk-api-doc) set(CTEST_BUILD_TARGET camitk-ce-api-doc)
ctest_build() ctest_build()
# TODO zip it and download it on the website every so often (as `develop api-doc`) # TODO zip it and download it on the website every so often (as `develop api-doc`)
...@@ -184,7 +184,7 @@ endforeach() ...@@ -184,7 +184,7 @@ endforeach()
# Compute test coverage # Compute test coverage
message(STATUS "- Running test coverage...") message(STATUS "- Running test coverage...")
set(CTEST_BUILD_TARGET camitk-test-coverage) set(CTEST_BUILD_TARGET camitk-ce-test-coverage)
ctest_build() ctest_build()
if(NOT DEFINED CTEST_COVERAGE_COMMAND) if(NOT DEFINED CTEST_COVERAGE_COMMAND)
...@@ -200,7 +200,7 @@ ctest_coverage() ...@@ -200,7 +200,7 @@ ctest_coverage()
ctest_submit(PARTS Coverage) ctest_submit(PARTS Coverage)
# Install locally this build version of CamiTK # Install locally this build version of CamiTK
set(CTEST_BUILD_TARGET camitk-sdk-local-install) set(CTEST_BUILD_TARGET camitk-ce-local-install)
ctest_build() ctest_build()
ctest_submit(PARTS Install) ctest_submit(PARTS Install)
......
...@@ -149,13 +149,13 @@ ctest_submit(PARTS Build) ...@@ -149,13 +149,13 @@ ctest_submit(PARTS Build)
set_property(GLOBAL PROPERTY SubProject package-source) set_property(GLOBAL PROPERTY SubProject package-source)
set_property(GLOBAL PROPERTY Label package-source) set_property(GLOBAL PROPERTY Label package-source)
# Package CamiTK and send the report. # Package CamiTK and send the report.
set(CTEST_BUILD_TARGET camitk-package-source) set(CTEST_BUILD_TARGET camitk-ce-package-source)
ctest_build() ctest_build()
ctest_submit(PARTS Build) ctest_submit(PARTS Build)
# Api documentation (doxygen) # Api documentation (doxygen)
set_property(GLOBAL PROPERTY SubProject camitk-api-doc) set_property(GLOBAL PROPERTY SubProject camitk-ce-api-doc)
set_property(GLOBAL PROPERTY Label camitk-api-doc) set_property(GLOBAL PROPERTY Label camitk-ce-api-doc)
# Build the documentation and send the report # Build the documentation and send the report
set(CTEST_BUILD_TARGET camitk-api-doc) set(CTEST_BUILD_TARGET camitk-ce-api-doc)
ctest_build() ctest_build()
ctest_submit(PARTS Build) ctest_submit(PARTS Build)
#------------------------------------------ #------------------------------------------
# To generate CamiTK the api documentation # To generate CamiTK the api documentation
#------------------------------------------- #-------------------------------------------
set(APIDOC_SDK FALSE CACHE BOOL "Generate API documentation for CamiTK SDK") set(APIDOC_SDK FALSE CACHE BOOL "Generate API documentation for CamiTK Community Edition")
if(APIDOC_SDK) if(APIDOC_SDK)
include(FindDoxygen) include(FindDoxygen)
if (DOXYGEN) if (DOXYGEN)
...@@ -25,12 +25,12 @@ if(APIDOC_SDK) ...@@ -25,12 +25,12 @@ if(APIDOC_SDK)
set(DOXYGEN_LANGUAGE "English" CACHE STRING "Language used by doxygen") set(DOXYGEN_LANGUAGE "English" CACHE STRING "Language used by doxygen")
mark_as_advanced(DOXYGEN_LANGUAGE) mark_as_advanced(DOXYGEN_LANGUAGE)
# define where to put the camitk-api-doc at build time # define where to put the camitk-ce-api-doc at build time
set(CAMITK_APIDOC_DIR ${CMAKE_BINARY_DIR}/share/${CAMITK_SHORT_VERSION_STRING}/apidoc) set(CAMITK_APIDOC_DIR ${CMAKE_BINARY_DIR}/share/${CAMITK_SHORT_VERSION_STRING}/apidoc)
set(DOXYGEN_OUTPUT_DIR ${CAMITK_APIDOC_DIR}) set(DOXYGEN_OUTPUT_DIR ${CAMITK_APIDOC_DIR})
message(STATUS "Generating build target 'camitk-api-doc' for CamiTK SDK documentation in ${CAMITK_APIDOC_DIR}") message(STATUS "Generating build target 'camitk-ce-api-doc' for CamiTK SDK documentation in ${CAMITK_APIDOC_DIR}")
# which directories to use # which directories to use
set(DOXYGEN_SUBDIRS) set(DOXYGEN_SUBDIRS)
...@@ -77,7 +77,7 @@ if(APIDOC_SDK) ...@@ -77,7 +77,7 @@ if(APIDOC_SDK)
# Configure CamiTKVersion.h.in to generate index.html page for API documentation # Configure CamiTKVersion.h.in to generate index.html page for API documentation
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libraries/core/CamiTKVersion.h.in ${CMAKE_CURRENT_BINARY_DIR}/core/CamiTKVersion.h @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libraries/core/CamiTKVersion.h.in ${CMAKE_CURRENT_BINARY_DIR}/core/CamiTKVersion.h @ONLY)
add_custom_target(camitk-api-doc add_custom_target(camitk-ce-api-doc
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
COMMENT "Generating CamiTK SDK API documentation using Doxygen" COMMENT "Generating CamiTK SDK API documentation using Doxygen"
VERBATIM VERBATIM
...@@ -92,7 +92,7 @@ if(APIDOC_SDK) ...@@ -92,7 +92,7 @@ if(APIDOC_SDK)
# doc installation # doc installation
install(DIRECTORY ${CAMITK_APIDOC_DIR} install(DIRECTORY ${CAMITK_APIDOC_DIR}
DESTINATION share/${CAMITK_SHORT_VERSION_STRING} DESTINATION share/${CAMITK_SHORT_VERSION_STRING}
COMPONENT camitk-api-doc COMPONENT camitk-ce-api-doc
) )
else() else()
message(WARNING "Doxygen not found - CamiTK SDK API documentation and reference manual will not be created") message(WARNING "Doxygen not found - CamiTK SDK API documentation and reference manual will not be created")
......
...@@ -32,7 +32,7 @@ include(camitk/test/CamiTKAddTestActionStateMachine) ...@@ -32,7 +32,7 @@ include(camitk/test/CamiTKAddTestActionStateMachine)
include(camitk/test/CamiTKAdditionalActionTest) include(camitk/test/CamiTKAdditionalActionTest)
# -- packaging macros # -- packaging macros
include(camitk/packaging/CamiTKOpenSourcePackaging) include(camitk/packaging/CamiTKCommunityEditionPackaging)
include(camitk/packaging/CamiTKCEPPackaging) include(camitk/packaging/CamiTKCEPPackaging)
# -- CamiTK actions / components parsing test macros # -- CamiTK actions / components parsing test macros
......
...@@ -106,7 +106,7 @@ find_program(CAMITK_CONFIG_EXECUTABLE ...@@ -106,7 +106,7 @@ find_program(CAMITK_CONFIG_EXECUTABLE
[HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild9] [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild9]
[HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild10] [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild10]
# For camitk opensource compilation # For camitk communityedition compilation
"${CMAKE_BINARY_DIR}" "${CMAKE_BINARY_DIR}"
#-- 2. installed path #-- 2. installed path
......
...@@ -124,7 +124,7 @@ mark_as_advanced( ...@@ -124,7 +124,7 @@ mark_as_advanced(
CMAKE_SHARED_LINKER_FLAGS_COVERAGE ) CMAKE_SHARED_LINKER_FLAGS_COVERAGE )
if(NOT CMAKE_BUILD_TYPE) if(NOT CMAKE_BUILD_TYPE)
# Assume the developer that is running the opensource test suite compiled everything in Debug # Assume the developer that is running the communityedition test suite compiled everything in Debug
message(WARNING "Code coverage: no CMAKE_BUILD_TYPE specified... results with an optimised (non-Debug) build may be misleading") message(WARNING "Code coverage: no CMAKE_BUILD_TYPE specified... results with an optimised (non-Debug) build may be misleading")
else() else()
# support multiplaform (sometimes the "Debug" type is all uppercase, as on Win32, sometimes it is Camelcase) # support multiplaform (sometimes the "Debug" type is all uppercase, as on Win32, sometimes it is Camelcase)
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
#! making a list and using HEADERS_TO_INSTALL parameter instead! #! making a list and using HEADERS_TO_INSTALL parameter instead!
#! \param TARGET_NAME = specify a target name different than the default (default is the action/component directory name) #! \param TARGET_NAME = specify a target name different than the default (default is the action/component directory name)
#! this can be very useful for example when you have action/component directory in your CEP that has #! this can be very useful for example when you have action/component directory in your CEP that has
#! the same name as one in the camitk opensource. #! the same name as one in the camitk communityedition.
#! \param CEP_NAME = specify the CEP_NAME, which is used to categorized the extension for packaging purpose #! \param CEP_NAME = specify the CEP_NAME, which is used to categorized the extension for packaging purpose
#! No CEP_NAME provided will result in default categorization (generic extension). #! No CEP_NAME provided will result in default categorization (generic extension).
#! \param DESCRIPTION = Simple description of the extension. Used for packaging presentation for instance. #! \param DESCRIPTION = Simple description of the extension. Used for packaging presentation for instance.
......
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
#! \param DEFAULT_APPLICATION The default application to run (for MSVC launchers), default is camitk-imp #! \param DEFAULT_APPLICATION The default application to run (for MSVC launchers), default is camitk-imp
#! \param LICENSE The name of the license for this CEP, default is LGPL-v3 #! \param LICENSE The name of the license for this CEP, default is LGPL-v3
#! \param ENABLE_TESTING Enable the testing framework ("make test" will run all the test) #! \param ENABLE_TESTING Enable the testing framework ("make test" will run all the test)
#! \param ENABLE_TEST_COVERAGE Enable the test coverage report ("make camitk-test-coverage" will run all the test and generate #! \param ENABLE_TEST_COVERAGE Enable the test coverage report ("make camitk-ce-test-coverage" will run all the test and generate
#! a report in the camitk-test-coverage subdirectory. Only works with the g++ compiler. #! a report in the camitk-ce-test-coverage subdirectory. Only works with the g++ compiler.
#! \param NEEDS_CEP (TODO) Dependencies to other CEP #! \param NEEDS_CEP (TODO) Dependencies to other CEP
#! #!
macro(camitk_extension_project) macro(camitk_extension_project)
...@@ -71,7 +71,7 @@ macro(camitk_extension_project) ...@@ -71,7 +71,7 @@ macro(camitk_extension_project)
if (${CEP_DIR_NAME}_CMAKE_ENABLE_TEST_COVERAGE) if (${CEP_DIR_NAME}_CMAKE_ENABLE_TEST_COVERAGE)
set(${CEP_DIR_NAME}_CMAKE_ENABLE_TESTING ON) set(${CEP_DIR_NAME}_CMAKE_ENABLE_TESTING ON)
# to create specific target: camitk-test-coverage # to create specific target: camitk-ce-test-coverage
option(CAMITK_TEST_COVERAGE "Code coverage" ON) option(CAMITK_TEST_COVERAGE "Code coverage" ON)
include(macros/camitk/test/CamiTKTestCoverage) include(macros/camitk/test/CamiTKTestCoverage)
endif() endif()
...@@ -123,15 +123,16 @@ macro(camitk_extension_project) ...@@ -123,15 +123,16 @@ macro(camitk_extension_project)
endif() endif()
# simply target name so that the custom target name does not contains any space # simply target name so that the custom target name does not contains any space
string(REGEX REPLACE " " "" SIMPLIFIED_CEP_NAME ${CEP_NAME}) string(REGEX REPLACE " " "" ESCAPED_PROJECT_NAME ${CEP_NAME})
string(TOLOWER "${ESCAPED_PROJECT_NAME}" SIMPLIFIED_CEP_NAME)
# if this is a single CEP, provides the installation facilities # if this is a single CEP, provides the installation facilities
# otherwise, just add include(CamiTKInstall) to get the installation facilities # otherwise, just add include(CamiTKInstall) to get the installation facilities
if (NOT CAMITK_EXTENSION_PROJECT_SET) if (NOT CAMITK_EXTENSION_PROJECT_SET)
#-- camitk-global-install == install in CAMITK_DIR #-- camitk-global-install == install in CAMITK_DIR
if (CAMITK_COMMUNITY_EDITION_BUILD) if (CAMITK_COMMUNITY_EDITION_BUILD)
# if the SDK is currently being build => install in CMAKE_INSTALL_PREFIX # if the SDK is currently being build => install in CMAKE_INSTALL_PREFIX
add_custom_target(cep-${SIMPLIFIED_CEP_NAME}-global-install add_custom_target(camitk-${SIMPLIFIED_CEP_NAME}-global-install
# Second cmake to install # Second cmake to install
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target install --config ${CMAKE_CFG_INTDIR} COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target install --config ${CMAKE_CFG_INTDIR}
COMMENT "Global Installation in ${CMAKE_INSTALL_PREFIX}" COMMENT "Global Installation in ${CMAKE_INSTALL_PREFIX}"
...@@ -139,7 +140,7 @@ macro(camitk_extension_project) ...@@ -139,7 +140,7 @@ macro(camitk_extension_project)
else() else()
# this is called from a normal CEP build => install in CAMITK_DIR # this is called from a normal CEP build => install in CAMITK_DIR
add_custom_target(cep-${SIMPLIFIED_CEP_NAME}-global-install add_custom_target(camitk-${SIMPLIFIED_CEP_NAME}-global-install
# First cmake to redefine install prefix # First cmake to redefine install prefix
COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX:PATH=${CAMITK_DIR} ${CMAKE_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX:PATH=${CAMITK_DIR} ${CMAKE_BINARY_DIR}
# Second cmake to install # Second cmake to install
...@@ -149,23 +150,30 @@ macro(camitk_extension_project) ...@@ -149,23 +150,30 @@ macro(camitk_extension_project)
endif() endif()
# camitk-local-install == install in User Config directory # camitk-local-install == install in User Config directory
add_custom_target(cep-${SIMPLIFIED_CEP_NAME}-local-install add_custom_target(camitk-${SIMPLIFIED_CEP_NAME}-local-install
# First cmake to redefine install prefix # First cmake to redefine install prefix
COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX:PATH=${CAMITK_USER_DIR} ${CMAKE_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX:PATH=${CAMITK_USER_DIR} ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target install --config ${CMAKE_CFG_INTDIR} COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target install --config ${CMAKE_CFG_INTDIR}
COMMENT "Local Installation in ${CAMITK_USER_DIR}" COMMENT "Local Installation in ${CAMITK_USER_DIR}"
) )
endif()
# Add an update-translate targete to configure all the .qrc files for the different extensions of this CEP on demand. # Add an update-translate target to configure all the .qrc files for the different extensions of this CEP on demand.
# .qrc files consider up to date .ts resources files for translation # .qrc files consider up to date .ts resources files for translation
add_custom_target(cep-${SIMPLIFIED_CEP_NAME}-update-translate add_custom_target(camitk-${SIMPLIFIED_CEP_NAME}-update-translate
COMMAND ${CMAKE_COMMAND} -E echo "Updating translation for ${CEP_NAME}" COMMAND ${CMAKE_COMMAND} -E echo "Updating translation for ${CEP_NAME}"
COMMAND ${CMAKE_COMMAND} -DCAMITK_TRANSLATE=TRUE ${CMAKE_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -DCAMITK_TRANSLATE=TRUE ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -DCAMITK_TRANSLATE=FALSE ${CMAKE_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -DCAMITK_TRANSLATE=FALSE ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E echo "Translation updated for ${CEP_NAME}" COMMAND ${CMAKE_COMMAND} -E echo "Translation updated for ${CEP_NAME}"
) COMMENT "Translation updated for ${CEP_NAME}"
)
# Add a package source target using unified names
add_custom_target(camitk-${SIMPLIFIED_CEP_NAME}-package-source
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target package_source --config ${CMAKE_CFG_INTDIR}
COMMENT "Building package source ${CEP_NAME}"
)
endif()
endif() endif()
endmacro() endmacro()