Skip to content
Permalink
Browse files
Remove unnecessary -DCPPUTEST_MEM_LEAK_DETECTION_DISABLED, and fix co…
…nan zeromq override warning.
  • Loading branch information
PengZheng committed Mar 28, 2022
1 parent d972839 commit c658133344689636865b37d5731dc285d390ca5f
Showing 2 changed files with 10 additions and 5 deletions.
@@ -26,12 +26,17 @@ mark_as_advanced(CLEAR ENABLE_THREAD_SANITIZER)

if (ENABLE_ADDRESS_SANITIZER)
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
set(CMAKE_C_FLAGS "-DCPPUTEST_MEM_LEAK_DETECTION_DISABLED -fsanitize=address -fno-omit-frame-pointer ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "-DCPPUTEST_MEM_LEAK_DETECTION_DISABLED -fsanitize=address -fno-omit-frame-pointer ${CMAKE_CXX_FLAGS}")
set(CMAKE_C_FLAGS "-fsanitize=address -fno-omit-frame-pointer ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer ${CMAKE_CXX_FLAGS}")
else ()
set(CMAKE_C_FLAGS "-DCPPUTEST_MEM_LEAK_DETECTION_DISABLED -lasan -fsanitize=address -fno-omit-frame-pointer ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "-DCPPUTEST_MEM_LEAK_DETECTION_DISABLED -lasan -fsanitize=address -fno-omit-frame-pointer ${CMAKE_CXX_FLAGS}")
set(CMAKE_C_FLAGS "-lasan -fsanitize=address -fno-omit-frame-pointer ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "-lasan -fsanitize=address -fno-omit-frame-pointer ${CMAKE_CXX_FLAGS}")
endif ()

# if (ENABLE_TESTING)
# set(CMAKE_C_FLAGS "-DCPPUTEST_MEM_LEAK_DETECTION_DISABLED ${CMAKE_C_FLAGS}")
# set(CMAKE_CXX_FLAGS "-DCPPUTEST_MEM_LEAK_DETECTION_DISABLED ${CMAKE_CXX_FLAGS}")
# endif ()
endif()

if (ENABLE_UNDEFINED_SANITIZER)
@@ -211,7 +211,7 @@ def requirements(self):
# Another issue is in conan infrastructure: https://github.com/conan-io/conan-center-index/issues/9709
self.requires("mdnsresponder/1310.140.1")
if self.options.build_pubsub_psa_zmq:
self.requires("zeromq/4.3.2")
self.requires("zeromq/4.3.4")
self.options['zeromq'].shared = True
self.requires("czmq/4.2.0")
self.options['czmq'].shared = True

0 comments on commit c658133

Please sign in to comment.