diff options
| author | Tom Rondeau | 2012-04-03 17:52:55 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2012-04-03 17:52:55 -0400 |
| commit | 7c6361c85a00517b9781d4cd4f2c2e3bdda67035 (patch) | |
| tree | 46787f5b358a4f92ac617d0dcabeccb72bcadee7 /gr-digital | |
| parent | 0c1b35d17e9aa5058f58fd8763bb292613b3658a (diff) | |
| parent | 7dc08ba2875c0dace0432cd514add6ce2b085f44 (diff) | |
| download | gnuradio-7c6361c85a00517b9781d4cd4f2c2e3bdda67035.tar.gz gnuradio-7c6361c85a00517b9781d4cd4f2c2e3bdda67035.tar.bz2 gnuradio-7c6361c85a00517b9781d4cd4f2c2e3bdda67035.zip | |
Merge branch 'rm_python_ext' into cmake_builds
Conflicts:
CMakeLists.txt
Diffstat (limited to 'gr-digital')
| -rw-r--r-- | gr-digital/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-digital/examples/CMakeLists.txt | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt index 099af0869..eb7ed67e1 100644 --- a/gr-digital/CMakeLists.txt +++ b/gr-digital/CMakeLists.txt @@ -39,6 +39,8 @@ GR_SET_GLOBAL(GR_DIGITAL_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/swig ) +SET(GR_PKG_DIGITAL_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/digital) + ######################################################################## # Begin conditional configuration ######################################################################## diff --git a/gr-digital/examples/CMakeLists.txt b/gr-digital/examples/CMakeLists.txt index 5c652fc83..12fca6009 100644 --- a/gr-digital/examples/CMakeLists.txt +++ b/gr-digital/examples/CMakeLists.txt @@ -26,7 +26,7 @@ GR_PYTHON_INSTALL(PROGRAMS run_length.py gen_whitener.py snr_estimators.py - DESTINATION ${GR_PKG_DATA_DIR}/examples/digital + DESTINATION ${GR_PKG_DIGITAL_EXAMPLES_DIR} COMPONENT "digital_python" ) @@ -41,7 +41,7 @@ GR_PYTHON_INSTALL(PROGRAMS narrowband/digital_bert_rx.py narrowband/digital_bert_tx.py narrowband/tunnel.py - DESTINATION ${GR_PKG_DATA_DIR}/examples/digital/narrowband + DESTINATION ${GR_PKG_DIGITAL_EXAMPLES_DIR}/narrowband COMPONENT "digital_python" ) @@ -55,6 +55,6 @@ GR_PYTHON_INSTALL(PROGRAMS ofdm/transmit_path.py ofdm/tunnel.py ofdm/uhd_interface.py - DESTINATION ${GR_PKG_DATA_DIR}/examples/digital/ofdm + DESTINATION ${GR_PKG_DIGITAL_EXAMPLES_DIR}/ofdm COMPONENT "digital_python" ) |