t/gr-foo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes for mac

Browse Source
This commit is contained in:
Bastian Bloessl
2013-11-22 19:46:45 +01:00
parent 75ccaae46a
commit 5870cae968
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+4 -3
View File
@@ -37,7 +37,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
######################################################################## ########################################################################
# Compiler specific setup # Compiler specific setup
######################################################################## ########################################################################
if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32) if(NOT WIN32)
#http://gcc.gnu.org/wiki/Visibility #http://gcc.gnu.org/wiki/Visibility
add_definitions(-fvisibility=hidden) add_definitions(-fvisibility=hidden)
add_definitions(-std=c++0x) add_definitions(-std=c++0x)
@@ -58,7 +58,7 @@ set(Boost_ADDITIONAL_VERSIONS
"1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64" "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64"
"1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69" "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69"
) )
find_package(Boost "1.35" COMPONENTS filesystem system) find_package(Boost "1.35" COMPONENTS filesystem system thread)
if(NOT Boost_FOUND) if(NOT Boost_FOUND)
message(FATAL_ERROR "Boost required to compile foo") message(FATAL_ERROR "Boost required to compile foo")
@@ -84,7 +84,8 @@ set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks)
######################################################################## ########################################################################
# Find gnuradio build dependencies # Find gnuradio build dependencies
######################################################################## ########################################################################
find_package(GnuradioRuntime) set(GR_REQUIRED_COMPONENTS RUNTIME PMT)
find_package(Gnuradio)
find_package(CppUnit) find_package(CppUnit)
# To run a more advanced search for GNU Radio and it's components and # To run a more advanced search for GNU Radio and it's components and
lib/CMakeLists.txt
+2 -1
View File
@@ -35,7 +35,7 @@ list(APPEND foo_sources
) )
add_library(gnuradio-foo SHARED ${foo_sources}) add_library(gnuradio-foo SHARED ${foo_sources})
target_link_libraries(gnuradio-foo ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES}) target_link_libraries(gnuradio-foo ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_PMT_LIBRARIES})
set_target_properties(gnuradio-foo PROPERTIES DEFINE_SYMBOL "gnuradio_foo_EXPORTS") set_target_properties(gnuradio-foo PROPERTIES DEFINE_SYMBOL "gnuradio_foo_EXPORTS")
######################################################################## ########################################################################
@@ -64,6 +64,7 @@ add_executable(test-foo ${test_foo_sources})
target_link_libraries( target_link_libraries(
test-foo test-foo
${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES}
${GNURADIO_PMT_LIBRARIES}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${CPPUNIT_LIBRARIES} ${CPPUNIT_LIBRARIES}
gnuradio-foo gnuradio-foo