diff --git a/CMakeLists.txt b/CMakeLists.txt index eed9093..3a3589e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,15 +1,16 @@ CMAKE_MINIMUM_REQUIRED (VERSION 3.2) PROJECT (DKS) SET (DKS_VERSION_MAJOR 1) -SET (DKS_VERSION_MINOR 0.1) +SET (DKS_VERSION_MINOR 1.0) +set (DKS_VERSION ${DKS_VERSION_MAJOR}.${DKS_VERSION_MINOR}) SET (PACKAGE \"dks\") -SET (PACKAGE_BUGREPORT \"locagoons.uldis@psi.ch\") +SET (PACKAGE_BUGREPORT \"locans.uldis@psi.ch\") SET (PACKAGE_NAME \"DKS\") -SET (PACKAGE_STRING \"DKS\ 1.0.1\") SET (PACKAGE_TARNAME \"dks\") -SET (PACKAGE_VERSION \"1.0.1\") -SET (VERSION \"1.0.1\") - +#STRING (REGEX REPLACE "\\.([0-9])\\." ".0\\1." PACKAGE_VERSION ${DKS_VERSION}) +#STRING (REGEX REPLACE "\\." "" PACKAGE_VERSION ${PACKAGE_VERSION}) +#set (PACKAGE_VERSION_STR "\"${PACKAGE_VERSION}\"") +SET (DKS_VERSION_STR "\"${DKS_VERSION}\"") SET (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") #get compiler name @@ -203,9 +204,18 @@ ADD_SUBDIRECTORY (auto-tuning) CONFIGURE_FILE ( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${PROJECT_NAME}Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config_install.cmake ) +CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion_install.cmake @ONLY) + ### install files ### INSTALL ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config_install.cmake DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/cmake/${PROJECT_NAME}" RENAME ${PROJECT_NAME}Config.cmake ) + +INSTALL ( + FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion_install.cmake + DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/cmake/${PROJECT_NAME}" + RENAME ${PROJECT_NAME}ConfigVersion.cmake + ) diff --git a/cmake/DKSConfig.cmake.in b/cmake/DKSConfig.cmake.in index 9499d8e..7b8681f 100644 --- a/cmake/DKSConfig.cmake.in +++ b/cmake/DKSConfig.cmake.in @@ -2,4 +2,6 @@ SET(${PROJECT_NAME}_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") SET(${PROJECT_NAME}_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include") SET(${PROJECT_NAME}_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/lib") SET(${PROJECT_NAME}_LIBRARY "dks") -SET(CMAKE_SKIP_RPATH ${CMAKE_SKIP_RPATH}) \ No newline at end of file +SET(CMAKE_SKIP_RPATH ${CMAKE_SKIP_RPATH}) +SET(DKS_VERSION ${DKS_VERSION}) +SET(DKS_VERSION_STR ${DKS_VERSION_STR}) diff --git a/cmake/DKSConfigVersion.cmake.in b/cmake/DKSConfigVersion.cmake.in new file mode 100644 index 0000000..f9baafe --- /dev/null +++ b/cmake/DKSConfigVersion.cmake.in @@ -0,0 +1,13 @@ +set(PACKAGE_VERSION @DKS_VERSION@) + +if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL "@DKS_VERSION_MAJOR@") + if ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL "@DKS_VERSION_MINOR@") + set(PACKAGE_VERSION_EXACT TRUE) + elseif("${PACKAGE_FIND_VERSION_MINOR}" LESS "@DKS_VERSION_MINOR@") + set(PACKAGE_VERSION_UNSUITABLE TRUE) + else() + set(PACKAGE_VERSION_UNSUITABLE TRUE) + endif() +else() + set(PACKAGE_VERSION_UNSUITABLE TRUE) +endif() \ No newline at end of file