Skip to content
Snippets Groups Projects
Commit 95d66f02 authored by AlQuemist's avatar AlQuemist
Browse files

App/CMakeLists.txt: correct MacOS package macro variables

parent 562944e0
No related branches found
No related tags found
3 merge requests!2050rebase main on r21/v21.1,!2047<root>/CMakeLists.txt: add 'BornAgain_LIBRARIES' cached variable to store...,!1988Migrate to pyenv Python Platform; Fix MacOS package (Major change)
...@@ -116,8 +116,12 @@ if(BA_APPLE_BUNDLE) ...@@ -116,8 +116,12 @@ if(BA_APPLE_BUNDLE)
RENAME qt.conf) RENAME qt.conf)
# adjust MacOS bundle # adjust MacOS bundle
set(MACPKG_ROOT_DIR "${CMAKE_INSTALL_PREFIX}/${destination_prefix}") get_property(exe_dir TARGET ${executable_name} PROPERTY RUNTIME_OUTPUT_DIRECTORY)
set(MACPKG_MAIN_EXE "${executable_name}") set(MACPKG_MAIN_EXE "${exe_dir}/${executable_name}.app/Contents/MacOS/${executable_name}")
# list of BornAgain core libraries
set(MACPKG_CORE_LIBS "$CACHE{BornAgain_LIBRARIES}")
# list of required Qt plugins (paths relative to Qt root dir) # list of required Qt plugins (paths relative to Qt root dir)
set(MACPKG_QT_PLUGINS_RELDIR "${QT6_INSTALL_PLUGINS}") set(MACPKG_QT_PLUGINS_RELDIR "${QT6_INSTALL_PLUGINS}")
set(MACPKG_QT_PLUGINS set(MACPKG_QT_PLUGINS
...@@ -130,8 +134,7 @@ if(BA_APPLE_BUNDLE) ...@@ -130,8 +134,7 @@ if(BA_APPLE_BUNDLE)
# Qt plugins directory in within the MacOS bundle # Qt plugins directory in within the MacOS bundle
set(MACPKG_QT_PLUGINS_DIR PlugIns) # conform to settings in `qt.conf` set(MACPKG_QT_PLUGINS_DIR PlugIns) # conform to settings in `qt.conf`
# convert CMake list to space-separated lists # convert CMake list to space-separated lists
string(REPLACE ";" " " MACPKG_EXTRA_LIBS "${BA_Dependencies}") set(MACPKG_EXTRA_LIBS "${BA_Dependencies}")
string(REPLACE ";" " " MACPKG_QT_PLUGINS "${MACPKG_QT_PLUGINS}")
configure_file("${CMAKE_SOURCE_DIR}/devtools/deploy/mac/mac_package.py" configure_file("${CMAKE_SOURCE_DIR}/devtools/deploy/mac/mac_package.py"
"${BUILD_VAR_DIR}/mac_package.py" @ONLY) "${BUILD_VAR_DIR}/mac_package.py" @ONLY)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment