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-qtgui | |
| 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-qtgui')
| -rw-r--r-- | gr-qtgui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-qtgui/examples/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt index a8fead401..32bf5bfcb 100644 --- a/gr-qtgui/CMakeLists.txt +++ b/gr-qtgui/CMakeLists.txt @@ -57,6 +57,8 @@ GR_SET_GLOBAL(GR_QTGUI_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/lib ) +SET(GR_PKG_QTGUI_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/qt-gui) + ######################################################################## # Begin conditional configuration ######################################################################## diff --git a/gr-qtgui/examples/CMakeLists.txt b/gr-qtgui/examples/CMakeLists.txt index 30fdc5e75..4622bec29 100644 --- a/gr-qtgui/examples/CMakeLists.txt +++ b/gr-qtgui/examples/CMakeLists.txt @@ -24,6 +24,6 @@ GR_PYTHON_INSTALL(PROGRAMS pyqt_example_f.py pyqt_time_c.py pyqt_time_f.py - DESTINATION ${GR_PKG_DATA_DIR}/examples/qt-gui - COMPONENT "gnuradio_examples" + DESTINATION ${GR_PKG_QTGUI_EXAMPLES_DIR} + COMPONENT "qtgui_python" ) |