diff options
author | Marcus Müller <mmueller@gnuradio.org> | 2021-06-06 01:05:37 +0200 |
---|---|---|
committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-07-19 09:57:48 -0400 |
commit | 3147613a11a7685541c37fa1bcc75f816029244d (patch) | |
tree | b47a4be0d91a7b4a67174185029cc7abc38cc072 | |
parent | aa1be78e25a97a213c412d63c65624a8874293d8 (diff) |
classic modules: use common precompiled headers
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 <mmueller@gnuradio.org>
-rw-r--r-- | gr-analog/lib/CMakeLists.txt | 16 | ||||
-rw-r--r-- | gr-audio/lib/CMakeLists.txt | 4 | ||||
-rw-r--r-- | gr-channels/lib/CMakeLists.txt | 4 | ||||
-rw-r--r-- | gr-digital/lib/CMakeLists.txt | 3 | ||||
-rw-r--r-- | gr-dtv/lib/CMakeLists.txt | 4 | ||||
-rw-r--r-- | gr-fec/lib/CMakeLists.txt | 4 | ||||
-rw-r--r-- | gr-fft/lib/CMakeLists.txt | 4 | ||||
-rw-r--r-- | gr-filter/lib/CMakeLists.txt | 5 | ||||
-rw-r--r-- | gr-qtgui/lib/CMakeLists.txt | 4 | ||||
-rw-r--r-- | gr-trellis/lib/CMakeLists.txt | 6 | ||||
-rw-r--r-- | gr-video-sdl/lib/CMakeLists.txt | 4 | ||||
-rw-r--r-- | gr-vocoder/lib/CMakeLists.txt | 4 | ||||
-rw-r--r-- | gr-wavelet/lib/CMakeLists.txt | 4 | ||||
-rw-r--r-- | gr-zeromq/lib/CMakeLists.txt | 4 |
14 files changed, 65 insertions, 5 deletions
diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt index ec60418b75..a207641bc7 100644 --- a/gr-analog/lib/CMakeLists.txt +++ b/gr-analog/lib/CMakeLists.txt @@ -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> diff --git a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt index 9921983f5e..8c3fecbb7f 100644 --- a/gr-audio/lib/CMakeLists.txt +++ b/gr-audio/lib/CMakeLists.txt @@ -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}) diff --git a/gr-channels/lib/CMakeLists.txt b/gr-channels/lib/CMakeLists.txt index d988645260..344bd91678 100644 --- a/gr-channels/lib/CMakeLists.txt +++ b/gr-channels/lib/CMakeLists.txt @@ -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> diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt index ceee1adb9b..1e3c27513e 100644 --- a/gr-digital/lib/CMakeLists.txt +++ b/gr-digital/lib/CMakeLists.txt @@ -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> diff --git a/gr-dtv/lib/CMakeLists.txt b/gr-dtv/lib/CMakeLists.txt index 18ca5539f4..97d5e2dfb6 100644 --- a/gr-dtv/lib/CMakeLists.txt +++ b/gr-dtv/lib/CMakeLists.txt @@ -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> diff --git a/gr-fec/lib/CMakeLists.txt b/gr-fec/lib/CMakeLists.txt index b57815c1a0..f0513ec60c 100644 --- a/gr-fec/lib/CMakeLists.txt +++ b/gr-fec/lib/CMakeLists.txt @@ -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>) diff --git a/gr-fft/lib/CMakeLists.txt b/gr-fft/lib/CMakeLists.txt index ac6d0986ad..3cbbf27fd0 100644 --- a/gr-fft/lib/CMakeLists.txt +++ b/gr-fft/lib/CMakeLists.txt @@ -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>) diff --git a/gr-filter/lib/CMakeLists.txt b/gr-filter/lib/CMakeLists.txt index a99ab975d9..c5a688252f 100644 --- a/gr-filter/lib/CMakeLists.txt +++ b/gr-filter/lib/CMakeLists.txt @@ -53,6 +53,7 @@ add_library(gnuradio-filter single_pole_iir_filter_ff_impl.cc ) + target_link_libraries(gnuradio-filter PUBLIC gnuradio-runtime gnuradio-fft @@ -60,6 +61,10 @@ target_link_libraries(gnuradio-filter PUBLIC 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> diff --git a/gr-qtgui/lib/CMakeLists.txt b/gr-qtgui/lib/CMakeLists.txt index 94fbc7b821..69400ababc 100644 --- a/gr-qtgui/lib/CMakeLists.txt +++ b/gr-qtgui/lib/CMakeLists.txt @@ -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) diff --git a/gr-trellis/lib/CMakeLists.txt b/gr-trellis/lib/CMakeLists.txt index d19743f8ad..1e6680f19a 100644 --- a/gr-trellis/lib/CMakeLists.txt +++ b/gr-trellis/lib/CMakeLists.txt @@ -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 diff --git a/gr-video-sdl/lib/CMakeLists.txt b/gr-video-sdl/lib/CMakeLists.txt index f89897f4b0..f6b0dd9ff8 100644 --- a/gr-video-sdl/lib/CMakeLists.txt +++ b/gr-video-sdl/lib/CMakeLists.txt @@ -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> diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt index 464e35a958..e29f4d141e 100644 --- a/gr-vocoder/lib/CMakeLists.txt +++ b/gr-vocoder/lib/CMakeLists.txt @@ -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 diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt index 7caaa86f51..d5c81d0af9 100644 --- a/gr-wavelet/lib/CMakeLists.txt +++ b/gr-wavelet/lib/CMakeLists.txt @@ -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> diff --git a/gr-zeromq/lib/CMakeLists.txt b/gr-zeromq/lib/CMakeLists.txt index d87a7eefdd..8e7d282ce3 100644 --- a/gr-zeromq/lib/CMakeLists.txt +++ b/gr-zeromq/lib/CMakeLists.txt @@ -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> |