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 /gnuradio-runtime/lib | |
| 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 'gnuradio-runtime/lib')
| -rw-r--r-- | gnuradio-runtime/lib/CMakeLists.txt | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt index 9a6cd4488f..17c577c934 100644 --- a/gnuradio-runtime/lib/CMakeLists.txt +++ b/gnuradio-runtime/lib/CMakeLists.txt @@ -241,13 +241,9 @@ target_compile_definitions(gnuradio-runtime PRIVATE BOOST_DLL_USE_STD_FS) endif() -#Add libraries for winsock2.h on Windows -check_include_file_cxx(windows.h HAVE_WINDOWS_H) -if(HAVE_WINDOWS_H) - target_compile_definitions(gnuradio-runtime PUBLIC -DHAVE_WINDOWS_H -DUSING_WINSOCK -DWIN32_LEAN_AND_MEAN) - message(STATUS "Adding windows libs to gnuradio runtime libs...") - target_link_libraries(gnuradio-runtime PUBLIC ws2_32 wsock32) -endif(HAVE_WINDOWS_H) +if(WIN32) + target_compile_definitions(gnuradio-runtime PUBLIC -DWIN32_LEAN_AND_MEAN) +endif(WIN32) #need to link with librt on ubuntu 11.10 for shm_* if((LINUX) OR (CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD")) |