From 8d15889248d1cbddf0581d857ff3f8ebbbf0dda5 Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Wed, 24 Jul 2019 18:36:11 +0200
Subject: [PATCH] Add CMake variable to choose Python version.
---
CMakeLists.txt | 6 ++++++
src/CMakeLists.txt | 3 ---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22991513..e778048e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,12 @@ IF (HPP_DEBUG)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHPP_DEBUG")
ENDIF()
+# search for python
+IF(NOT DEFINED PYTHON_DESIRED_VERSION)
+ SET(PYTHON_DESIRED_VERSION 2.7)
+ENDIF()
+FINDPYTHON(${PYTHON_DESIRED_VERSION} EXACT)
+
ADD_DOC_DEPENDENCY("hpp-core >= 4.3")
ADD_REQUIRED_DEPENDENCY("hpp-corbaserver >= 4.3")
ADD_REQUIRED_DEPENDENCY("hpp-rbprm >= 4.3")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e92f9596..05caec46 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,9 +24,6 @@ OMNIIDL_INCLUDE_DIRECTORIES(
${HPP_CORBASERVER_DATAROOTDIR}/idl ${CMAKE_SOURCE_DIR}/idl
)
-# search for python
-FINDPYTHON(2.7 EXACT REQUIRED)
-
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src)
FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/hpp/corbaserver/rbprm)
--
GitLab