Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
95d66f02
Commit
95d66f02
authored
1 year ago
by
AlQuemist
Browse files
Options
Downloads
Patches
Plain Diff
App/CMakeLists.txt: correct MacOS package macro variables
parent
562944e0
No related branches found
No related tags found
3 merge requests
!2050
rebase main on r21/v21.1
,
!2047
<root>/CMakeLists.txt: add 'BornAgain_LIBRARIES' cached variable to store...
,
!1988
Migrate to pyenv Python Platform; Fix MacOS package (Major change)
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
App/CMakeLists.txt
+7
-4
7 additions, 4 deletions
App/CMakeLists.txt
with
7 additions
and
4 deletions
App/CMakeLists.txt
+
7
−
4
View file @
95d66f02
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment