diff --git a/CMakeLists.txt b/CMakeLists.txt index 638af78a9fc2a5e80d252820dbb47d42ae79bbf8..79c7658eb937b8e29d34ba27aa98ebd38af7bddc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,13 +4,7 @@ ## PROJECT: SIMC (Cmake build with file input) ################################################################################ cmake_minimum_required (VERSION 3.5) -project (simc) -set (SIMC_MAJOR_VERSION 0) -set (SIMC_MINOR_VERSION 2) -set (SIMC_PATCH_VERSION 0) -set (SIMC_VERSION - ${SIMC_MAJOR_VERSION}.${SIMC_MINOR_VERSION}.${SIMC_PATCH_VERSION}) -set (SIMC_SOVERSION ${SIMC_MAJOR_VERSION}) +project (simc VERSION 1.0.0) ################################################################################ ## CMAKE Settings diff --git a/CTP/CMakeLists.txt b/CTP/CMakeLists.txt index 9062184e50a8d89bbd49f41185482cc8a1722551..a8d1ef5e9772a53dd420930b1c2486c21bf7f469 100644 --- a/CTP/CMakeLists.txt +++ b/CTP/CMakeLists.txt @@ -74,15 +74,15 @@ add_library(${LIBRARY} STATIC ${CTP_SOURCES} ${RPC_SVC_SOURCE} ${RPC_XDR_SOURCE} ${RPC_HEADER}) set_target_properties(${LIBRARY} PROPERTIES - VERSION ${SIMC_VERSION} - SOVERSION ${SIMC_SOVERSION}) + VERSION ${PROJECT_VERSION} + SOVERSION ${PROJECT_MAJOR_VERSION}) add_library(${CLIENT_LIBRARY} STATIC ${CLIENT_SOURCES} ${RPC_CLNT_SOURCE} ${RPC_XDR_SOURCE} ${RPC_HEADER}) set_target_properties(${LIBRARY} PROPERTIES - VERSION ${SIMC_VERSION} - SOVERSION ${SIMC_SOVERSION}) + VERSION ${PROJECT_VERSION} + SOVERSION ${PROJECT_MAJOR_VERSION}) add_executable(${PROGRAM} ${MAKEREG_SOURCES}) target_link_libraries(${PROGRAM} diff --git a/cmake/simc-config-version.cmake.in b/cmake/simc-config-version.cmake.in index d4ebb0807b2e1cea997d4fe3191c808368878f53..8610ebf04eefb0ad63f5cc52994dcd9980e39926 100644 --- a/cmake/simc-config-version.cmake.in +++ b/cmake/simc-config-version.cmake.in @@ -1,4 +1,4 @@ -set(PACKAGE_VERSION "@SIMC_VERSION@") +set(PACKAGE_VERSION "@PROJECT_VERSION@") # Check whether the requested PACKAGE_FIND_VERSION is compatible if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")