diff options
| author | Josh Blum | 2011-07-23 00:35:45 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-07-23 09:41:47 -0700 |
| commit | 2165d0c4ce0d0555b17682a2d0a9741a1f2a5a25 (patch) | |
| tree | f5c911773b0608e008ffff74648c100c4c1d0bd7 /gnuradio-core/src | |
| parent | d6334f04e0b20b8b017692126ca9754776a63011 (diff) | |
| download | gnuradio-2165d0c4ce0d0555b17682a2d0a9741a1f2a5a25.tar.gz gnuradio-2165d0c4ce0d0555b17682a2d0a9741a1f2a5a25.tar.bz2 gnuradio-2165d0c4ce0d0555b17682a2d0a9741a1f2a5a25.zip | |
gr: tweaks to build cmake branch on osx
Diffstat (limited to 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/lib/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/filter/CMakeLists.txt | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/CMakeLists.txt b/gnuradio-core/src/lib/CMakeLists.txt index 3812167e6..10752ecd8 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 ab136af14..abc89b3f1 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, |