From 71f8bdf2df304678063762490efc25d4302874af Mon Sep 17 00:00:00 2001 From: Steve Kelly Date: Thu, 25 Nov 2021 21:00:20 -0500 Subject: [PATCH] [build] fixups cmake threads include --- software/libcariboulite/README.md | 2 +- software/libcariboulite/src/io_utils/CMakeLists.txt | 7 ++++++- software/libcariboulite/src/zf_log/CMakeLists.txt | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/software/libcariboulite/README.md b/software/libcariboulite/README.md index f02740c..e59ae36 100644 --- a/software/libcariboulite/README.md +++ b/software/libcariboulite/README.md @@ -13,7 +13,7 @@ sudo apt update sudo apt install gcc # We used libsoapysdr-dev version 0.6.1-4+ -sudo apt install libsoapysdr-dev +sudo apt install libsoapysdr-dev libpthread-stubs0-dev # cmake version 3.15+ sudo apt install cmake diff --git a/software/libcariboulite/src/io_utils/CMakeLists.txt b/software/libcariboulite/src/io_utils/CMakeLists.txt index 4b192f3..008cbbd 100644 --- a/software/libcariboulite/src/io_utils/CMakeLists.txt +++ b/software/libcariboulite/src/io_utils/CMakeLists.txt @@ -15,12 +15,17 @@ set(EXTERN_LIBS ${SUPER_DIR}/zf_log/build/libzf_log.a) #add_compile_options(-Wall -Wextra) add_compile_options(-Wno-missing-braces) + +set(THREADS_PREFER_PTHREAD_FLAG TRUE) +find_package(Threads REQUIRED) + #Generate the static library from the sources add_library(io_utils STATIC ${SOURCES_LIB} ${SOURCES_PIG_LIB}) target_include_directories(io_utils PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(io_utils PRIVATE Threads::Threads) add_executable(test_io_utils main.c) -target_link_libraries(test_io_utils io_utils pthread ${EXTERN_LIBS}) +target_link_libraries(test_io_utils io_utils Threads::Threads ${EXTERN_LIBS}) #Set the location for library installation -- i.e., /usr/lib in this case # not really necessary in this example. Use "sudo make install" to apply diff --git a/software/libcariboulite/src/zf_log/CMakeLists.txt b/software/libcariboulite/src/zf_log/CMakeLists.txt index 860e325..a235052 100644 --- a/software/libcariboulite/src/zf_log/CMakeLists.txt +++ b/software/libcariboulite/src/zf_log/CMakeLists.txt @@ -11,7 +11,7 @@ set(CMAKE_C_EXTENSIONS OFF) if(MSVC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4 /WX") else() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -pedantic-errors") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") endif() add_library(zf_log ${HEADERS} ${SOURCES})