Skip to content
Snippets Groups Projects
Commit 4ce54c45 authored by AlQuemist's avatar AlQuemist Committed by Ammar Nejati
Browse files

Pack.cmake: correct and unify the name of the BA installer on all platforms

The installer name is
<Project-Name>-<Project-Version>-python<Python-Version>-<architecture>
e.g., "BornAgain-20.0-python3.11-linux_x64" on Debian or
"BornAgain-20.0-python3.9-mac_arm.dmg" on MacOS-M1.

Added a CPack stage 'FixPackage' to adjust the installers (for MacOS and Linux).
parent 1a478360
No related branches found
No related tags found
1 merge request!1558Improvements to CI
...@@ -12,6 +12,9 @@ set(CPACK_PACKAGE_RELOCATABLE True) ...@@ -12,6 +12,9 @@ set(CPACK_PACKAGE_RELOCATABLE True)
set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}) set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION})
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_SOURCE_PACKAGE_FILE_NAME}) set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_SOURCE_PACKAGE_FILE_NAME})
set(SELECTED_PYTHON_VERSION "python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}")
set(_pkgname ${CPACK_SOURCE_PACKAGE_FILE_NAME}-${SELECTED_PYTHON_VERSION}-${BA_ARCHITECTURE})
if(WIN32) if(WIN32)
include(BornAgain/PackWindows) include(BornAgain/PackWindows)
elseif(APPLE) elseif(APPLE)
...@@ -24,9 +27,16 @@ elseif(UNIX) ...@@ -24,9 +27,16 @@ elseif(UNIX)
include(BornAgain/PackSource) include(BornAgain/PackSource)
endif() endif()
set(CPACK_PACKAGE_FILE_NAME ${_pkgname})
# NOTE: The 'Unspecified' component is a _default_ component of CPack needed to finalize
# the installer. It must be at the end of all other components.
set(CPACK_COMPONENTS_ALL Libraries Headers Examples Applications Runtime Unspecified)
include(CPack) include(CPack)
set(CPACK_COMPONENTS_ALL Libraries Headers Examples Applications Runtime) # reset package name (CPack bug: the original value is overwritten by CPack module)
set(CPACK_PACKAGE_FILE_NAME ${_pkgname})
message(STATUS "Installer name: ${CPACK_PACKAGE_FILE_NAME}") message(STATUS "Installer name: ${CPACK_PACKAGE_FILE_NAME}")
message(STATUS "Source package name: ${CPACK_SOURCE_PACKAGE_FILE_NAME}") message(STATUS "Source package name: ${CPACK_SOURCE_PACKAGE_FILE_NAME}")
......
# BornAgain Mac packaging # BornAgain Mac packaging
set(SELECTED_PYTHON_VERSION "python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}")
set(CPACK_PACKAGE_FILE_NAME
"${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}-${SELECTED_PYTHON_VERSION}-${BA_ARCHITECTURE}")
set(CPACK_BINARY_DRAGNDROP ON) set(CPACK_BINARY_DRAGNDROP ON)
set(CPACK_GENERATOR "DragNDrop") set(CPACK_GENERATOR "DragNDrop")
# BornAgain Windows packaging # BornAgain Windows packaging
set(SELECTED_PYTHON_VERSION "python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}")
set(CPACK_PACKAGE_FILE_NAME
"${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}-${SELECTED_PYTHON_VERSION}-${BA_ARCHITECTURE}")
set(CPACK_GENERATOR "NSIS") set(CPACK_GENERATOR "NSIS")
set(CPACK_NSIS_INSTALL_ROOT "C:") set(CPACK_NSIS_INSTALL_ROOT "C:")
...@@ -12,7 +7,6 @@ set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON) ...@@ -12,7 +7,6 @@ set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
set(CPACK_NSIS_MENU_LINKS "bin\\\\BornAgain.exe" "BornAgain") set(CPACK_NSIS_MENU_LINKS "bin\\\\BornAgain.exe" "BornAgain")
set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/GUI\\\\images\\\\BornAgain.ico" ) set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/GUI\\\\images\\\\BornAgain.ico" )
set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/GUI\\\\images\\\\BornAgain.ico" ) set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/GUI\\\\images\\\\BornAgain.ico" )
set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}/GUI\\\\images\\\\BornAgain.ico" ) set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}/GUI\\\\images\\\\BornAgain.ico" )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment