Commit d92d6e98 authored by Emmanuel Promayon's avatar Emmanuel Promayon

NEW CamiTK opensource is now "CamiTK community edition"

parent 0bad285f
......@@ -5,9 +5,9 @@
#--------------------------------------------
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)
enable_testing()
......@@ -21,14 +21,14 @@ set(CAMITK_COMMUNITY_EDITION_BUILD TRUE)
#-- 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_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.
# 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(CAMITK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
include(camitk/packaging/CamiTKOpenSourcePackaging)
camitk_opensource_packaging()
include(camitk/packaging/CamiTKCommunityEditionPackaging)
camitk_communityedition_packaging()
# Configure include-what-you-use to check the current target
include(camitk/test/CamiTKIncludeWhatYouUse)
......
......@@ -2,12 +2,12 @@
## Then modify the CMakeLists.txt file in the root directory of your
## project to incorporate the testing 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_DROP_METHOD "https")
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)
## Disable CA certificates verification, until TIMC got valid certificate for this server
......@@ -16,4 +16,4 @@ if (CTEST_DROP_METHOD STREQUAL "https")
"CURLOPT_SSL_VERIFYPEER_OFF"
"CURLOPT_SSL_VERIFYHOST_OFF"
)
endif()
\ No newline at end of file
endif()
......@@ -8,7 +8,7 @@ include(CamiTKConfig)
camitk_extension_project(NAME "imaging"
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()
camitk_extension_project(NAME "modeling"
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."
)
\ No newline at end of file
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."
)
......@@ -26,25 +26,25 @@ endif()
# include global install of SDK
# 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}"
# First remove the WIN32 system runtime libraries dependencies
COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS:STRING=" " ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E echo "Configuration for ${CMAKE_INSTALL_PREFIX} done."
# 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 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 "Global installation in ${CMAKE_INSTALL_PREFIX} done."
COMMENT "Global installation"
)
# 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_BINARY_DIR ${CMAKE_BINARY_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
COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DCAMITK_USER_DIR=${CAMITK_USER_DIR}
......@@ -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}"
)
# camitk-sdk-local-install == install in User Config directory
add_custom_target(camitk-sdk-local-install
# camitk-ce-local-install == install in User Config directory
add_custom_target(camitk-ce-local-install
COMMAND ${CMAKE_COMMAND} -E echo "Local Installation in ${CAMITK_USER_DIR}"
# First cmake to redefine install prefix
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} --build ${CMAKE_BINARY_DIR} --target install --config ${CMAKE_CFG_INTDIR}
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} -E echo "Local Installation in ${CAMITK_USER_DIR} done."
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
add_custom_target(camitk-sdk-update-translate
COMMAND ${CMAKE_COMMAND} -E echo "Updating translation for CamiTK SDK"
add_custom_target(camitk-ce-update-translate
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=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}
# 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(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}]")
configure_file(${SDK_TOP_LEVEL_SOURCE_DIR}/CamiTKDir.txt.in ${SDK_TOP_LEVEL_BINARY_DIR}/CamiTKDir.txt @ONLY)
\ No newline at end of file
configure_file(${SDK_TOP_LEVEL_SOURCE_DIR}/CamiTKDir.txt.in ${SDK_TOP_LEVEL_BINARY_DIR}/CamiTKDir.txt @ONLY)
......@@ -14,7 +14,7 @@ set(CEP_DEFAULT_APPLICATION "camitk-imp")
# postfix for MSVC debug version
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}")
# 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)
......
#--------------------------------------------
#
# CamiTK Open Source CEP Set
# test actions
#
#--------------------------------------------
camitk_application( ADDITIONAL_SOURCES CommandLineOptions.cxx CommandLineOptions.hxx CommandLineOptions.ixx
......
#--------------------------------------------
#
# CamiTK Open Source CEP Set
# test components
#
#--------------------------------------------
camitk_application( CEP_NAME SDK
......
......@@ -191,7 +191,7 @@ while (${CTEST_ELAPSED_TIME} LESS ${CONTINUOUS_BUILD_DURATION})
# Compute test coverage
message(STATUS "- Running test coverage...")
set(CTEST_BUILD_TARGET camitk-test-coverage)
set(CTEST_BUILD_TARGET camitk-ce-test-coverage)
ctest_build()
if(NOT DEFINED CTEST_COVERAGE_COMMAND)
......@@ -207,7 +207,7 @@ while (${CTEST_ELAPSED_TIME} LESS ${CONTINUOUS_BUILD_DURATION})
ctest_submit(PARTS Coverage)
# 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_submit(PARTS Install)
......
......@@ -187,7 +187,7 @@ endforeach()
# ------------------------ STEP 4: Test coverage ------------------------
message(STATUS "- Running test coverage ${subproject}...")
set(CTEST_BUILD_TARGET camitk-test-coverage)
set(CTEST_BUILD_TARGET camitk-ce-test-coverage)
ctest_build()
if(NOT DEFINED CTEST_COVERAGE_COMMAND)
......
......@@ -171,7 +171,7 @@ foreach(subproject ${CAMITK_SUBPROJECTS})
endforeach()
# build the api-doc
set(CTEST_BUILD_TARGET camitk-api-doc)
set(CTEST_BUILD_TARGET camitk-ce-api-doc)
ctest_build()
# TODO zip it and download it on the website every so often (as `develop api-doc`)
......@@ -184,7 +184,7 @@ endforeach()
# Compute test coverage
message(STATUS "- Running test coverage...")
set(CTEST_BUILD_TARGET camitk-test-coverage)
set(CTEST_BUILD_TARGET camitk-ce-test-coverage)
ctest_build()
if(NOT DEFINED CTEST_COVERAGE_COMMAND)
......@@ -200,7 +200,7 @@ ctest_coverage()
ctest_submit(PARTS Coverage)
# 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_submit(PARTS Install)
......
......@@ -149,13 +149,13 @@ ctest_submit(PARTS Build)
set_property(GLOBAL PROPERTY SubProject package-source)
set_property(GLOBAL PROPERTY Label package-source)
# Package CamiTK and send the report.
set(CTEST_BUILD_TARGET camitk-package-source)
set(CTEST_BUILD_TARGET camitk-ce-package-source)
ctest_build()
ctest_submit(PARTS Build)
# Api documentation (doxygen)
set_property(GLOBAL PROPERTY SubProject camitk-api-doc)
set_property(GLOBAL PROPERTY Label camitk-api-doc)
set_property(GLOBAL PROPERTY SubProject camitk-ce-api-doc)
set_property(GLOBAL PROPERTY Label camitk-ce-api-doc)
# 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_submit(PARTS Build)
#------------------------------------------
# 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)
include(FindDoxygen)
if (DOXYGEN)
......@@ -25,12 +25,12 @@ if(APIDOC_SDK)
set(DOXYGEN_LANGUAGE "English" CACHE STRING "Language used by doxygen")
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(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
set(DOXYGEN_SUBDIRS)
......@@ -77,7 +77,7 @@ if(APIDOC_SDK)
# 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)
add_custom_target(camitk-api-doc
add_custom_target(camitk-ce-api-doc
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
COMMENT "Generating CamiTK SDK API documentation using Doxygen"
VERBATIM
......@@ -92,7 +92,7 @@ if(APIDOC_SDK)
# doc installation
install(DIRECTORY ${CAMITK_APIDOC_DIR}
DESTINATION share/${CAMITK_SHORT_VERSION_STRING}
COMPONENT camitk-api-doc
COMPONENT camitk-ce-api-doc
)
else()
message(WARNING "Doxygen not found - CamiTK SDK API documentation and reference manual will not be created")
......
......@@ -32,7 +32,7 @@ include(camitk/test/CamiTKAddTestActionStateMachine)
include(camitk/test/CamiTKAdditionalActionTest)
# -- packaging macros
include(camitk/packaging/CamiTKOpenSourcePackaging)
include(camitk/packaging/CamiTKCommunityEditionPackaging)
include(camitk/packaging/CamiTKCEPPackaging)
# -- CamiTK actions / components parsing test macros
......
......@@ -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;WhereBuild10]
# For camitk opensource compilation
# For camitk communityedition compilation
"${CMAKE_BINARY_DIR}"
#-- 2. installed path
......
......@@ -124,7 +124,7 @@ mark_as_advanced(
CMAKE_SHARED_LINKER_FLAGS_COVERAGE )
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")
else()
# support multiplaform (sometimes the "Debug" type is all uppercase, as on Win32, sometimes it is Camelcase)
......
......@@ -66,7 +66,7 @@
#! 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)
#! 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
#! No CEP_NAME provided will result in default categorization (generic extension).
#! \param DESCRIPTION = Simple description of the extension. Used for packaging presentation for instance.
......
......@@ -27,8 +27,8 @@
#! \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 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
#! a report in the camitk-test-coverage subdirectory. Only works with the g++ compiler.
#! \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-ce-test-coverage subdirectory. Only works with the g++ compiler.
#! \param NEEDS_CEP (TODO) Dependencies to other CEP
#!
macro(camitk_extension_project)
......@@ -71,7 +71,7 @@ macro(camitk_extension_project)
if (${CEP_DIR_NAME}_CMAKE_ENABLE_TEST_COVERAGE)
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)
include(macros/camitk/test/CamiTKTestCoverage)
endif()
......@@ -123,15 +123,16 @@ macro(camitk_extension_project)
endif()
# 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
# otherwise, just add include(CamiTKInstall) to get the installation facilities
if (NOT CAMITK_EXTENSION_PROJECT_SET)
#-- camitk-global-install == install in CAMITK_DIR
if (CAMITK_COMMUNITY_EDITION_BUILD)
# 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
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target install --config ${CMAKE_CFG_INTDIR}
COMMENT "Global Installation in ${CMAKE_INSTALL_PREFIX}"
......@@ -139,7 +140,7 @@ macro(camitk_extension_project)
else()
# 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
COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX:PATH=${CAMITK_DIR} ${CMAKE_BINARY_DIR}
# Second cmake to install
......@@ -149,23 +150,30 @@ macro(camitk_extension_project)
endif()
# 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
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}
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.
# .qrc files consider up to date .ts resources files for translation
add_custom_target(cep-${SIMPLIFIED_CEP_NAME}-update-translate
COMMAND ${CMAKE_COMMAND} -E echo "Updating translation for ${CEP_NAME}"
COMMAND ${CMAKE_COMMAND} -DCAMITK_TRANSLATE=TRUE ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -DCAMITK_TRANSLATE=FALSE ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E echo "Translation updated for ${CEP_NAME}"
)
# 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
add_custom_target(camitk-${SIMPLIFIED_CEP_NAME}-update-translate
COMMAND ${CMAKE_COMMAND} -E echo "Updating translation for ${CEP_NAME}"
COMMAND ${CMAKE_COMMAND} -DCAMITK_TRANSLATE=TRUE ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -DCAMITK_TRANSLATE=FALSE ${CMAKE_BINARY_DIR}
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()
endmacro()
......@@ -27,8 +27,8 @@ macro(camitk_sub_project_validate)
set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} ${xml_subproject_libraries})
set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} ${xml_subproject_action_application})
# Add camitk opensource CEP specific subprojects
if(${CAMITK_EXTENSION_PROJECT_SET_NAME} MATCHES "camitk-opensource")
# Add camitk communityedition CEP specific subprojects
if(${CAMITK_EXTENSION_PROJECT_SET_NAME} MATCHES "camitk-communityedition")
# Add application-testcomponents
set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} "\n <SubProject name=\"application-testcomponents\"> ")
set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} "\n <Dependency name=\"library-camitkcore \"/>")
......@@ -48,7 +48,7 @@ macro(camitk_sub_project_validate)
# Add packaging source, packaging and api_doc target (COMMENTED > let's be frank, those are not compiled anymore on VMs)
# set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} "\n <SubProject name=\"package-source\">\n </SubProject>")
# set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} "\n <SubProject name=\"package\">\n </SubProject>")
# set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} "\n <SubProject name=\"camitk-api-doc\">\n </SubProject>")
# set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} "\n <SubProject name=\"camitk-ce-api-doc\">\n </SubProject>")
else() # Other external CEP
set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} ${xml_subproject_components})
set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} ${xml_subproject_actions})
......
......@@ -2,10 +2,10 @@
#!
#! ==================== Source Tar ball ====================
#!
#! To make a source tar ball, use the custom target "camitk-package-source"
#! - make camitk-package-source
#! To make a source tar ball, use the custom target "camitk-ce-package-source"
#! - make camitk-ce-package-source
#! (it generates the correct CamiTKVersion.h)
#! WARNING it is VERY important to use "make camitk-package-source" and NOT just "make package_source"
#! WARNING it is VERY important to use "make camitk-ce-package-source" and NOT just "make package_source"
#!
#! ==================== Windows User Package ====================
#!
......@@ -16,7 +16,7 @@
#! On Windows platforms
#! CMake configure command (from the build directory) :
#! cmake -DCMAKE_GENERATOR="Visual Studio 12 Win64" -DPACKAGING_NSIS=TRUE -DCEP_IMAGING=TRUE -DCEP_MODELING=TRUE -DAPPLICATION_CEPGENERATOR=FALSE -DAPPLICATION_TESTACTIONS=FALSE -DAPPLICATION_TESTCOMPONENTS=FALSE -DAPPLICATION_WIZARD=FALSE ../src
#! Launch the camitkopensource.sln visual studio solution file.
#! Launch the camitkcommunityedition.sln visual studio solution file.
#! Build all in Release (do it again if some .h files missing errors occured)
#! Build camitk-package target.
#!
......@@ -52,7 +52,7 @@
#! fakeroot dpkg -b camitk-deb $PACKAGE_FILENAME
#! rm -rf camitk-deb
macro(camitk_opensource_packaging)
macro(camitk_communityedition_packaging)
#! package name
string(TOLOWER ${CAMITK_PROJECT_NAME} CPACK_PACKAGE_NAME)
......@@ -539,7 +539,7 @@ cpack_add_component_group(CEP_MODELING
#! create specific target for package source
#! When packaging, copy the CamiTKPackageVersion.h file to the source directory
#! Don't forget to remove it immediatly after packaging.
add_custom_target(camitk-package-source
add_custom_target(camitk-ce-package-source
COMMAND ${CMAKE_COMMAND}
-E copy ${CMAKE_CURRENT_BINARY_DIR}/CamiTKPackageVersion.h
${CMAKE_CURRENT_SOURCE_DIR}/sdk/libraries/core/CamiTKVersion.h
......@@ -553,7 +553,7 @@ add_custom_target(camitk-package-source
#! This target create the installer / linux package.
#! On windows, you have configured with PACKAGING_NSIS=TRUE => all project names have their "-" replaced by "_" character
#! NSIS doesn't support "-" character.
add_custom_target(camitk-NSIS-Windows-package
add_custom_target(camitk-ce-NSIS-Windows-package
COMMAND ${CMAKE_COMMAND}
-E copy ${CMAKE_CURRENT_BINARY_DIR}/sdk/libraries/core/CamiTKVersion.h
${CMAKE_CURRENT_BINARY_DIR}/sdk/libraries/core/CamiTKVersion.h-backup
......
......@@ -63,7 +63,7 @@ macro(camitk_add_test)
# this macro is called outside the sdk
set(CAMITK_CMAKE_MACRO_PATH ${CAMITK_CMAKE_DIR}/macros/camitk/test)
if(NOT IS_DIRECTORY ${CAMITK_CMAKE_MACRO_PATH})
# inside opensource but not in sdk (modeling or imaging)
# inside communityedition but not in sdk (modeling or imaging)
set(CAMITK_CMAKE_MACRO_PATH ${CMAKE_SOURCE_DIR}/sdk/cmake/modules/macros/camitk/test)
endif()
else()
......
......@@ -32,7 +32,7 @@ macro(camitk_add_test_actionstatemachine)
# this macro is called outside the sdk
set(CAMITK_CMAKE_MACRO_PATH ${CAMITK_CMAKE_DIR}/modules/macros/camitk/test)
if(NOT IS_DIRECTORY ${CAMITK_CMAKE_MACRO_PATH})
# inside opensource but not in sdk (modeling or imaging)
# inside communityedition but not in sdk (modeling or imaging)
set(CAMITK_CMAKE_MACRO_PATH ${CMAKE_SOURCE_DIR}/sdk/cmake/modules/macros/camitk/test)
endif()
else()
......@@ -94,7 +94,7 @@ macro(camitk_add_test_actionstatemachine)
# determine which version of the executable to use (debug-suffixed or not)
if(MSVC)
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
set(CAMITK_ASM_EXE ${CAMITK_ASM_EXE}${CAMITK_DEBUG_POSTFIX})
else()
# support multiplaform (sometimes the "Debug" type is all uppercase, as on Win32, sometimes it is Camelcase)
......
......@@ -28,7 +28,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.3" OR ${CMAKE_VERSION} VERSION_EQUAL "3.3
# this macro is called outside the sdk
set(CAMITK_CMAKE_MACRO_PATH ${CAMITK_CMAKE_DIR}/macros/camitk/test)
if(NOT IS_DIRECTORY ${CAMITK_CMAKE_MACRO_PATH})
# inside opensource but not in sdk (modeling or imaging)
# inside communityedition but not in sdk (modeling or imaging)
set(CAMITK_CMAKE_MACRO_PATH ${CMAKE_SOURCE_DIR}/sdk/cmake/modules/macros/camitk/test)
endif()
else()
......@@ -36,7 +36,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.3" OR ${CMAKE_VERSION} VERSION_EQUAL "3.3
set(CAMITK_CMAKE_MACRO_PATH ${SDK_TOP_LEVEL_SOURCE_DIR}/cmake/modules/macros/camitk/test)
endif()
add_custom_target(camitk-iwyu
add_custom_target(camitk-ce-iwyu
COMMAND ${CMAKE_COMMAND} -E echo "Running include-what-you-use. Results can be found in ${IWYU_OUTPUT}"
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR} --target clean
COMMAND ${CMAKE_COMMAND} "-DCMAKE_CXX_INCLUDE_WHAT_YOU_USE=${IWYU_EXECUTABLE}" ${CMAKE_SOURCE_DIR}
......
......@@ -7,7 +7,7 @@
# requires lcov to be installed on the machine
if(CMAKE_COMPILER_IS_GNUCXX)
option(CAMITK_TEST_COVERAGE "Check this option to generate the 'camitk-test-coverage' target that will create a coverage analysis report in ${PROJECT_BINARY_DIR}/camitk-test-coverage" OFF)
option(CAMITK_TEST_COVERAGE "Check this option to generate the 'camitk-ce-test-coverage' target that will create a coverage analysis report in ${PROJECT_BINARY_DIR}/camitk-ce-test-coverage" OFF)
if (CAMITK_TEST_COVERAGE)
# CodeCoverage is an additional CMake modules published on github by Lars Bilke.
......@@ -24,14 +24,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
'/usr/*')
# Defines a specific target to run test coverage and reporting.
# This will create a specific camitk-test-coverage target
# This will create a specific camitk-ce-test-coverage target
# that, when run, will launch all the test known by ctest in parallel
# and generate a report in ${PROJECT_BINARY_DIR}/camitk-test-coverage
# and generate a report in ${PROJECT_BINARY_DIR}/camitk-ce-test-coverage
#
# Note: you can run a quick test by bypassing some tests.
# e.g., to run only one test every 50 tests "-I 1,,50" (ctest documenation: -I Start,End,Stride,test#,test#
# Note: add "-V" or "-VV" for verbose, add "-R pattern" to run only specific test
setup_target_for_coverage(NAME camitk-test-coverage
setup_target_for_coverage(NAME camitk-ce-test-coverage
EXECUTABLE ctest --parallel 5)
endif()
......
......@@ -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;WhereBuild10]
# For camitk opensource compilation
# For camitk communityedition compilation
"${CMAKE_BINARY_DIR}"
#-- 2. installed path
......
......@@ -9,5 +9,5 @@ include(CamiTKConfig)
# Configure this CEP!
camitk_extension_project(NAME "tutorials"
CONTACT "Celine.Fouard@univ-grenoble-alpes.fr,Emmanuel.Promayon@univ-grenoble-alpes.fr"
DESCRIPTION "Tutorial CEP. This CamiTK Extension Project contains some example code for actions, components, applications and viewer extensions. While these extension are not useful for end-user their codes is provided as \"How To\" write CamiTK extensions. The other Open-Source CamiTK CEP is also a great source of practical examples."
DESCRIPTION "This CamiTK Extension Project is part of CamiTK Community Edition. It contains some example code for actions, components, applications and viewer extensions. While these extension are not useful for end-user their codes is provided as \"How To\" write CamiTK extensions. The other Open-Source CamiTK CEP is also a great source of practical examples."
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment