You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2020/07/17 20:04:24 UTC
[qpid-proton] branch master updated: PROTON-2208: Fix threaderciser
colateral damage
This is an automated email from the ASF dual-hosted git repository.
astitcher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/master by this push:
new 308f206 PROTON-2208: Fix threaderciser colateral damage
308f206 is described below
commit 308f206f3b6ccdd7d7e24c660c6ca0904bbc2582
Author: Andrew Stitcher <as...@apache.org>
AuthorDate: Fri Jul 17 14:28:40 2020 -0400
PROTON-2208: Fix threaderciser colateral damage
---
CMakeLists.txt | 2 --
c/tests/CMakeLists.txt | 4 ++--
cpp/examples/CMakeLists.txt | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1253c8d..7a78b29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -166,7 +166,6 @@ if (CMAKE_COMPILER_IS_GNUCC)
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 @@ endif (CMAKE_COMPILER_IS_GNUCC)
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)
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 (CMAKE_CXX_COMPILER)
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
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 @@ if(HAS_ENOUGH_CPP11)
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()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org