From e6ce0a256708ebf3b2da435382708278f69edf6a Mon Sep 17 00:00:00 2001
From: Olivier Stasse <ostasse@laas.fr>
Date: Tue, 1 May 2018 12:26:53 +0200
Subject: [PATCH] [cmake] Modifies main CMakeLists.txt to allow 3.5 python if
available.
---
CMakeLists.txt | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03f01554..be52e7ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,25 +52,40 @@ ELSE(WIN32)
SET(LINK create_symlink)
ENDIF(WIN32)
+
# ----------------------------------------------------
# --- OPTIONS ---------------------------------------
# ----------------------------------------------------
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 -----------------------------------
# ----------------------------------------------------
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()
# Add Boost path to include directories.
INCLUDE_DIRECTORIES(SYSTEM ${Boost_INCLUDE_DIRS})
-FINDPYTHON(2.7 EXACT REQUIRED)
-INCLUDE_DIRECTORIES(SYSTEM ${PYTHON_INCLUDE_DIRS})
-FIND_NUMPY()
-INCLUDE_DIRECTORIES(SYSTEM ${NUMPY_INCLUDE_DIRS})
+#FINDPYTHON(2.7 EXACT REQUIRED)
# ----------------------------------------------------
# --- INCLUDE ----------------------------------------
--
GitLab