Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Nektar
Nektar
Commits
3ee446df
Commit
3ee446df
authored
Dec 11, 2012
by
Chris Cantwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed Boost library detection to allow selection of non-mt or -mt variants.
parent
45230e01
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
12 deletions
+3
-12
cmake/ThirdPartyBoost.cmake
cmake/ThirdPartyBoost.cmake
+3
-12
No files found.
cmake/ThirdPartyBoost.cmake
View file @
3ee446df
SET
(
THIRDPARTY_BUILD_BOOST OFF CACHE BOOL
"Build Boost libraries"
)
SET
(
Boost_USE_MULTITHREADED ON CACHE BOOL
"Search for multithreaded boost libraries"
)
MARK_AS_ADVANCED
(
Boost_USE_MULTITHREADED
)
IF
(
THIRDPARTY_BUILD_BOOST
)
INCLUDE
(
ExternalProject
)
...
...
@@ -99,18 +102,6 @@ ELSE (THIRDPARTY_BUILD_BOOST)
FIND_PACKAGE
(
Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex
)
SET
(
BOOST_ROOT
${
CMAKE_SOURCE_DIR
}
/ThirdParty/dist
)
FIND_PACKAGE
(
Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex
)
# In case we have not found the threaded version, look for the
# non-threaded version of the libraries.
SET
(
Boost_USE_MULTITHREADED OFF
)
SET
(
BOOST_ROOT $ENV{BOOST_HOME}
)
FIND_PACKAGE
(
Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex
)
SET
(
BOOST_ROOT
${
CMAKE_SOURCE_DIR
}
/ThirdParty/boost
)
FIND_PACKAGE
(
Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex
)
SET
(
BOOST_ROOT
${
CMAKE_SOURCE_DIR
}
/../ThirdParty/boost
)
FIND_PACKAGE
(
Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex
)
SET
(
BOOST_ROOT
${
CMAKE_SOURCE_DIR
}
/ThirdParty/dist
)
FIND_PACKAGE
(
Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex
)
ELSE
()
FIND_PACKAGE
(
Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex
)
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