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
fb69a108
Commit
fb69a108
authored
7 years ago
by
Van Herck, Walter
Browse files
Options
Downloads
Patches
Plain Diff
Remove cmake message when USE_PYTHON3 was already on
parent
a40c57a6
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
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
cmake/bornagain/modules/SearchInstalledSoftware.cmake
+1
-1
1 addition, 1 deletion
cmake/bornagain/modules/SearchInstalledSoftware.cmake
with
2 additions
and
2 deletions
CMakeLists.txt
+
1
−
1
View file @
fb69a108
...
...
@@ -27,7 +27,7 @@ include(VERSION.cmake)
# --- Declare project-wide user flags, and set default values ---
option
(
BORNAGAIN_PYTHON
"Build with python support"
ON
)
option
(
BORNAGAIN_USE_PYTHON3
"Build against python 3.
5
instead of 2.7"
O
FF
)
option
(
BORNAGAIN_USE_PYTHON3
"Build against python 3.
x
instead of 2.7"
O
N
)
option
(
BORNAGAIN_GENERATE_BINDINGS
"Generate python bindings during build (requires swig)"
OFF
)
option
(
BORNAGAIN_GENERATE_PYTHON_DOCS
"Generate python documentation from the doxygen comments"
OFF
)
option
(
BORNAGAIN_GUI
"Build a graphical user interface"
ON
)
...
...
This diff is collapsed.
Click to expand it.
cmake/bornagain/modules/SearchInstalledSoftware.cmake
+
1
−
1
View file @
fb69a108
...
...
@@ -60,7 +60,7 @@ if(BORNAGAIN_PYTHON OR BORNAGAIN_GUI)
endif
()
message
(
STATUS
"Found Python libraries version
${
PYTHONLIBS_VERSION_STRING
}
at
${
PYTHON_LIBRARIES
}
; includes at
${
PYTHON_INCLUDE_DIRS
}
"
)
if
(
PYTHONLIBS_VERSION_STRING MATCHES
"^3.*$"
)
if
(
PYTHONLIBS_VERSION_STRING MATCHES
"^3.*$"
AND NOT BORNAGAIN_USE_PYTHON3
)
set
(
BORNAGAIN_USE_PYTHON3 ON
)
message
(
STATUS
"Python 3 will be used. Setting BORNAGAIN_USE_PYTHON3 to
${
BORNAGAIN_USE_PYTHON3
}
."
)
endif
()
...
...
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