Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Markus Holzer
waLBerla
Commits
dbb9c716
Commit
dbb9c716
authored
May 16, 2019
by
Martin Bauer
Committed by
Michael Kuron
Sep 25, 2019
Browse files
Support for Boost 1.70.0 and Python 3.7
parent
1b9f007a
Changes
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
dbb9c716
...
...
@@ -653,7 +653,7 @@ set ( Boost_ADDITIONAL_VERSIONS
"1.45"
"1.45.0"
"1.46"
"1.46.0"
"1.46.1"
"1.47"
"1.47.0"
"1.48"
"1.48.0"
"1.49"
"1.49.0"
"1.50"
"1.50.0"
"1.51"
"1.51.0"
"1.52"
"1.52.0"
"1.53"
"1.53.0"
"1.54"
"1.54.0"
"1.55"
"1.55.0"
"1.56"
"1.56.0"
"1.57"
"1.57.0"
"1.58"
"1.58.0"
"1.59"
"1.59.0"
"1.60"
"1.60.0"
"1.61"
"1.61.0"
"1.62"
"1.62.0"
"1.63"
"1.63.0"
"1.64.0"
"1.65.0"
"1.65.1"
"1.66.0"
"1.67.0"
"1.68.0"
"1.69.0"
)
"1.64.0"
"1.65.0"
"1.65.1"
"1.66.0"
"1.67.0"
"1.68.0"
"1.69.0"
"1.70.0"
)
set
(
Boost_USE_STATIC_LIBS OFF CACHE BOOL
"Use boost static libraries"
)
set
(
Boost_USE_MULTITHREADED OFF CACHE BOOL
"Use boost multithreaded libraries"
)
...
...
@@ -741,11 +741,10 @@ if ( WALBERLA_BUILD_WITH_PYTHON AND NOT WALBERLA_CXX_COMPILER_IS_MSVC)
endif
()
if
(
PYTHON_LIBRARY MATCHES
"python3"
)
find_library
(
BOOST_PYTHON_LIBRARY NAMES
boost_python36
${
_boost_MULTITHREADED
}
boost_python35
${
_boost_MULTITHREADED
}
boost_python-py36
${
_boost_MULTITHREADED
}
boost_python-py35
${
_boost_MULTITHREADED
}
boost_python37
${
_boost_MULTITHREADED
}
boost_python36
${
_boost_MULTITHREADED
}
boost_python35
${
_boost_MULTITHREADED
}
boost_python-py37
${
_boost_MULTITHREADED
}
boost_python-py36
${
_boost_MULTITHREADED
}
boost_python-py35
${
_boost_MULTITHREADED
}
boost_python-py34
${
_boost_MULTITHREADED
}
boost_python-py33
${
_boost_MULTITHREADED
}
boost_python-py32
${
_boost_MULTITHREADED
}
boost_python3
${
_boost_MULTITHREADED
}
boost_python3
${
_boost_MULTITHREADED
}
boost_python
${
_boost_MULTITHREADED
}
PATHS
${
Boost_LIBRARY_DIRS
}
NO_DEFAULT_PATH
)
else
()
...
...
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