Skip to content
Snippets Groups Projects
Commit e6ce0a25 authored by Olivier Stasse's avatar Olivier Stasse
Browse files

[cmake] Modifies main CMakeLists.txt to allow 3.5 python if available.

parent 44aa2fde
No related branches found
No related tags found
No related merge requests found
...@@ -52,25 +52,40 @@ ELSE(WIN32) ...@@ -52,25 +52,40 @@ ELSE(WIN32)
SET(LINK create_symlink) SET(LINK create_symlink)
ENDIF(WIN32) ENDIF(WIN32)
# ---------------------------------------------------- # ----------------------------------------------------
# --- OPTIONS --------------------------------------- # --- OPTIONS ---------------------------------------
# ---------------------------------------------------- # ----------------------------------------------------
OPTION (BUILD_UNIT_TESTS "Build the unitary tests" ON) OPTION (BUILD_UNIT_TESTS "Build the unitary tests" ON)
SET(Python_ADDITIONAL_VERSIONS 3.5)
FINDPYTHON()
INCLUDE_DIRECTORIES(SYSTEM ${PYTHON_INCLUDE_DIRS})
FIND_NUMPY()
INCLUDE_DIRECTORIES(SYSTEM ${NUMPY_INCLUDE_DIRS})
# ---------------------------------------------------- # ----------------------------------------------------
# --- DEPENDANCIES ----------------------------------- # --- DEPENDANCIES -----------------------------------
# ---------------------------------------------------- # ----------------------------------------------------
ADD_REQUIRED_DEPENDENCY("eigen3 >= 3.0.5") ADD_REQUIRED_DEPENDENCY("eigen3 >= 3.0.5")
SET(BOOST_COMPONENTS python) if (${PYTHON_VERSION_MAJOR} EQUAL 3)
if(UNIX)
set( BOOST_COMPONENTS python-py35)
else()
set( BOOST_COMPONENTS python3)
endif()
else()
SET(BOOST_COMPONENTS python)
endif()
SEARCH_FOR_BOOST() SEARCH_FOR_BOOST()
# Add Boost path to include directories. # Add Boost path to include directories.
INCLUDE_DIRECTORIES(SYSTEM ${Boost_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(SYSTEM ${Boost_INCLUDE_DIRS})
FINDPYTHON(2.7 EXACT REQUIRED) #FINDPYTHON(2.7 EXACT REQUIRED)
INCLUDE_DIRECTORIES(SYSTEM ${PYTHON_INCLUDE_DIRS})
FIND_NUMPY()
INCLUDE_DIRECTORIES(SYSTEM ${NUMPY_INCLUDE_DIRS})
# ---------------------------------------------------- # ----------------------------------------------------
# --- INCLUDE ---------------------------------------- # --- INCLUDE ----------------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment