Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cmake fixes #1195

Merged
merged 4 commits into from Mar 22, 2017
Merged

Cmake fixes #1195

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6b040c
cmake: clean up
bastibl Jan 29, 2017
51e5655
cmake: add log4cpp to runtime includes
bastibl Jan 29, 2017
4433a77
cmake: remove duplicate swig includes
bastibl Jan 2, 2017
6a68b9b
cmake: fix component dependencies
bastibl Jan 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
cmake: add log4cpp to runtime includes
  • Loading branch information
@bastibl
bastibl committed Mar 22, 2017
commit 51e565532f1f867baacc004222971fcf3703773b
1 change: 1 addition & 0 deletions gnuradio-runtime/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -43,6 +43,7 @@ GR_SET_GLOBAL(GNURADIO_RUNTIME_INCLUDE_DIRS
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/gnuradio-runtime/include
${CMAKE_BINARY_DIR}/gnuradio-runtime/include
${LOG4CPP_INCLUDE_DIRS}
)

GR_SET_GLOBAL(GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS
Expand Down
1 change: 0 additions & 1 deletion gnuradio-runtime/swig/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -27,7 +27,6 @@ set(GR_SWIG_INCLUDE_DIRS
${GNURADIO_RUNTIME_INCLUDE_DIRS}
${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${LOG4CPP_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
)

Expand Down
4 changes: 1 addition & 3 deletions gr-audio/lib/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -26,14 +26,12 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${GR_AUDIO_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
${LOG4CPP_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
)

link_directories(${Boost_LIBRARY_DIRS})
link_directories(${LOG4CPP_LIBRARY_DIRS})

list(APPEND gr_audio_libs gnuradio-runtime ${Boost_LIBRARIES} ${LOG4CPP_LIBRARIES})
list(APPEND gr_audio_libs gnuradio-runtime ${Boost_LIBRARIES})
list(APPEND gr_audio_sources audio_registry.cc)
list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/gr-audio.conf)

Expand Down
2 changes: 0 additions & 2 deletions gr-blocks/lib/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -251,7 +251,6 @@ list(APPEND blocks_libs
gnuradio-runtime
${VOLK_LIBRARIES}
${Boost_LIBRARIES}
${LOG4CPP_LIBRARIES}
)

add_library(gnuradio-blocks SHARED ${gr_blocks_sources})
Expand Down Expand Up @@ -328,7 +327,6 @@ if(ENABLE_TESTING)
gnuradio-blocks
${Boost_LIBRARIES}
${CPPUNIT_LIBRARIES}
${LOG4CPP_LIBRARIES}
)

GR_ADD_TEST(test_gr_blocks test-gr-blocks)
Expand Down
6 changes: 1 addition & 5 deletions gr-blocks/tests/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -36,9 +36,6 @@ link_directories(
${CPPUNIT_LIBRARY_DIRS}
)

include_directories(${LOG4CPP_INCLUDE_DIRS})
link_directories(${LOG4CPP_LIBRARY_DIRS})

########################################################################
# Build benchmarks and non-registered tests
########################################################################
Expand All @@ -50,6 +47,5 @@ set(tests_not_run #single source per test
foreach(test_not_run_src ${tests_not_run})
get_filename_component(name ${test_not_run_src} NAME_WE)
add_executable(${name} ${test_not_run_src})
target_link_libraries(${name} test-gnuradio-runtime gnuradio-blocks ${LOG4CPP_LIBRARIES})
target_link_libraries(${name} test-gnuradio-runtime gnuradio-blocks)
endforeach(test_not_run_src)

4 changes: 0 additions & 4 deletions gr-digital/lib/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -29,12 +29,10 @@ include_directories(
${GR_BLOCKS_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
${VOLK_INCLUDE_DIRS}
${LOG4CPP_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
)

link_directories(${Boost_LIBRARY_DIRS})
link_directories(${LOG4CPP_LIBRARY_DIRS})

if(ENABLE_GR_CTRLPORT)
ADD_DEFINITIONS(-DGR_CTRLPORT)
Expand Down Expand Up @@ -151,7 +149,6 @@ list(APPEND digital_libs
gnuradio-analog
${VOLK_LIBRARIES}
${Boost_LIBRARIES}
${LOG4CPP_LIBRARIES}
)

add_library(gnuradio-digital SHARED ${digital_sources})
Expand Down Expand Up @@ -228,7 +225,6 @@ if(ENABLE_TESTING)
gnuradio-digital
${Boost_LIBRARIES}
${CPPUNIT_LIBRARIES}
${LOG4CPP_LIBRARIES}
)

GR_ADD_TEST(test_gr_digital test-gr-digital)
Expand Down
3 changes: 0 additions & 3 deletions gr-fec/lib/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -32,7 +32,6 @@ include_directories(
${GR_BLOCKS_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
${VOLK_INCLUDE_DIRS}
${LOG4CPP_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
)

Expand All @@ -42,7 +41,6 @@ endif(ENABLE_GR_CTRLPORT)

link_directories(
${Boost_LIBRARY_DIRS}
${LOG4CPP_LIBRARY_DIRS}
)

########################################################################
Expand Down Expand Up @@ -110,7 +108,6 @@ list(APPEND gnuradio_fec_libs
gnuradio-runtime
${VOLK_LIBRARIES}
${Boost_LIBRARIES}
${LOG4CPP_LIBRARIES}
)

# Only include the LDPC work if we have GSL installed
Expand Down
2 changes: 0 additions & 2 deletions gr-filter/lib/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -37,13 +37,11 @@ include_directories(
${GR_BLOCKS_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
${VOLK_INCLUDE_DIRS}
${LOG4CPP_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
)

link_directories(
${Boost_LIBRARY_DIRS}
${LOG4CPP_LIBRARY_DIRS}
)

if(ENABLE_GR_CTRLPORT)
Expand Down
3 changes: 0 additions & 3 deletions gr-qtgui/lib/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -129,15 +129,13 @@ include_directories(
${QWT_INCLUDE_DIRS}
${QT_INCLUDE_DIRS}
${FFTW3F_INCLUDE_DIRS}
${LOG4CPP_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
)

link_directories(
${QWT_LIBRARY_DIRS}
${FFTW3F_LIBRARY_DIRS}
${LOG4CPP_LIBRARY_DIRS}
${Boost_LIBRARY_DIRS}
)

Expand All @@ -158,7 +156,6 @@ list(APPEND qtgui_libs
${QWT_LIBRARIES}
${QT_LIBRARIES}
${FFTW3F_LIBRARIES}
${LOG4CPP_LIBRARIES}
)
if (WIN32)
list(APPEND qtgui_libs
Expand Down
4 changes: 0 additions & 4 deletions gr-uhd/lib/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -37,9 +37,6 @@ if(ENABLE_GR_CTRLPORT)
ADD_DEFINITIONS(-DGR_CTRLPORT)
endif(ENABLE_GR_CTRLPORT)

include_directories(${LOG4CPP_INCLUDE_DIRS})
link_directories(${LOG4CPP_LIBRARY_DIRS})

########################################################################
# Setup library
########################################################################
Expand Down Expand Up @@ -68,7 +65,6 @@ list(APPEND uhd_libs
gnuradio-runtime
${Boost_LIBRARIES}
${UHD_LIBRARIES}
${LOG4CPP_LIBRARIES}
)

add_library(gnuradio-uhd SHARED ${gr_uhd_sources})
Expand Down
4 changes: 0 additions & 4 deletions gr-vocoder/lib/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -161,9 +161,6 @@ if(ENABLE_GR_CTRLPORT)
ADD_DEFINITIONS(-DGR_CTRLPORT)
endif(ENABLE_GR_CTRLPORT)

include_directories(${LOG4CPP_INCLUDE_DIRS})
link_directories(${LOG4CPP_LIBRARY_DIRS})

########################################################################
# Setup library
########################################################################
Expand Down Expand Up @@ -217,7 +214,6 @@ endif(GR_USE_LOCAL_LIBGSM)
list(APPEND vocoder_libs
gnuradio-runtime
${Boost_LIBRARIES}
${LOG4CPP_LIBRARIES}
)

if(GR_USE_SYSTEM_LIBCODEC2)
Expand Down
4 changes: 0 additions & 4 deletions gr-wavelet/lib/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -39,9 +39,6 @@ if(ENABLE_GR_CTRLPORT)
ADD_DEFINITIONS(-DGR_CTRLPORT)
endif(ENABLE_GR_CTRLPORT)

include_directories(${LOG4CPP_INCLUDE_DIRS})
link_directories(${LOG4CPP_LIBRARY_DIRS})

########################################################################
# Setup library
########################################################################
Expand Down Expand Up @@ -71,7 +68,6 @@ list(APPEND wavelet_libs
${Boost_LIBRARIES}
${WAVELET_LIBRARIES}
${GSL_LIBRARIES}
${LOG4CPP_LIBRARIES}
)

add_library(gnuradio-wavelet SHARED ${gr_wavelet_sources})
Expand Down