commit 308f206f3b6ccdd7d7e24c660c6ca0904bbc2582
author Andrew Stitcher <astitcher@apache.org> Fri Jul 17 14:28:40 2020 -0400
committer Andrew Stitcher <astitcher@apache.org> Fri Jul 17 14:28:40 2020 -0400
tree 9229f52f7018c68a30fc763b27805eb1e50a2331
parent 62a420fe2d2e6264fd0942c06e10360f90ebab82

PROTON-2208: Fix threaderciser colateral damage

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1253c8d..7a78b29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -166,7 +166,6 @@
   set (COMPILE_WARNING_FLAGS "${WERROR} -Wall -pedantic-errors")
   set (CXX_WARNING_FLAGS "${COMPILE_WARNING_FLAGS}")
   set (COMPILE_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wstrict-prototypes -Wvla -Wsign-compare -Wwrite-strings")
-  set (COMPILE_LANGUAGE_FLAGS ${C_STANDARD_GCC})
 
   if (ENABLE_UNDEFINED_ERROR)
     set (CATCH_UNDEFINED "-Wl,--no-undefined")
@@ -190,7 +189,6 @@
 
 if (CMAKE_C_COMPILER_ID MATCHES "Clang")
   set (COMPILE_WARNING_FLAGS  "-Wall -pedantic")
-  set (COMPILE_LANGUAGE_FLAGS ${C_STANDARD_GCC})
   if (ENABLE_WARNING_ERROR)
     set (COMPILE_WARNING_FLAGS "-Werror ${COMPILE_WARNING_FLAGS}")
   endif (ENABLE_WARNING_ERROR)

c/tests/CMakeLists.txt

diff --git a/c/tests/CMakeLists.txt b/c/tests/CMakeLists.txt
index 787bce9..6c762b4 100644
--- a/c/tests/CMakeLists.txt
+++ b/c/tests/CMakeLists.txt
@@ -89,8 +89,8 @@
     if (THREADERCISER)
       add_executable(c-threaderciser threaderciser.c)
       set_target_properties(c-threaderciser
-        PROPERTIES COMPILE_FLAGS "${COMPILE_LANGUAGE_FLAGS} ${CMAKE_C_FLAGS} ${C_WARNING_FLAGS}")
-      target_link_libraries (c-threaderciser qpid-proton-proactor ${CMAKE_THREAD_LIBS_INIT})
+        PROPERTIES COMPILE_FLAGS "${C_STANDARD_FLAGS} ${COMPILE_WARNING_FLAGS}")
+      target_link_libraries (c-threaderciser qpid-proton-proactor Threads::Threads)
       pn_add_test(
         EXECUTABLE
         NAME c-threaderciser

cpp/examples/CMakeLists.txt

diff --git a/cpp/examples/CMakeLists.txt b/cpp/examples/CMakeLists.txt
index 4c6dc9f..8c50612 100644
--- a/cpp/examples/CMakeLists.txt
+++ b/cpp/examples/CMakeLists.txt
@@ -98,7 +98,7 @@
         multithreaded_client
         multithreaded_client_flow_control)
       add_executable(${example} ${example}.cpp)
-      target_link_libraries(${example} ${CMAKE_THREAD_LIBS_INIT})
+      target_link_libraries(${example} Threads::Threads)
     endforeach()
   endif()
 endif()