Skip to content

Commit

Permalink
classic modules: use common precompiled headers
Browse files Browse the repository at this point in the history
This commit contains all the additions to gr-*/lib/CMakeLists.txt
applicable to modules already present in 3.8.

Signed-off-by: Marcus Müller <[email protected]>
  • Loading branch information
marcusmueller authored and mormj committed Jul 19, 2021
1 parent aa1be78 commit 3147613
Show file tree
Hide file tree
Showing 14 changed files with 65 additions and 5 deletions.
16 changes: 12 additions & 4 deletions gr-analog/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,19 @@ add_library(gnuradio-analog
sig_source_impl.cc
simple_squelch_cc_impl.cc
)

if(ENABLE_COMMON_PCH)
set(PRIVATE_LIBS common-precompiled-headers)
endif()

target_link_libraries(gnuradio-analog PUBLIC
gnuradio-runtime
gnuradio-blocks
gnuradio-filter
)
gnuradio-runtime
gnuradio-blocks
gnuradio-filter
PRIVATE
${PRIVATE_LIBS}
)

target_include_directories(gnuradio-analog
PUBLIC
$<INSTALL_INTERFACE:include>
Expand Down
4 changes: 4 additions & 0 deletions gr-audio/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -151,5 +151,9 @@ if(WIN32)
endif()
endif(WIN32)

if(ENABLE_COMMON_PCH)
target_link_libraries(gnuradio-audio PRIVATE common-precompiled-headers)
endif()

gr_library_foo(gnuradio-audio ${audio_deps})
install(FILES ${gr_audio_confs} DESTINATION ${GR_PREFSDIR})
4 changes: 4 additions & 0 deletions gr-channels/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ target_link_libraries(gnuradio-channels PUBLIC
gnuradio-blocks
)

if(ENABLE_COMMON_PCH)
target_link_libraries(gnuradio-channels PRIVATE common-precompiled-headers)
endif()

target_include_directories(gnuradio-channels
PUBLIC
$<INSTALL_INTERFACE:include>
Expand Down
3 changes: 3 additions & 0 deletions gr-digital/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ target_link_libraries(gnuradio-digital PUBLIC
Volk::volk
)

if(ENABLE_COMMON_PCH)
target_link_libraries(gnuradio-digital PRIVATE common-precompiled-headers)
endif()

target_include_directories(gnuradio-digital
PUBLIC $<INSTALL_INTERFACE:include>
Expand Down
4 changes: 4 additions & 0 deletions gr-dtv/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ target_link_libraries(gnuradio-dtv PUBLIC
Volk::volk
)

if(ENABLE_COMMON_PCH)
target_link_libraries(gnuradio-dtv PRIVATE common-precompiled-headers)
endif()

target_include_directories(gnuradio-dtv
PUBLIC
$<INSTALL_INTERFACE:include>
Expand Down
4 changes: 4 additions & 0 deletions gr-fec/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ target_link_libraries(gnuradio-fec PUBLIC
gnuradio-blocks
)

if(ENABLE_COMMON_PCH)
target_link_libraries(gnuradio-fec PRIVATE common-precompiled-headers)
endif()

# Address linker issues with std::filesystem on Centos 8 and Debian
target_link_libraries(gnuradio-fec PRIVATE $<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:stdc++fs>)

Expand Down
4 changes: 4 additions & 0 deletions gr-fft/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ target_link_libraries(gnuradio-fft PUBLIC
Volk::volk
)

if(ENABLE_COMMON_PCH)
target_link_libraries(gnuradio-fft PRIVATE common-precompiled-headers)
endif()

# Address linker issues with std::filesystem on Centos 8 and Debian
target_link_libraries(gnuradio-fft PRIVATE $<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:stdc++fs>)

Expand Down
5 changes: 5 additions & 0 deletions gr-filter/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,18 @@ add_library(gnuradio-filter
single_pole_iir_filter_ff_impl.cc
)


target_link_libraries(gnuradio-filter PUBLIC
gnuradio-runtime
gnuradio-fft
gnuradio-blocks
Volk::volk
)

if(ENABLE_COMMON_PCH)
target_link_libraries(gnuradio-filter PRIVATE common-precompiled-headers)
endif()

target_include_directories(gnuradio-filter
PUBLIC
$<INSTALL_INTERFACE:include>
Expand Down
4 changes: 4 additions & 0 deletions gr-qtgui/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ if (WIN32)
)
endif(WIN32)

if(ENABLE_COMMON_PCH)
target_link_libraries(gnuradio-qtgui PRIVATE common-precompiled-headers)
endif()

include(GrPython)
if(ENABLE_PYTHON)
target_compile_definitions(gnuradio-qtgui PUBLIC -DENABLE_PYTHON)
Expand Down
6 changes: 5 additions & 1 deletion gr-trellis/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ add_library(gnuradio-trellis
target_link_libraries(gnuradio-trellis PUBLIC
gnuradio-runtime
gnuradio-digital
)
)

if(ENABLE_COMMON_PCH)
target_link_libraries(gnuradio-trellis PRIVATE common-precompiled-headers)
endif()

target_include_directories(gnuradio-trellis
PUBLIC
Expand Down
4 changes: 4 additions & 0 deletions gr-video-sdl/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ target_link_libraries(gnuradio-video-sdl PUBLIC
${SDL_LIBRARY}
)

if(ENABLE_COMMON_PCH)
target_link_libraries(gnuradio-video-sdl PRIVATE common-precompiled-headers)
endif()

target_include_directories(gnuradio-video-sdl
PUBLIC
$<INSTALL_INTERFACE:include>
Expand Down
4 changes: 4 additions & 0 deletions gr-vocoder/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ target_link_libraries(gnuradio-vocoder PUBLIC
gnuradio-runtime
)

if(ENABLE_COMMON_PCH)
target_link_libraries(gnuradio-vocoder PRIVATE common-precompiled-headers)
endif()

if(LIBCODEC2_FOUND)
target_sources(gnuradio-vocoder PRIVATE
codec2.cc
Expand Down
4 changes: 4 additions & 0 deletions gr-wavelet/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ target_link_libraries(gnuradio-wavelet PUBLIC
GSL::gsl
)

if(ENABLE_COMMON_PCH)
target_link_libraries(gnuradio-wavelet PRIVATE common-precompiled-headers)
endif()

target_include_directories(gnuradio-wavelet
PUBLIC $<INSTALL_INTERFACE:include>
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
Expand Down
4 changes: 4 additions & 0 deletions gr-zeromq/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ target_link_libraries(gnuradio-zeromq PUBLIC
ZeroMQ::ZeroMQ
)

if(ENABLE_COMMON_PCH)
target_link_libraries(gnuradio-zeromq PRIVATE common-precompiled-headers)
endif()

target_include_directories(gnuradio-zeromq
PUBLIC
$<INSTALL_INTERFACE:include>
Expand Down

0 comments on commit 3147613

Please sign in to comment.