From 38e34804fa92ea980cdc42065d1f3fdcb8ac6c74 Mon Sep 17 00:00:00 2001 From: Eddy Ashton Date: Fri, 26 Jun 2020 09:53:55 +0100 Subject: [PATCH 1/2] Don't double-prefix the install directory --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a978e0721b4..35694c86bcb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ message(STATUS "CCF release version=${CCF_RELEASE_VERSION}") # if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_INSTALL_PREFIX - "/opt/ccf/ccf-${CCF_VERSION}" + "/opt/ccf/ccf-${CCF_RELEASE_VERSION}" CACHE PATH "Default install prefix" FORCE ) endif() From bd87269def47f02c4a46420506038f46c31bc6ed Mon Sep 17 00:00:00 2001 From: Eddy Ashton Date: Fri, 26 Jun 2020 10:03:07 +0100 Subject: [PATCH 2/2] Prefer CCF_VERSION --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35694c86bcb5..815b8e56dc79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ message(STATUS "CCF release version=${CCF_RELEASE_VERSION}") # if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_INSTALL_PREFIX - "/opt/ccf/ccf-${CCF_RELEASE_VERSION}" + "/opt/ccf/${CCF_VERSION}" CACHE PATH "Default install prefix" FORCE ) endif()