diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-04-04 18:22:02 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-04-04 18:22:02 -0700 |
| commit | 2f73fe22c5e1591242a9556221ec8487170a7b00 (patch) | |
| tree | ad3920b28720ab845ccffa817be66d4bddbd63ff /gr-fcd | |
| parent | 29c887da604206aa6f3ad1859f70958231a7a1cb (diff) | |
| parent | 71195397a2624cbc0cd144418fe958f436657be5 (diff) | |
Merge remote branch 'tom/cmake_builds' into next
Diffstat (limited to 'gr-fcd')
| -rw-r--r-- | gr-fcd/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | gr-fcd/examples/c++/CMakeLists.txt (renamed from gr-fcd/examples/CMakeLists.txt) | 12 | ||||
| -rw-r--r-- | gr-fcd/examples/c++/fcd_nfm_rx.cc (renamed from gr-fcd/examples/fcd_nfm_rx.cc) | 0 | ||||
| -rw-r--r-- | gr-fcd/examples/grc/CMakeLists.txt | 26 | ||||
| -rw-r--r-- | gr-fcd/examples/grc/fcd_apt_rx.grc (renamed from gr-fcd/examples/fcd_apt_rx.grc) | 0 | ||||
| -rw-r--r-- | gr-fcd/examples/grc/fcd_fft_wx.grc (renamed from gr-fcd/examples/fcd_fft_wx.grc) | 0 | ||||
| -rw-r--r-- | gr-fcd/examples/grc/fcd_nfm_rx.grc (renamed from gr-fcd/examples/fcd_nfm_rx.grc) | 0 |
7 files changed, 38 insertions, 12 deletions
diff --git a/gr-fcd/CMakeLists.txt b/gr-fcd/CMakeLists.txt index e454c01fad..10dd8b8cd5 100644 --- a/gr-fcd/CMakeLists.txt +++ b/gr-fcd/CMakeLists.txt @@ -51,6 +51,8 @@ GR_SET_GLOBAL(GR_FCD_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include/fcd ) +SET(GR_PKG_FCD_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/fcd) + ######################################################################## # Begin conditional configuration ######################################################################## @@ -83,6 +85,13 @@ CPACK_COMPONENT("fcd_python" DEPENDS "core_python;fcd_runtime" ) +CPACK_COMPONENT("fcd_examples" + GROUP "FCD" + DISPLAY_NAME "Examples" + DESCRIPTION "Example programs" + DEPENDS "fcd_runtime" +) + CPACK_COMPONENT("fcd_swig" GROUP "FCD" DISPLAY_NAME "SWIG" @@ -99,8 +108,9 @@ if(ENABLE_PYTHON) add_subdirectory(swig) add_subdirectory(python) add_subdirectory(grc) + add_subdirectory(examples/grc) endif(ENABLE_PYTHON) -add_subdirectory(examples) +add_subdirectory(examples/c++) add_subdirectory(doc) ######################################################################## diff --git a/gr-fcd/examples/CMakeLists.txt b/gr-fcd/examples/c++/CMakeLists.txt index 477a6311b8..05574f4a8c 100644 --- a/gr-fcd/examples/CMakeLists.txt +++ b/gr-fcd/examples/c++/CMakeLists.txt @@ -26,16 +26,6 @@ target_link_libraries(fcd_nfm_rx gnuradio-fcd) INSTALL(TARGETS fcd_nfm_rx - DESTINATION ${GR_PKG_DATA_DIR}/examples/fcd + DESTINATION ${GR_PKG_FCD_EXAMPLES_DIR} COMPONENT "fcd_examples" ) - -if(ENABLE_PYTHON) - INSTALL(FILES - fcd_apt_rx.grc - fcd_fft_wx.grc - fcd_nfm_rx.grc - DESTINATION ${GR_PKG_DATA_DIR}/examples/fcd - COMPONENT "fcd_examples" - ) -endif() diff --git a/gr-fcd/examples/fcd_nfm_rx.cc b/gr-fcd/examples/c++/fcd_nfm_rx.cc index 97ef7cf193..97ef7cf193 100644 --- a/gr-fcd/examples/fcd_nfm_rx.cc +++ b/gr-fcd/examples/c++/fcd_nfm_rx.cc diff --git a/gr-fcd/examples/grc/CMakeLists.txt b/gr-fcd/examples/grc/CMakeLists.txt new file mode 100644 index 0000000000..e33fdf1825 --- /dev/null +++ b/gr-fcd/examples/grc/CMakeLists.txt @@ -0,0 +1,26 @@ +# Copyright 2012 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. + +INSTALL(FILES + fcd_apt_rx.grc + fcd_fft_wx.grc + fcd_nfm_rx.grc + DESTINATION ${GR_PKG_FCD_EXAMPLES_DIR} + COMPONENT "fcd_examples" +)
\ No newline at end of file diff --git a/gr-fcd/examples/fcd_apt_rx.grc b/gr-fcd/examples/grc/fcd_apt_rx.grc index c4d3e64d1a..c4d3e64d1a 100644 --- a/gr-fcd/examples/fcd_apt_rx.grc +++ b/gr-fcd/examples/grc/fcd_apt_rx.grc diff --git a/gr-fcd/examples/fcd_fft_wx.grc b/gr-fcd/examples/grc/fcd_fft_wx.grc index c045bbfa24..c045bbfa24 100644 --- a/gr-fcd/examples/fcd_fft_wx.grc +++ b/gr-fcd/examples/grc/fcd_fft_wx.grc diff --git a/gr-fcd/examples/fcd_nfm_rx.grc b/gr-fcd/examples/grc/fcd_nfm_rx.grc index 9dac3fcb85..9dac3fcb85 100644 --- a/gr-fcd/examples/fcd_nfm_rx.grc +++ b/gr-fcd/examples/grc/fcd_nfm_rx.grc |