diff options
| -rw-r--r-- | cmake/Modules/GrVersion.cmake | 18 | ||||
| -rw-r--r-- | gr-qtgui/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | gr-wxgui/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | grc/CMakeLists.txt | 2 |
4 files changed, 17 insertions, 22 deletions
diff --git a/cmake/Modules/GrVersion.cmake b/cmake/Modules/GrVersion.cmake index ed8fabddd..666c6f126 100644 --- a/cmake/Modules/GrVersion.cmake +++ b/cmake/Modules/GrVersion.cmake @@ -56,24 +56,6 @@ find_package(Git) #endif() ######################################################################## -# Parse the git describe string (currently unused) -######################################################################## -unset(GIT_TAG) -unset(GIT_SEQNO) -unset(GIT_COMMIT) - -if(GIT_DESCRIBE) - execute_process( - COMMAND ${PYTHON_EXECUTABLE} -c - "import re; print ';'.join(re.match('^v(.*)-(.*)-\\w(.*)$', '${GIT_DESCRIBE}').groups())" - OUTPUT_VARIABLE GIT_DESCRIBES OUTPUT_STRIP_TRAILING_WHITESPACE - ) - list(GET GIT_DESCRIBES 0 GIT_TAG) - list(GET GIT_DESCRIBES 1 GIT_SEQNO) - list(GET GIT_DESCRIBES 2 GIT_COMMIT) -endif(GIT_DESCRIBE) - -######################################################################## # Use the logic below to set the version constants ######################################################################## if("${MINOR_VERSION}" STREQUAL "git") diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt index 9caea38c7..6a9c39f9d 100644 --- a/gr-qtgui/CMakeLists.txt +++ b/gr-qtgui/CMakeLists.txt @@ -36,13 +36,20 @@ GR_PYTHON_CHECK_MODULE("PyQt4" PyQt4 True PYQT4_FOUND) # Register component ######################################################################## include(GrComponent) +if(NOT CMAKE_CROSSCOMPILING) + set(qt_gui_python_deps + PYQT4_FOUND + #we could check for pyqwt, but its not strictly required + ) +endif(NOT CMAKE_CROSSCOMPILING) + GR_REGISTER_COMPONENT("gr-qtgui" ENABLE_GR_QTGUI Boost_FOUND QT4_FOUND QWT_FOUND ENABLE_GR_CORE PYTHONLIBS_FOUND - PYQT4_FOUND + ${qt_gui_python_deps} ) GR_SET_GLOBAL(GR_QTGUI_INCLUDE_DIRS diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt index 5beb39f5e..7afae785a 100644 --- a/gr-wxgui/CMakeLists.txt +++ b/gr-wxgui/CMakeLists.txt @@ -29,11 +29,17 @@ GR_PYTHON_CHECK_MODULE("numpy" numpy True # Register component ######################################################################## include(GrComponent) +if(NOT CMAKE_CROSSCOMPILING) + set(wxgui_python_deps + NUMPY_FOUND + WX_FOUND + ) +endif(NOT CMAKE_CROSSCOMPILING) + GR_REGISTER_COMPONENT("gr-wxgui" ENABLE_GR_WXGUI ENABLE_GR_CORE ENABLE_PYTHON - NUMPY_FOUND - WX_FOUND + ${wxgui_python_deps} ) ######################################################################## diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index 340b8794c..2d108ab4d 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -34,6 +34,7 @@ GR_PYTHON_CHECK_MODULE("numpy" numpy True include(GrComponent) if(NOT CMAKE_CROSSCOMPILING) set(grc_python_deps + PYTHON_MIN_VER_FOUND CHEETAH_FOUND LXML_FOUND PYGTK_FOUND @@ -44,7 +45,6 @@ endif(NOT CMAKE_CROSSCOMPILING) GR_REGISTER_COMPONENT("gnuradio-companion" ENABLE_GRC ENABLE_GR_CORE ENABLE_PYTHON - PYTHON_MIN_VER_FOUND ${grc_python_deps} ) |