diff options
| author | Sylvain Munaut <tnt@246tNt.com> | 2013-07-26 21:04:57 +0200 |
|---|---|---|
| committer | Sylvain Munaut <tnt@246tNt.com> | 2013-07-26 21:04:57 +0200 |
| commit | 27c5af81f9bdc2835309869f9298a5a5513b725e (patch) | |
| tree | 99359c62a61eb1e42c9f6022a5850e55982d049f | |
| parent | 0eb60d386565c96399bfaf3cd768ae5306ebf10d (diff) | |
build: Force cmake to find PythonInterp and PythonLibs v2.x
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
| -rw-r--r-- | cmake/Modules/GrPython.cmake | 2 | ||||
| -rw-r--r-- | cmake/Modules/GrSwig.cmake | 2 | ||||
| -rw-r--r-- | swig/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmake/Modules/GrPython.cmake b/cmake/Modules/GrPython.cmake index 791114e..2ba571d 100644 --- a/cmake/Modules/GrPython.cmake +++ b/cmake/Modules/GrPython.cmake @@ -36,7 +36,7 @@ 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) 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}) diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt index 23800fc..bac10ad 100644 --- a/swig/CMakeLists.txt +++ b/swig/CMakeLists.txt @@ -21,7 +21,7 @@ # Setup swig generation ######################################################################## find_package(SWIG) -find_package(PythonLibs) +find_package(PythonLibs 2) if(NOT SWIG_FOUND OR NOT PYTHONLIBS_FOUND) return() endif() |