summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorJiri Pinkava <j-pi@seznam.cz>2013-07-19 20:03:58 +0200
committerJohnathan Corgan <johnathan@corganlabs.com>2013-07-20 12:13:26 -0700
commit8144572532b8bfa37af01e1264a334d2a898ea8d (patch)
treed03ac5603a49827a98ec8189a2ac69304ff19042 /cmake
parentbc14dc822294eb9d562174eed2db888d88f6314d (diff)
build: require Python v2 for build configuration
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Modules/GrPython.cmake4
-rw-r--r--cmake/Modules/GrSwig.cmake2
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/Modules/GrPython.cmake b/cmake/Modules/GrPython.cmake
index 791114e052..26a5c9452b 100644
--- a/cmake/Modules/GrPython.cmake
+++ b/cmake/Modules/GrPython.cmake
@@ -36,11 +36,11 @@ if(PYTHON_EXECUTABLE)
else(PYTHON_EXECUTABLE)
#use the built-in find script
- find_package(PythonInterp)
+ find_package(PythonInterp 2)
#and if that fails use the find program routine
if(NOT PYTHONINTERP_FOUND)
- find_program(PYTHON_EXECUTABLE NAMES python python2.7 python2.6 python2.5)
+ find_program(PYTHON_EXECUTABLE NAMES python python2 python2.7 python2.6 python2.5)
if(PYTHON_EXECUTABLE)
set(PYTHONINTERP_FOUND TRUE)
endif(PYTHON_EXECUTABLE)
diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake
index 8cf1265411..f907a5149a 100644
--- a/cmake/Modules/GrSwig.cmake
+++ b/cmake/Modules/GrSwig.cmake
@@ -127,7 +127,7 @@ macro(GR_SWIG_MAKE name)
endif()
#append additional include directories
- find_package(PythonLibs)
+ find_package(PythonLibs 2)
list(APPEND GR_SWIG_INCLUDE_DIRS ${PYTHON_INCLUDE_PATH}) #deprecated name (now dirs)
list(APPEND GR_SWIG_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})