From 2b24eb77418b56428a854535a93eb6672fc9963b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Chr=C3=A9tien?= Date: Mon, 9 Dec 2013 16:49:09 +0100 Subject: [PATCH 1/2] [jrl-cmakemodules] Synchronize --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 6fa5e19..74528c9 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 6fa5e19f5765c9955502c23bb338d64c29a2c9e4 +Subproject commit 74528c9829ca4e2bbeb3ed3605c2d686cceac7e0 From 5b4cb4b0bc305e4192e13f03405540dc1672410c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Chr=C3=A9tien?= Date: Mon, 9 Dec 2013 16:53:45 +0100 Subject: [PATCH 2/2] Fix CMakeLists for systems with Python 2.7 and Python 3. --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0e6ffb..468ddde 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,8 @@ SETUP_PROJECT() SEARCH_FOR_BOOST() ADD_REQUIRED_DEPENDENCY("roboptim-core >= 0.5") -# Look for Python. +# Look for Python 2.7 +SET(Python_ADDITIONAL_VERSIONS 2.7) FINDPYTHON() # Detect numpy.