From a7a024d995805cfe99003d1bcb4a55550c896c06 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 16 Mar 2015 11:09:30 +0100
Subject: [PATCH] Fixes Win package install location.
- Since some time there is only a variable OGS_VERSION (contains e.g. 6.0.1)
- CPACK_PACKAGE_VERSION does not need to set because we set CPACK_PACKAGE_FILE_NAME
anyway
---
scripts/cmake/packaging/Pack.cmake | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/scripts/cmake/packaging/Pack.cmake b/scripts/cmake/packaging/Pack.cmake
index 22ee4505382..2bfc4f00342 100644
--- a/scripts/cmake/packaging/Pack.cmake
+++ b/scripts/cmake/packaging/Pack.cmake
@@ -4,14 +4,11 @@ include(packaging/ArchiveTestdata)
#### Packaging setup ####
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OGS-6 THM/C Simulator")
set(CPACK_PACKAGE_VENDOR "OpenGeoSys Community (http://www.opengeosys.org)")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "OGS-${OGS_VERSION_MAJOR}.${OGS_VERSION_MINOR}.${OGS_VERSION_PATCH}")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "OGS-${OGS_VERSION}")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt")
set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md")
# set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_SOURCE_DIR}/README.md")
-set(CPACK_PACKAGE_VERSION_MAJOR "${OGS_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${OGS_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${OGS_VERSION_PATCH}")
if(APPLE)
set(CPACK_PACKAGE_FILE_NAME "ogs-${GIT_DESCRIBE}-OSX-${OSX_VERSION}-x${BITS}")
set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME})
@@ -19,8 +16,6 @@ else()
set(CPACK_PACKAGE_FILE_NAME "ogs-${GIT_DESCRIBE}-${CMAKE_SYSTEM}-x${BITS}")
endif()
-#set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE 1)
-
if (WIN32)
include (packaging/PackagingWin)
endif()
--
GitLab