diff options
| author | Johnathan Corgan | 2012-04-04 18:22:02 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-04-04 18:22:02 -0700 |
| commit | 2f73fe22c5e1591242a9556221ec8487170a7b00 (patch) | |
| tree | ad3920b28720ab845ccffa817be66d4bddbd63ff /gr-qtgui | |
| parent | 29c887da604206aa6f3ad1859f70958231a7a1cb (diff) | |
| parent | 71195397a2624cbc0cd144418fe958f436657be5 (diff) | |
| download | gnuradio-2f73fe22c5e1591242a9556221ec8487170a7b00.tar.gz gnuradio-2f73fe22c5e1591242a9556221ec8487170a7b00.tar.bz2 gnuradio-2f73fe22c5e1591242a9556221ec8487170a7b00.zip | |
Merge remote branch 'tom/cmake_builds' into next
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" ) |