Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
CoMISo
CoMISo
Commits
60a7a434
Commit
60a7a434
authored
Aug 12, 2019
by
David Bommes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'no-boost' into 'master'
Fix build without boost Closes
#6
See merge request
!41
parents
32a385c0
8d3c0d5a
Pipeline
#11704
passed with stages
in 8 minutes and 10 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
Base
Base
+1
-1
CMakeLists.txt
CMakeLists.txt
+8
-2
No files found.
Base
@
5c54ef00
Compare
f31f6e3a
...
5c54ef00
Subproject commit
f31f6e3ae0a097c2e04bc750589e00ccc972feaf
Subproject commit
5c54ef0065f46b07dbea44644515a00665563235
CMakeLists.txt
View file @
60a7a434
...
...
@@ -39,8 +39,10 @@ set(COMISO_LINK_DIRECTORIES "")
set
(
COMISO_LINK_LIBRARIES
""
)
set
(
NEED_LAPACK
""
)
option
(
COMISO_BUILD_WITHOUT_BOOST
"Build CoMISo without boost"
OFF
)
FIND_PACKAGE
(
Boost 1.59.0 COMPONENTS system filesystem regex QUIET
)
if
(
Boost_FOUND
)
if
(
Boost_FOUND
AND NOT COMISO_BUILD_WITHOUT_BOOST
)
set
(
COMISO_BOOST_CONFIG_FILE_SETTINGS
"#define COMISO_BOOST_AVAILABLE 1"
)
list
(
APPEND COMISO_INCLUDE_DIRECTORIES
${
Boost_INCLUDE_DIRS
}
)
list
(
APPEND COMISO_LINK_DIRECTORIES
${
Boost_LIBRARY_DIR
}
)
...
...
@@ -58,7 +60,11 @@ if(Boost_FOUND)
else
()
set
(
COMISO_BOOST_CONFIG_FILE_SETTINGS
"#define COMISO_BOOST_AVAILABLE 0"
)
if
(
COMISO_BUILD_WITHOUT_BOOST
)
message
(
STATUS
"Building without boost (COMISO_BUILD_WITHOUT_BOOST flag is set)"
)
else
()
message
(
STATUS
"Boost not found!"
)
endif
()
endif
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment