From a1900f7cd9fdb9855daef6ff69b3dea66a557d40 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Fri, 7 Dec 2018 18:50:11 +0100
Subject: [PATCH] Propagate Python version in installer name under Mac and Win
---
cmake/bornagain/modules/BornAgainCPack.cmake | 3 +++
cmake/bornagain/modules/CPackApple.cmake | 8 ++------
cmake/bornagain/modules/CPackWindows.cmake | 8 ++------
3 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/cmake/bornagain/modules/BornAgainCPack.cmake b/cmake/bornagain/modules/BornAgainCPack.cmake
index 7cb7e00f7ea..0977d0f0791 100644
--- a/cmake/bornagain/modules/BornAgainCPack.cmake
+++ b/cmake/bornagain/modules/BornAgainCPack.cmake
@@ -42,6 +42,9 @@ endif()
set(CPACK_SOURCE_GENERATOR "TGZ")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+message(STATUS "Installer name: ${CPACK_PACKAGE_FILE_NAME}")
+message(STATUS "Source package name: ${CPACK_SOURCE_PACKAGE_FILE_NAME}")
+
# Specify which files not to include into the source package generated by make package_source
set(CPACK_SOURCE_IGNORE_FILES
${CPACK_SOURCE_IGNORE_FILES} # first take the default parameters
diff --git a/cmake/bornagain/modules/CPackApple.cmake b/cmake/bornagain/modules/CPackApple.cmake
index c523c827fa7..f19dac116ac 100644
--- a/cmake/bornagain/modules/CPackApple.cmake
+++ b/cmake/bornagain/modules/CPackApple.cmake
@@ -1,13 +1,9 @@
# BornAgain Mac packaging
-if(BORNAGAIN_USE_PYTHON3)
- set(MAC_PYTHON_VERSION "python3")
-else()
- set(MAC_PYTHON_VERSION "python2")
-endif()
+set(SELECTED_PYTHON_VERSION "python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
set(CPACK_PACKAGE_FILE_NAME
- "${CMAKE_PROJECT_NAME}-${BORNAGAIN_VERSION}-${MAC_PYTHON_VERSION}-${BORNAGAIN_ARCHITECTURE}-10.10+")
+ "${CMAKE_PROJECT_NAME}-${BORNAGAIN_VERSION}-${SELECTED_PYTHON_VERSION}-${BORNAGAIN_ARCHITECTURE}-10.10+")
set(CPACK_BINARY_DRAGNDROP ON)
set(CPACK_GENERATOR "DragNDrop")
diff --git a/cmake/bornagain/modules/CPackWindows.cmake b/cmake/bornagain/modules/CPackWindows.cmake
index fc4436e3095..91705c836ab 100644
--- a/cmake/bornagain/modules/CPackWindows.cmake
+++ b/cmake/bornagain/modules/CPackWindows.cmake
@@ -1,13 +1,9 @@
# BornAgain Windows packaging
-if(BORNAGAIN_USE_PYTHON3)
- set(WIN_PYTHON_VERSION "python3")
-else()
- set(WIN_PYTHON_VERSION "python2")
-endif()
+set(SELECTED_PYTHON_VERSION "python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
set(CPACK_PACKAGE_FILE_NAME
- "${CMAKE_PROJECT_NAME}-${BORNAGAIN_VERSION}-${WIN_PYTHON_VERSION}-${BORNAGAIN_ARCHITECTURE}")
+ "${CMAKE_PROJECT_NAME}-${BORNAGAIN_VERSION}-${SELECTED_PYTHON_VERSION}-${BORNAGAIN_ARCHITECTURE}")
set(CPACK_GENERATOR "NSIS")
--
GitLab