diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2014-10-13 13:44:16 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2014-10-13 13:44:16 -0700 |
| commit | e6fe7162e8fd41eef2140529f0e1b8bcfbde0ae9 (patch) | |
| tree | 7d94201bf549a44cd9431acb51e037c69208e24c | |
| parent | 037ddca197674da611f2a8ffceab45e9134eb9bc (diff) | |
| parent | c80fcdb0b3955923625c9561302ac81612958bfc (diff) | |
Merge branch 'maint'
| -rw-r--r-- | cmake/Modules/FindOSS.cmake | 5 | ||||
| -rw-r--r-- | gr-dtv/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-utils/python/modtool/gr-newmod/CMakeLists.txt | 32 | ||||
| -rw-r--r-- | gr-wavelet/lib/CMakeLists.txt | 5 |
4 files changed, 38 insertions, 7 deletions
diff --git a/cmake/Modules/FindOSS.cmake b/cmake/Modules/FindOSS.cmake index 4c886de5f0..7470e7d622 100644 --- a/cmake/Modules/FindOSS.cmake +++ b/cmake/Modules/FindOSS.cmake @@ -4,6 +4,11 @@ # OSS_INCLUDE_DIR - where to find soundcard.h, etc. # OSS_FOUND - True if Oss found. +# OSS is not for APPLE or WINDOWS + +IF(APPLE OR WIN32) + RETURN() +ENDIF() FIND_PATH(LINUX_OSS_INCLUDE_DIR "linux/soundcard.h" "/usr/include" "/usr/local/include" diff --git a/gr-dtv/CMakeLists.txt b/gr-dtv/CMakeLists.txt index bccfff7886..fc7ab56bef 100644 --- a/gr-dtv/CMakeLists.txt +++ b/gr-dtv/CMakeLists.txt @@ -30,6 +30,9 @@ include(GrComponent) GR_REGISTER_COMPONENT("gr-dtv" ENABLE_GR_DTV Boost_FOUND ENABLE_GNURADIO_RUNTIME + ENABLE_GR_ANALOG + ENABLE_GR_FILTER + ENABLE_GR_FEC ) GR_SET_GLOBAL(GR_DTV_INCLUDE_DIRS diff --git a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt index 677144a984..0513f44086 100644 --- a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt +++ b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2011,2012 Free Software Foundation, Inc. +# Copyright 2011,2012,2014 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -17,7 +17,6 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. - ######################################################################## # Project setup ######################################################################## @@ -32,7 +31,8 @@ if(NOT CMAKE_BUILD_TYPE) endif(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "") -list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules) +#make sure our local CMake Modules path comes first +list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) ######################################################################## # Compiler specific setup @@ -81,6 +81,26 @@ set(GR_PKG_LIBEXEC_DIR ${GR_LIBEXEC_DIR}/${CMAKE_PROJECT_NAME}) set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks) ######################################################################## +# On Apple only, set install name and use rpath correctly, if not already set +######################################################################## +if(APPLE) + if(NOT CMAKE_INSTALL_NAME_DIR) + set(CMAKE_INSTALL_NAME_DIR + ${CMAKE_INSTALL_PREFIX}/${GR_LIBRARY_DIR} CACHE + PATH "Library Install Name Destination Directory" FORCE) + endif(NOT CMAKE_INSTALL_NAME_DIR) + if(NOT CMAKE_INSTALL_RPATH) + set(CMAKE_INSTALL_RPATH + ${CMAKE_INSTALL_PREFIX}/${GR_LIBRARY_DIR} CACHE + PATH "Library Install RPath" FORCE) + endif(NOT CMAKE_INSTALL_RPATH) + if(NOT CMAKE_BUILD_WITH_INSTALL_RPATH) + set(CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE + BOOL "Do Build Using Library Install RPath" FORCE) + endif(NOT CMAKE_BUILD_WITH_INSTALL_RPATH) +endif(APPLE) + +######################################################################## # Find gnuradio build dependencies ######################################################################## find_package(CppUnit) @@ -155,6 +175,10 @@ add_subdirectory(docs) ######################################################################## # Install cmake search helper for this library ######################################################################## +if(NOT CMAKE_MODULES_DIR) + set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake) +endif(NOT CMAKE_MODULES_DIR) + install(FILES cmake/Modules/howtoConfig.cmake - DESTINATION lib/cmake/howto + DESTINATION ${CMAKE_MODULES_DIR}/howto ) diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt index 85eab280c7..be2a7a8471 100644 --- a/gr-wavelet/lib/CMakeLists.txt +++ b/gr-wavelet/lib/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2012 Free Software Foundation, Inc. +# Copyright 2012,2014 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -45,7 +45,6 @@ endif(ENABLE_GR_CTRLPORT) include_directories(${LOG4CPP_INCLUDE_DIRS}) link_directories(${LOG4CPP_LIBRARY_DIRS}) - ######################################################################## # Setup library ######################################################################## @@ -82,7 +81,7 @@ add_library(gnuradio-wavelet SHARED ${gr_wavelet_sources}) target_link_libraries(gnuradio-wavelet ${wavelet_libs}) # we need -no-as-needed or else -lgslcblas gets stripped out on newer version of gcc -if(CMAKE_COMPILER_IS_GNUCC AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if(CMAKE_COMPILER_IS_GNUCC AND NOT APPLE) SET_TARGET_PROPERTIES(gnuradio-wavelet PROPERTIES LINK_FLAGS "-Wl,--no-as-needed") endif() |