diff options
| author |   Andrej Rode <mail@andrejro.de> | 2019-03-10 23:08:02 +0100 |
|---|---|---|
| committer | Andrej Rode <mail@andrejro.de> | 2019-03-11 00:05:04 +0100 |
| commit | f760c6ff55572d27e2746a62c069e021db357248 (patch) | |
| tree | 29c175aa70d421f6aed284c02865c83307965550 | |
| parent | cmake: use TargetConfig in GnuradioConfig (diff) | |
| download | gnuradio-f760c6ff55572d27e2746a62c069e021db357248.tar.xz gnuradio-f760c6ff55572d27e2746a62c069e021db357248.zip | |
cmake: leave ENABLE_PYTHON and ENABLE_GRC user configurable by OOTs
Initialize Python before include gnuradio-runtime
This allows to provide the GR_CHECK_PYTHON_MODULE function
to be available before Thrift tries to use it.
Consequently the include(GrPython) was removed from FindTHRIFT
| -rw-r--r-- | cmake/Modules/FindTHRIFT.cmake | 1 | ||||
| -rw-r--r-- | cmake/Modules/GnuradioConfig.cmake.in | 16 |
2 files changed, 9 insertions, 8 deletions
diff --git a/cmake/Modules/FindTHRIFT.cmake b/cmake/Modules/FindTHRIFT.cmake index 3aa2bf2ce..970a9c4c3 100644 --- a/cmake/Modules/FindTHRIFT.cmake +++ b/cmake/Modules/FindTHRIFT.cmake @@ -65,7 +65,6 @@ endif(THRIFT_VERSION VERSION_LESS THRIFT_REQ_VERSION) IF (CMAKE_CROSSCOMPILING) SET(PYTHON_THRIFT_FOUND TRUE) ELSE (CMAKE_CROSSCOMPILING) - include(GrPython) GR_PYTHON_CHECK_MODULE("Thrift" thrift "1" PYTHON_THRIFT_FOUND) ENDIF (CMAKE_CROSSCOMPILING) diff --git a/cmake/Modules/GnuradioConfig.cmake.in b/cmake/Modules/GnuradioConfig.cmake.in index ad7b2a5e3..832e8fcca 100644 --- a/cmake/Modules/GnuradioConfig.cmake.in +++ b/cmake/Modules/GnuradioConfig.cmake.in @@ -34,6 +34,12 @@ find_dependency(Boost "@Boost_MAJOR_VERSION@.@Boost_MINOR_VERSION@.@Boost_SUBMIN unit_test_framework ) find_dependency(Volk) +set(ENABLE_PYTHON @ENABLE_PYTHON@ CACHE BOOL "Enable Python & SWIG") +if(${ENABLE_PYTHON}) + set(PYTHON_EXECUTABLE @PYTHON_EXECUTABLE@) + set(GR_PYTHON_DIR @GR_PYTHON_DIR@) + include(GrPython) +endif() include("${CMAKE_CURRENT_LIST_DIR}/gnuradio-pmtConfig.cmake") include("${CMAKE_CURRENT_LIST_DIR}/gnuradio-runtimeConfig.cmake") @@ -41,18 +47,15 @@ cmake_policy(SET CMP0012 NEW) cmake_policy(SET CMP0057 NEW) #Can't use Python if GNU Radio was built without support for it -set(ENABLE_PYTHON @ENABLE_PYTHON@) -if(@ENABLE_PYTHON@) +if(${ENABLE_PYTHON}) include("${CMAKE_CURRENT_LIST_DIR}/runtime_swigTargets.cmake") - set(PYTHON_EXECUTABLE @PYTHON_EXECUTABLE@) - set(GR_PYTHON_DIR @GR_PYTHON_DIR@) endif() # Propagate the enabledness of GRC: # Since GRC doesn't contain proper CMake targets (yet?), we need to do this # manually -set(GR_ENABLE_GRC @GR_ENABLE_GRC@) -if(@GR_ENABLE_GRC@) +set(ENABLE_GRC @ENABLE_GRC@ CACHE BOOL "Enable GRC features (export block YAML)") +if(@ENABLE_GRC@) set(GRC_BLOCKS_DIR "@GRC_BLOCKS_DIR@") endif() # Same for a few "special" features. @@ -60,7 +63,6 @@ set(GR_PERFORMANCE_COUNTERS @GR_PERFORMANCE_COUNTERS@) set(GR_CTRLPORT @GR_CTRLPORT@) set(GR_RPCSERVER_ENABLED @GR_RPCSERVER_ENABLED@) set(ENABLE_CTRLPORT_THRIFT @ENABLE_CTRLPORT_THRIFT@) -set(THRIFT_FOUND @THRIFT_FOUND@) set(GR_RPCSERVER_THRIFT @GR_RPCSERVER_THRIFT@) # Propagate global options |