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
8f4124ec
Commit
8f4124ec
authored
9 years ago
by
Pospelov, Gennady
Browse files
Options
Downloads
Patches
Plain Diff
MacOS cmake: attempt to configure bundle when there is more than one cmake prefix path
parent
203284e6
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/main/CMakeLists.txt
+8
-0
8 additions, 0 deletions
GUI/main/CMakeLists.txt
cmake/modules/FixAppleBundle.cmake.in
+5
-2
5 additions, 2 deletions
cmake/modules/FixAppleBundle.cmake.in
with
13 additions
and
2 deletions
GUI/main/CMakeLists.txt
+
8
−
0
View file @
8f4124ec
...
...
@@ -134,6 +134,14 @@ if(UNIX)
install
(
DIRECTORY
"$ENV{QTDIR}/plugins/platforms"
DESTINATION
${
plugin_dest_dir
}
COMPONENT Runtime
)
set
(
fixup_path @rpath
)
# handling the case when cmake prefix path contains more than one entry
list
(
LENGTH
${
CMAKE_PREFIX_PATH
}
len
)
list
(
GET
${
CMAKE_PREFIX_PATH
}
0 cmake_prefix_path1
)
if
(
len EQUAL 2
)
list
(
GET
${
CMAKE_PREFIX_PATH
}
1 cmake_prefix_path2
)
endif
()
configure_file
(
${
CMAKE_SOURCE_DIR
}
/cmake/modules/FixAppleBundle.cmake.in
${
destination_runtime_configs
}
/FixAppleBundle.cmake @ONLY
)
install
(
SCRIPT
${
destination_runtime_configs
}
/FixAppleBundle.cmake COMPONENT Runtime
)
elseif
(
NOT BUILD_DEBIAN
)
...
...
This diff is collapsed.
Click to expand it.
cmake/modules/FixAppleBundle.cmake.in
+
5
−
2
View file @
8f4124ec
set(bundle ${CMAKE_INSTALL_PREFIX}/BornAgain.app )
set(bornagain_libs ${CMAKE_INSTALL_PREFIX}/@destination_lib@)
set(thirdparty_libs ${bundle}/Contents/lib/ThirdParty)
set(cmake_prefix_path @CMAKE_PREFIX_PATH@ )
set(BU_CHMOD_BUNDLE_ITEMS True)
set(BU_COPY_FULL_FRAMEWORK_CONTENTS False)
...
...
@@ -25,7 +24,11 @@ function(gp_resolved_file_type_override resolved_file type_var)
message("XXX_Python resolving file as system : ${file}")
set(${type_var} system PARENT_SCOPE)
elseif(file MATCHES "@CMAKE_PREFIX_PATH@")
elseif(file MATCHES "@cmake_prefix_path1@")
message("XXX_PREFFIX resolving file as _embedded : ${file}")
set(${type_var} embedded PARENT_SCOPE)
elseif(file MATCHES "@cmake_prefix_path2@")
message("XXX_PREFFIX resolving file as _embedded : ${file}")
set(${type_var} embedded PARENT_SCOPE)
...
...
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