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
28247609
Commit
28247609
authored
Sep 27, 2015
by
Davis King
Browse files
Made the search for pyhton3 libraries more robust.
parent
a80aaf18
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
dlib/add_python_module
dlib/add_python_module
+8
-2
No files found.
dlib/add_python_module
View file @
28247609
...
@@ -55,10 +55,14 @@ if (NOT WIN32)
...
@@ -55,10 +55,14 @@ if (NOT WIN32)
/usr/lib/x86_64-linux-gnu/)
/usr/lib/x86_64-linux-gnu/)
endif()
endif()
if (PYTHON3)
if (PYTHON3)
# on Some systems the boost python3 module is called python-py34 so check for that one.
# On some systems the boost python3 module is called python-py34 so check
# for that one. Then if you don't find that then look for a few other
# names before findly trying just "python".
FIND_PACKAGE(Boost 1.41.0 COMPONENTS python-py34 )
FIND_PACKAGE(Boost 1.41.0 COMPONENTS python-py34 )
if (NOT Boost_FOUND)
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 python3)
endif()
if (NOT Boost_FOUND)
FIND_PACKAGE(Boost 1.41.0 COMPONENTS python)
FIND_PACKAGE(Boost 1.41.0 COMPONENTS python)
endif()
endif()
FIND_PACKAGE(PythonLibs 3.4 REQUIRED)
FIND_PACKAGE(PythonLibs 3.4 REQUIRED)
...
@@ -117,6 +121,8 @@ else()
...
@@ -117,6 +121,8 @@ else()
INCLUDE_DIRECTORIES("${PYTHON_INCLUDE_DIRS}" )
INCLUDE_DIRECTORIES("${PYTHON_INCLUDE_DIRS}" )
endif()
endif()
message(STATUS "USING BOOST_LIBS: ${Boost_LIBRARIES}")
message(STATUS "USING PYTHON_LIBS: ${PYTHON_LIBRARIES}")
if (CMAKE_COMPILER_IS_GNUCXX)
if (CMAKE_COMPILER_IS_GNUCXX)
# Just setting CMAKE_POSITION_INDEPENDENT_CODE should be enough to set
# Just setting CMAKE_POSITION_INDEPENDENT_CODE should be enough to set
...
...
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