diff options
| author | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-07-22 20:05:24 +0200 |
|---|---|---|
| committer | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-07-22 20:05:24 +0200 |
| commit | b196ee12c098a6cc069c48bc7b9cb720fa3caf6a (patch) | |
| tree | 9648b380b37a21ab3c226fc5d28f6b1be59e828c /cmake/Modules | |
| parent | e5f7b28093c10f05d272bcf12c6c4b6583af7021 (diff) | |
cmake: require Python v2 for build configuration
based on a gnuradio patch by Jiri Pinkava
http://gnuradio.org/cgit/gnuradio.git/commit/?id=8144572532b8bfa37af01e1264a334d2a898ea8d
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/GrPython.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/GrSwig.cmake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/Modules/GrPython.cmake b/cmake/Modules/GrPython.cmake index 791114e..26a5c94 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 8cf1265..f907a51 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}) |