diff options
| author | Josh Blum <josh@joshknows.com> | 2011-09-28 22:16:41 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-09-28 22:16:41 -0700 |
| commit | 3f7db0afa99caeecb18428d7514dadd380d88d56 (patch) | |
| tree | b513683057e96d03ff8138100d6059d80e7b3265 /gr-howto-write-a-block-cmake | |
| parent | 60fd23a703bb16065717159bdd5ec9edf03d7302 (diff) | |
| parent | 9e73c4e8372bc581d686d5e82a808894d41523ec (diff) | |
Merge branch 'next' into digital
Conflicts:
gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
gnuradio-core/src/lib/general/general.i
gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc
gnuradio-core/src/lib/general/gr_pll_freqdet_cf.cc
gnuradio-core/src/lib/general/gr_pll_refout_cc.cc
gnuradio-core/src/python/gnuradio/gr/qa_pll_carriertracking.py
gnuradio-core/src/python/gnuradio/gr/qa_pll_freqdet.py
gnuradio-core/src/python/gnuradio/gr/qa_pll_refout.py
Diffstat (limited to 'gr-howto-write-a-block-cmake')
4 files changed, 12 insertions, 11 deletions
diff --git a/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake b/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake index f76364acfd..ffa6582a26 100644 --- a/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake +++ b/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake @@ -1,11 +1,11 @@ INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(GNURADIO_CORE gnuradio-core) -IF(NOT GNURADIO_CORE_FOUND) +PKG_CHECK_MODULES(PC_GNURADIO_CORE gnuradio-core QUIET) FIND_PATH( GNURADIO_CORE_INCLUDE_DIRS NAMES gr_random.h HINTS $ENV{GNURADIO_CORE_DIR}/include/gnuradio + ${PC_GNURADIO_CORE_INCLUDE_DIRS} PATHS /usr/local/include/gnuradio /usr/include/gnuradio ) @@ -14,6 +14,7 @@ FIND_LIBRARY( GNURADIO_CORE_LIBRARIES NAMES gnuradio-core HINTS $ENV{GNURADIO_CORE_DIR}/lib + ${PC_GNURADIO_CORE_LIBRARIES} PATHS /usr/local/lib /usr/local/lib64 /usr/lib @@ -22,5 +23,4 @@ FIND_LIBRARY( INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_CORE DEFAULT_MSG GNURADIO_CORE_LIBRARIES GNURADIO_CORE_INCLUDE_DIRS) - -ENDIF(NOT GNURADIO_CORE_FOUND) +MARK_AS_ADVANCED(GNURADIO_CORE_LIBRARIES GNURADIO_CORE_INCLUDE_DIRS) diff --git a/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake b/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake index c142c905ef..3c21af91de 100644 --- a/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake +++ b/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake @@ -1,11 +1,11 @@ INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(GRUEL gnuradio-core) -IF(NOT GRUEL_FOUND) +PKG_CHECK_MODULES(PC_GRUEL gnuradio-core QUIET) FIND_PATH( GRUEL_INCLUDE_DIRS NAMES gruel/attributes.h HINTS $ENV{GRUEL_DIR}/include + ${PC_GRUEL_INCLUDE_DIRS} PATHS /usr/local/include /usr/include ) @@ -14,6 +14,7 @@ FIND_LIBRARY( GRUEL_LIBRARIES NAMES gruel HINTS $ENV{GRUEL_DIR}/lib + ${PC_GRUEL_LIBRARIES} PATHS /usr/local/lib /usr/local/lib64 /usr/lib @@ -22,5 +23,4 @@ FIND_LIBRARY( INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(GRUEL DEFAULT_MSG GRUEL_LIBRARIES GRUEL_INCLUDE_DIRS) - -ENDIF(NOT GRUEL_FOUND) +MARK_AS_ADVANCED(GRUEL_LIBRARIES GRUEL_INCLUDE_DIRS) diff --git a/gr-howto-write-a-block-cmake/lib/CMakeLists.txt b/gr-howto-write-a-block-cmake/lib/CMakeLists.txt index 798bc6ad62..a2b6da9507 100644 --- a/gr-howto-write-a-block-cmake/lib/CMakeLists.txt +++ b/gr-howto-write-a-block-cmake/lib/CMakeLists.txt @@ -30,9 +30,9 @@ SET_TARGET_PROPERTIES(gnuradio-howto PROPERTIES DEFINE_SYMBOL "gnuradio_howto_EX # Install built library files ######################################################################## INSTALL(TARGETS gnuradio-howto - LIBRARY DESTINATION ${LIB_SUFFIX}/lib # .so/.dylib file - ARCHIVE DESTINATION ${LIB_SUFFIX}/lib # .lib file - RUNTIME DESTINATION bin # .dll file + LIBRARY DESTINATION lib${LIB_SUFFIX} # .so/.dylib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file + RUNTIME DESTINATION bin # .dll file ) ######################################################################## diff --git a/gr-howto-write-a-block-cmake/swig/CMakeLists.txt b/gr-howto-write-a-block-cmake/swig/CMakeLists.txt index 40f2b1051e..fdf8d8c482 100644 --- a/gr-howto-write-a-block-cmake/swig/CMakeLists.txt +++ b/gr-howto-write-a-block-cmake/swig/CMakeLists.txt @@ -26,6 +26,7 @@ IF(NOT SWIG_FOUND OR NOT PYTHONLIBS_FOUND) RETURN() ENDIF() INCLUDE(GrSwig) +INCLUDE(GrPython) ######################################################################## # Setup swig generation |