From 9d5c46e9ff753d750794d79e17ca04fd46e83d3a Mon Sep 17 00:00:00 2001
From: jcarpent <jcarpent@laas.fr>
Date: Thu, 30 Jun 2016 11:58:44 +0200
Subject: [PATCH] [CMake] Clean dependancies section
---
CMakeLists.txt | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc48de73..f32ef3b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,11 +57,16 @@ ENDIF(EIGEN_NUMPY_ALIGNED)
# --- DEPENDANCIES -----------------------------------
# ----------------------------------------------------
ADD_REQUIRED_DEPENDENCY("eigen3 >= 3.0.5")
+
SET(BOOST_COMPONENTS python)
SEARCH_FOR_BOOST()
-set(Python_ADDITIONAL_VERSIONS 2.7)
-FINDPYTHON()
+# Add Boost path to include directories.
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+
+FINDPYTHON(2.7 EXACT REQUIRED)
+INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
FIND_NUMPY()
+INCLUDE_DIRECTORIES(${NUMPY_INCLUDE_DIRS})
# ----------------------------------------------------
# --- INCLUDE ----------------------------------------
@@ -99,9 +104,6 @@ ENDFOREACH(header)
# ----------------------------------------------------
# --- TARGETS ----------------------------------------
# ----------------------------------------------------
-INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIRS})
-# Add Boost path to include directories.
-INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
SET(${PROJECT_NAME}_SOURCES
src/exception.cpp
--
GitLab