diff options
| -rw-r--r-- | gnuradio-core/src/lib/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/filter/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | gr-audio/lib/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | gr-vocoder/lib/codec2/kiss_fft.h | 1 |
4 files changed, 12 insertions, 6 deletions
diff --git a/gnuradio-core/src/lib/CMakeLists.txt b/gnuradio-core/src/lib/CMakeLists.txt index 3812167e60..10752ecd89 100644 --- a/gnuradio-core/src/lib/CMakeLists.txt +++ b/gnuradio-core/src/lib/CMakeLists.txt @@ -67,6 +67,8 @@ ADD_LIBRARY(gnuradio-core SHARED ${gnuradio_core_sources}) TARGET_LINK_LIBRARIES(gnuradio-core ${gnuradio_core_libs}) SET_TARGET_PROPERTIES(gnuradio-core PROPERTIES DEFINE_SYMBOL "gnuradio_core_EXPORTS") SET_TARGET_PROPERTIES(gnuradio-core PROPERTIES SOVERSION ${LIBVER}) +#avoid fftw and gsl link in dependent libraries: +SET_TARGET_PROPERTIES(gnuradio-core PROPERTIES LINK_INTERFACE_LIBRARIES "gruel") INSTALL(TARGETS gnuradio-core LIBRARY DESTINATION ${GR_LIBRARY_DIR} COMPONENT "core_runtime" # .so/.dylib file @@ -78,7 +80,7 @@ INSTALL(TARGETS gnuradio-core # Setup executables ######################################################################## ADD_EXECUTABLE(gnuradio-config-info gnuradio-config-info.cc) -TARGET_LINK_LIBRARIES(gnuradio-config-info gnuradio-core) +TARGET_LINK_LIBRARIES(gnuradio-config-info gnuradio-core ${Boost_LIBRARIES}) INSTALL( TARGETS gnuradio-config-info DESTINATION ${GR_RUNTIME_DIR} @@ -94,6 +96,6 @@ INCLUDE_DIRECTORIES(${CPPUNIT_INCLUDE_DIRS}) LINK_DIRECTORIES(${CPPUNIT_LIBRARY_DIRS}) ADD_LIBRARY(test-gnuradio-core SHARED ${test_gnuradio_core_sources}) -TARGET_LINK_LIBRARIES(test-gnuradio-core gnuradio-core ${CPPUNIT_LIBRARIES}) +TARGET_LINK_LIBRARIES(test-gnuradio-core gnuradio-core ${CPPUNIT_LIBRARIES} ${Boost_LIBRARIES}) ENDIF(ENABLE_TESTING) diff --git a/gnuradio-core/src/lib/filter/CMakeLists.txt b/gnuradio-core/src/lib/filter/CMakeLists.txt index ab136af146..abc89b3f16 100644 --- a/gnuradio-core/src/lib/filter/CMakeLists.txt +++ b/gnuradio-core/src/lib/filter/CMakeLists.txt @@ -27,6 +27,11 @@ FOREACH(gr_core_filter_asm ${gr_core_filter_asms}) SET_PROPERTY(SOURCE ${gr_core_filter_asm} PROPERTY LANGUAGE C) ENDFOREACH(gr_core_filter_asm) +#uname -p says i386, but we know better when its x86 apple +IF(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386") + SET(CMAKE_SYSTEM_PROCESSOR "x86_64") +ENDIF() + ######################################################################## # Generate the makefile.gen, then extract its sources: # This is a round-about way to extract the sources, diff --git a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt index f5cafb7b3c..cc81ef1238 100644 --- a/gr-audio/lib/CMakeLists.txt +++ b/gr-audio/lib/CMakeLists.txt @@ -98,9 +98,9 @@ IF(AUDIO_UNIT_H AND AUDIO_TOOLBOX_H) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/osx) LIST(APPEND gr_audio_libs - -framework AudioUnit - -framework CoreAudio - -framework AudioToolbox + "-framework AudioUnit" + "-framework CoreAudio" + "-framework AudioToolbox" ) LIST(APPEND gr_audio_sources ${CMAKE_CURRENT_SOURCE_DIR}/osx/audio_osx_source.cc diff --git a/gr-vocoder/lib/codec2/kiss_fft.h b/gr-vocoder/lib/codec2/kiss_fft.h index 20621d8b39..64c50f4aae 100644 --- a/gr-vocoder/lib/codec2/kiss_fft.h +++ b/gr-vocoder/lib/codec2/kiss_fft.h @@ -5,7 +5,6 @@ #include <stdio.h> #include <math.h> #include <string.h> -#include <malloc.h> #ifdef __cplusplus extern "C" { |