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

cmake updates

Browse Source
This commit is contained in:
Bastian Bloessl
2014-10-08 14:10:50 +02:00
parent 32d75b3675
commit 5cd3caeeed
2 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2 -3
View File
@@ -122,6 +122,8 @@ endif(APPLE)
######################################################################## ########################################################################
include_directories( include_directories(
${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/lib
${CMAKE_BINARY_DIR}/include
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${CPPUNIT_INCLUDE_DIRS} ${CPPUNIT_INCLUDE_DIRS}
${ITPP_INCLUDE_DIR} ${ITPP_INCLUDE_DIR}
@@ -134,9 +136,6 @@ link_directories(
${GNURADIO_RUNTIME_LIBRARY_DIRS} ${GNURADIO_RUNTIME_LIBRARY_DIRS}
) )
set(GR_IEEE802_11_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE INTERNAL "" FORCE)
set(GR_IEEE802_11_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/swig CACHE INTERNAL "" FORCE)
######################################################################## ########################################################################
# Create uninstall target # Create uninstall target
######################################################################## ########################################################################
lib/CMakeLists.txt
+5 -17
View File
@@ -81,21 +81,13 @@ macro(expand_cc_h_impl root)
#install rules for the generated cc files #install rules for the generated cc files
list(APPEND generated_sources ${expanded_files_cc_impl}) list(APPEND generated_sources ${expanded_files_cc_impl})
endmacro(expand_cc_h_impl) endmacro(expand_cc_h_impl)
######################################################################## ########################################################################
# Invoke macro to generate various sources # Invoke macro to generate various sources
######################################################################## ########################################################################
expand_cc_h_impl(moving_average_XX cc ff) expand_cc_h_impl(moving_average_XX cc ff)
add_custom_target(ieee802_11_generated_sources DEPENDS ${generated_sources})
include_directories( add_dependencies(ieee802_11_generated_sources ieee802_11_generated_includes)
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../include
${GR_BLOCKS_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
${VOLK_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${ITPP_INCLUDE_DIR}
)
######################################################################## ########################################################################
# Setup library # Setup library
@@ -120,16 +112,12 @@ list(APPEND gr_ieee802_11_sources
list(APPEND gr_ieee802_11_libs list(APPEND gr_ieee802_11_libs
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_ALL_LIBRARIES}
${GNURADIO_FFT_LIBRARIES}
${GNURADIO_PMT_LIBRARIES}
${GNURADIO_FILTER_LIBRARIES}
${GNURADIO_DIGITAL_LIBRARIES}
${ITPP_LIBRARIES} ${ITPP_LIBRARIES}
) )
add_library(gnuradio-ieee802_11 SHARED ${gr_ieee802_11_sources}) add_library(gnuradio-ieee802_11 SHARED ${gr_ieee802_11_sources})
add_dependencies(gnuradio-ieee802_11 ieee802_11_generated_includes) add_dependencies(gnuradio-ieee802_11 ieee802_11_generated_sources)
target_link_libraries(gnuradio-ieee802_11 ${gr_ieee802_11_libs}) target_link_libraries(gnuradio-ieee802_11 ${gr_ieee802_11_libs})
set_target_properties(gnuradio-ieee802_11 PROPERTIES DEFINE_SYMBOL "gnuradio_ieee802_11_EXPORTS") set_target_properties(gnuradio-ieee802_11 PROPERTIES DEFINE_SYMBOL "gnuradio_ieee802_11_EXPORTS")