From 41f5f6d043ec7285cb8ecc9cc4ff5891fb02ec5a Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 18 Dec 2020 14:43:22 +0100
Subject: [PATCH] [CMake] Fixed package naming.
---
scripts/cmake/packaging/Pack.cmake | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/scripts/cmake/packaging/Pack.cmake b/scripts/cmake/packaging/Pack.cmake
index c78a425bb53..08f4da70c79 100644
--- a/scripts/cmake/packaging/Pack.cmake
+++ b/scripts/cmake/packaging/Pack.cmake
@@ -18,17 +18,18 @@ set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.md")
# Package file name
if(OGS_USE_PYTHON)
- set(SUFFIX "${SUFFIX}-python-${Python3_VERSION}")
+ list(APPEND SUFFIX_LIST "python-${Python3_VERSION}")
endif()
if(OGS_BUILD_GUI)
- set(SUFFIX "${SUFFIX}-de")
+ list(APPEND SUFFIX_LIST "de")
endif()
if(OGS_BUILD_UTILS)
- set(SUFFIX "${SUFFIX}-utils")
+ list(APPEND SUFFIX_LIST "utils")
endif()
if(OGS_USE_MPI)
- set(SUFFIX "${SUFFIX}-mpi")
+ list(APPEND SUFFIX_LIST "mpi")
endif()
+string(REPLACE ";" "-" SUFFIX "${SUFFIX_LIST}")
if(APPLE)
string(REGEX MATCH "(^[0-9]*)" TMP ${CMAKE_SYSTEM_VERSION})
--
GitLab