diff options
| author | Ryan Volz <ryan.volz@gmail.com> | 2021-04-12 12:42:25 -0400 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-04-17 19:52:46 -0400 |
| commit | 4bfd03936c709187c8bcbf189b9d42096a9e478c (patch) | |
| tree | e6d790a03957da7f0df62c38416cedce76116609 /gr-network/lib/CMakeLists.txt | |
| parent | 035ed74a765180c1985035e1df428f81861b431c (diff) | |
runtime, blocks, network: Clean up use of Win headers, fix stream_pdu.
stream_pdu_base was failing to compile on Windows after moving to
gr-network since HAVE_IO_H was not checked for or defined.
Signed-off-by: Ryan Volz <ryan.volz@gmail.com>
Diffstat (limited to 'gr-network/lib/CMakeLists.txt')
| -rw-r--r-- | gr-network/lib/CMakeLists.txt | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/gr-network/lib/CMakeLists.txt b/gr-network/lib/CMakeLists.txt index 58930ebf17..d71ff34f0d 100644 --- a/gr-network/lib/CMakeLists.txt +++ b/gr-network/lib/CMakeLists.txt @@ -6,6 +6,14 @@ # ######################################################################## +# Setup compatibility checks and defines +######################################################################## +include(GrMiscUtils) +include(CheckCXXSourceCompiles) +GR_CHECK_HDR_N_DEF(io.h HAVE_IO_H) +CHECK_INCLUDE_FILE_CXX(windows.h HAVE_WINDOWS_H) + +######################################################################## #Setup library ######################################################################## add_library(gnuradio-network @@ -21,8 +29,13 @@ add_library(gnuradio-network target_link_libraries(gnuradio-network PUBLIC gnuradio-runtime) target_include_directories(gnuradio-network PUBLIC $<INSTALL_INTERFACE:include> - PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> -) + PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> +) + +if(HAVE_WINDOWS_H) + target_compile_definitions(gnuradio-network PRIVATE -DHAVE_WINDOWS_H) + target_link_libraries(gnuradio-network PRIVATE ws2_32 wsock32) +endif() #Add Windows DLL resource file if using MSVC if (MSVC) |