Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
ac07cffa
You need to sign in or sign up before continuing.
Commit
ac07cffa
authored
Mar 07, 2015
by
Davis King
Browse files
Made the search for boost-python a little more robust
parent
ee2fc4a7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
13 deletions
+6
-13
dlib/add_python_module
dlib/add_python_module
+6
-13
No files found.
dlib/add_python_module
View file @
ac07cffa
...
@@ -17,18 +17,6 @@
...
@@ -17,18 +17,6 @@
# A list of various paths you need to search on windows since people install
# boost in a bunch of different places.
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}
C:/local/boost_*
C:/Program\ Files\ \(x86\)/boost/boost_*
C:/Program\ Files/boost/boost_*
)
set(BOOST_LIBRARYDIR ${BOOST_LIBRARYDIR} $ENV{BOOST_LIBRARYDIR}
C:/local/boost_*/lib32-msvc-*
)
#SET(Boost_USE_STATIC_LIBS OFF)
#SET(Boost_USE_STATIC_LIBS OFF)
#SET(Boost_USE_MULTITHREADED ON)
#SET(Boost_USE_MULTITHREADED ON)
...
@@ -40,7 +28,12 @@ if (NOT WIN32)
...
@@ -40,7 +28,12 @@ if (NOT WIN32)
/usr/lib/x86_64-linux-gnu/)
/usr/lib/x86_64-linux-gnu/)
endif()
endif()
if (PYTHON3)
if (PYTHON3)
FIND_PACKAGE(Boost 1.41.0 COMPONENTS python-py34 REQUIRED)
# on Some systems the boost python3 module is called python-py34 so check for that one.
FIND_PACKAGE(Boost 1.41.0 COMPONENTS python-py34 )
if (NOT Boost_FOUND)
# But if you don't find it then try looking for a module called python.
FIND_PACKAGE(Boost 1.41.0 COMPONENTS python REQUIRED)
endif()
FIND_PACKAGE(PythonLibs 3.4 REQUIRED)
FIND_PACKAGE(PythonLibs 3.4 REQUIRED)
else()
else()
FIND_PACKAGE(Boost 1.41.0 COMPONENTS python REQUIRED)
FIND_PACKAGE(Boost 1.41.0 COMPONENTS python REQUIRED)
...
...
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