Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit 31705f1e authored by Emmanuel Promayon's avatar Emmanuel Promayon
Browse files

Merge branch '125-packaging-configuration-does-not-define-core-libdir' into 'develop'

Resolve "Packaging configuration does not define Core::libDir"

Closes #125

See merge request !183
parents d0704b93 0f19d04d
......@@ -16,8 +16,6 @@ set(CAMITK_DEBUG_POSTFIX "-debug")
# 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)
# Source package has a file CamiTKVersion.h in the source tree
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libraries/core/CamiTKVersion.h")
......@@ -61,6 +59,8 @@ include(CamiTKConfig)
# now create the correct version header
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libraries/core/CamiTKVersion.h.in ${CMAKE_CURRENT_BINARY_DIR}/libraries/core/CamiTKVersion.h)
# 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)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
......
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