Commit abc5010a authored by Emmanuel Promayon's avatar Emmanuel Promayon

FIXED do not use git version in release + cleanup nickname variable name

parent 0dc3cb6e
#Specific to SDK: control the version (major, minor, default patch and )
set(CAMITK_VERSION_MAJOR "4")
set(CAMITK_VERSION_MINOR "1")
set(CAMITK_VER_NICKNAME "burgundy") # Red Burgundy Amaranth Rose Auburn Cardinal Carmine Cerise Coquelicot Bordeaux
set(CAMITK_VERSION_PATCH "1") # patch version for packaging, change when appropriate
set(CAMITK_VERSION_MAJOR "4")
set(CAMITK_VERSION_MINOR "1")
set(CAMITK_VERSION_NICKNAME "burgundy") # Red Burgundy Amaranth Rose Auburn Cardinal Carmine Cerise Coquelicot Bordeaux
set(CAMITK_VERSION_PATCH "1") # patch version for packaging, change when appropriate
......@@ -39,16 +39,16 @@ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libraries/core/CamiTKVersion.h")
set(CAMITK_VERSION_GIT ".git")
set(CAMITK_GIT_FOUND "0")
endif()
# specific version string using the git revision
# Transform "/" to "-" as "/" in git branch name generates problems when storing settings (it adds an extra directory)
string(REPLACE "/" "-" CAMITK_ESCAPED_VERSION_GIT ${CAMITK_VERSION_GIT})
set(CAMITK_VERSION_STRING "${CAMITK_VERSION_STRING}${CAMITK_ESCAPED_VERSION_GIT}")
else()
set(CAMITK_GIT_FOUND "0")
set(CAMITK_SOURCE_PACKAGE_VERSION "1")
endif()
# specific version string using the git revision
# Transform "/" to "-" as "/" in git branch name generates problems when storing settings (it adds an extra directory)
string(REPLACE "/" "-" CAMITK_ESCAPED_VERSION_GIT ${CAMITK_VERSION_GIT})
set(CAMITK_VERSION_STRING "${CAMITK_VERSION_STRING}${CAMITK_ESCAPED_VERSION_GIT}")
# prepare the CamiTKConfig.cmake for installation (first delete it to force regeneration)
execute_process(COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/share/${CAMITK_SHORT_VERSION_STRING}/cmake/CamiTKConfig.cmake)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/CamiTKConfig.cmake.in ${CMAKE_BINARY_DIR}/share/${CAMITK_SHORT_VERSION_STRING}/cmake/CamiTKConfig.cmake @ONLY)
......
......@@ -214,7 +214,7 @@ if(WIN32 AND NOT UNIX)
# Update package name for windows release
set(LSB_DISTRIB "win32")
set(CPACK_PACKAGE_ARCHITECTURE i386)
string(TOLOWER "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${CAMITK_VER_NICKNAME}-${LSB_DISTRIB}" CPACK_PACKAGE_FILE_NAME)
string(TOLOWER "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${CAMITK_VERSION_NICKNAME}-${LSB_DISTRIB}" CPACK_PACKAGE_FILE_NAME)
# Try to find Makensis on Linux distribution
find_program(MAKENSIS
......
......@@ -60,7 +60,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${CAMITK_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${CAMITK_VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${CAMITK_VERSION_PATCH})
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
string(TOLOWER "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CAMITK_VER_NICKNAME}-${LSB_DISTRIB}_${CPACK_PACKAGE_ARCHITECTURE}" CPACK_PACKAGE_FILE_NAME)
string(TOLOWER "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CAMITK_VERSION_NICKNAME}-${LSB_DISTRIB}_${CPACK_PACKAGE_ARCHITECTURE}" CPACK_PACKAGE_FILE_NAME)
#! contact information
set(CPACK_PACKAGE_VENDOR "Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525")
......@@ -225,7 +225,7 @@ if(WIN32 AND MSVC AND PACKAGING_NSIS)
else() #!32 bits installer
set(CPACK_PACKAGE_ARCHITECTURE i386)
endif()
string(TOLOWER "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${CAMITK_VER_NICKNAME}_${CPACK_PACKAGE_ARCHITECTURE}" CPACK_PACKAGE_FILE_NAME)
string(TOLOWER "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${CAMITK_VERSION_NICKNAME}_${CPACK_PACKAGE_ARCHITECTURE}" CPACK_PACKAGE_FILE_NAME)
# get the root installation dir of Qt5
# Qt5_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