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
0ae0930a
Commit
0ae0930a
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Plain Diff
[j.0] CMake minor cleanup ()
Merging branch 'j.0' into 'main'. See merge request
!2482
parents
ca1c8717
2df53555
No related branches found
No related tags found
1 merge request
!2482
CMake minor cleanup
Pipeline
#136940
passed
1 year ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+5
-1
5 additions, 1 deletion
CMakeLists.txt
cmake/BornAgain/Directories.cmake
+1
-3
1 addition, 3 deletions
cmake/BornAgain/Directories.cmake
with
6 additions
and
4 deletions
CMakeLists.txt
+
5
−
1
View file @
0ae0930a
...
...
@@ -77,6 +77,10 @@ endif()
# check compatibility of options
if
(
BA_APPLE_BUNDLE AND NOT APPLE
)
message
(
FATAL_ERROR
"BA_APPLE_BUNDLE=ON although hardware is not APPLE"
)
endif
()
if
(
BA_WHEEL AND NOT BORNAGAIN_PYTHON
)
message
(
FATAL_ERROR
"BA_WHEEL is ON although BORNAGAIN_PYTHON is OFF"
)
endif
()
...
...
@@ -136,7 +140,7 @@ if(BA_TESTS)
### Operating system
# introduce `LINUX` flag (
along with
`APPLE` and `WIN32`)
# introduce `LINUX` flag (
whereas
`APPLE` and `WIN32`
are set by CMake
)
if
(
UNIX AND CMAKE_SYSTEM_NAME MATCHES Linux
)
set
(
LINUX ON
)
endif
()
...
...
This diff is collapsed.
Click to expand it.
cmake/BornAgain/Directories.cmake
+
1
−
3
View file @
0ae0930a
...
...
@@ -76,8 +76,6 @@ if(WIN32)
# under Windows, .pyd files are needed as the Python extension; see
# <https://docs.python.org/3/faq/windows.html#is-a-pyd-file-the-same-as-a-dll>
set
(
libsuffix .pyd
)
elseif
(
APPLE
)
set
(
libsuffix .so
)
else
()
set
(
libsuffix .so
)
endif
()
...
...
@@ -89,7 +87,7 @@ set(destination_suffix ${CMAKE_PROJECT_NAME}_${PROJECT_VERSION})
set
(
dstIds
""
)
if
(
APPLE AND
BA_APPLE_BUNDLE
)
if
(
BA_APPLE_BUNDLE
)
set
(
destination_bundle BornAgain.app
)
set
(
destination_root
${
destination_bundle
}
/Contents/
)
list
(
APPEND dstIds
"bundle"
)
...
...
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