From 432d2f5e4ecac69f5c3e066e909fe36cbc235a12 Mon Sep 17 00:00:00 2001 From: Uldis Locans Date: Wed, 5 Apr 2017 17:28:13 +0200 Subject: [PATCH] Correct patch and minor versions set when installing dks --- CMakeLists.txt | 8 +++----- cmake/DKSConfigVersion.cmake.in | 18 +++++++++--------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a3589e..f1f3b17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,15 +1,13 @@ CMAKE_MINIMUM_REQUIRED (VERSION 3.2) PROJECT (DKS) SET (DKS_VERSION_MAJOR 1) -SET (DKS_VERSION_MINOR 1.0) -set (DKS_VERSION ${DKS_VERSION_MAJOR}.${DKS_VERSION_MINOR}) +SET (DKS_VERSION_MINOR 1) +SET (DKS_VERSION_PATCH 0) +set (DKS_VERSION ${DKS_VERSION_MAJOR}.${DKS_VERSION_MINOR}.${DKS_VERSION_PATCH}) SET (PACKAGE \"dks\") SET (PACKAGE_BUGREPORT \"locans.uldis@psi.ch\") SET (PACKAGE_NAME \"DKS\") SET (PACKAGE_TARNAME \"dks\") -#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/") diff --git a/cmake/DKSConfigVersion.cmake.in b/cmake/DKSConfigVersion.cmake.in index f9baafe..6a19c33 100644 --- a/cmake/DKSConfigVersion.cmake.in +++ b/cmake/DKSConfigVersion.cmake.in @@ -1,13 +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() +if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL "@DKS_VERSION_MAJOR@" AND "${PACKAGE_FIND_VERSION_MINOR}" EQUAL "@DKS_VERSION_MINOR@") + if ("${PACKAGE_FIND_VERSION_PATCH}" EQUAL "@DKS_VERSION_PATCH@") + set(PACKAGE_VERSION_EXACT TRUE) + elseif("${PACKAGE_FIND_VERSION_PATCH}" LESS "@DKS_VERSION_PATCH@") + set(PACKAGE_VERSION_COMPATIBLE TRUE) + else() set(PACKAGE_VERSION_UNSUITABLE TRUE) + endif() +else() + set(PACKAGE_VERSION_UNSUITABLE TRUE) endif() \ No newline at end of file