You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2017/09/07 15:26:31 UTC
qpid-proton git commit: PROTON-1574: Fix AddressSanitizer: ODR errors
Repository: qpid-proton
Updated Branches:
refs/heads/master c870da9fa -> 29272ca39
PROTON-1574: Fix AddressSanitizer: ODR errors
Removed incorrect linking of C++ tests with both the compat and core proton libs.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/29272ca3
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/29272ca3
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/29272ca3
Branch: refs/heads/master
Commit: 29272ca3948233a417ebc04ba80dedaefc7a4104
Parents: c870da9
Author: Alan Conway <ac...@redhat.com>
Authored: Thu Sep 7 11:01:58 2017 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Thu Sep 7 11:01:58 2017 -0400
----------------------------------------------------------------------
CMakeLists.txt | 2 +-
proton-c/bindings/cpp/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/29272ca3/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60ab777..376c5d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -174,7 +174,7 @@ endif (ENABLE_VALGRIND)
option(ENABLE_SANITIZERS "Compile with sanitizers (ASan, UBSan, TSan); incompatible with Valgrind" OFF)
option(ENABLE_TSAN "Compile with Thread Sanitizer (TSan); incompatible with Valgrind" OFF)
if (ENABLE_SANITIZERS OR ENABLE_TSAN)
- set(DISABLE ENABLE_VALGRIND ENABLE_UNDEFINED_ERROR BUILD_GO)
+ set(DISABLE ENABLE_VALGRIND ENABLE_UNDEFINED_ERROR BUILD_GO BUILD_RUBY BUILD_PYTHON)
message(STATUS "Building with sanitizers; disables ${DISABLE}")
foreach(d ${DISABLE})
set(${d} OFF CACHE BOOL "Disabled to run sanitizers" FORCE)
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/29272ca3/proton-c/bindings/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/CMakeLists.txt b/proton-c/bindings/cpp/CMakeLists.txt
index 330858a..ef5f96b 100644
--- a/proton-c/bindings/cpp/CMakeLists.txt
+++ b/proton-c/bindings/cpp/CMakeLists.txt
@@ -157,7 +157,7 @@ endif ()
macro(add_cpp_test test)
add_executable (${test} src/${test}.cpp)
- target_link_libraries (${test} qpid-proton qpid-proton-cpp)
+ target_link_libraries (${test} qpid-proton-cpp)
if (CMAKE_SYSTEM_NAME STREQUAL Windows)
add_test (NAME cpp-${test}
COMMAND ${env_py}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org