diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-07-20 12:18:59 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-07-20 12:18:59 -0700 |
| commit | e5d050b39ad09cbac30b3ee889c54080468b5457 (patch) | |
| tree | 1f20f486ff4bb21f87e9a52645bb262def16f417 | |
| parent | 1dc62361a50c9dcabe6952f0422115f972894f96 (diff) | |
| parent | 8144572532b8bfa37af01e1264a334d2a898ea8d (diff) | |
Merge branch 'maint'
| -rw-r--r-- | cmake/Modules/GrPython.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/GrSwig.cmake | 2 | ||||
| -rw-r--r-- | gr-qtgui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPython.cmake | 4 | ||||
| -rw-r--r-- | gr-utils/python/modtool/gr-newmod/cmake/Modules/GrSwig.cmake | 2 | ||||
| -rw-r--r-- | gr-utils/python/modtool/gr-newmod/swig/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | volk/cmake/GrPython.cmake | 4 |
7 files changed, 10 insertions, 10 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}) diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt index b3a0271b44..a3a72dce43 100644 --- a/gr-qtgui/CMakeLists.txt +++ b/gr-qtgui/CMakeLists.txt @@ -26,7 +26,7 @@ find_package(Qt4 4.2.0 COMPONENTS QtCore QtGui) find_package(Qwt) -find_package(PythonLibs) +find_package(PythonLibs 2) include(GrPython) GR_PYTHON_CHECK_MODULE("PyQt4" PyQt4 True PYQT4_FOUND) diff --git a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPython.cmake b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPython.cmake index efdddf371f..68ca58e996 100644 --- a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPython.cmake +++ b/gr-utils/python/modtool/gr-newmod/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/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrSwig.cmake b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrSwig.cmake index 6ba5ee3a5c..569667b0e9 100644 --- a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrSwig.cmake +++ b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrSwig.cmake @@ -114,7 +114,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}) list(APPEND GR_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/gr-utils/python/modtool/gr-newmod/swig/CMakeLists.txt b/gr-utils/python/modtool/gr-newmod/swig/CMakeLists.txt index b9925ea06f..9aa1c51818 100644 --- a/gr-utils/python/modtool/gr-newmod/swig/CMakeLists.txt +++ b/gr-utils/python/modtool/gr-newmod/swig/CMakeLists.txt @@ -21,7 +21,7 @@ # Include swig generation macros ######################################################################## find_package(SWIG) -find_package(PythonLibs) +find_package(PythonLibs 2) if(NOT SWIG_FOUND OR NOT PYTHONLIBS_FOUND) return() endif() diff --git a/volk/cmake/GrPython.cmake b/volk/cmake/GrPython.cmake index eff9cbcdcb..2d81001798 100644 --- a/volk/cmake/GrPython.cmake +++ b/volk/cmake/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) |