This is an automated email from the ASF dual-hosted git repository. jdanek pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
commit 1c7203b2518e343bb4c5d774a2a7179555ef2793 Author: Jiri Danek <[email protected]> AuthorDate: Thu Oct 17 08:05:47 2019 +0200 DISPATCH-1384 - Enable flat namespace on macOS -flat_namespace overrides macOS default of -two_levelnamespace, to make the behavior more like Linux; also should compensate for lack of -Wl,-z,defs on macOS. --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 163bfcf..6f4f4c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -191,9 +191,13 @@ if (CMAKE_C_COMPILER_ID MATCHES "Clang") add_compile_options(-Wno-gnu-statement-expression) endif() -if (NOT (APPLE OR USE_SANITIZERS OR USE_TSAN)) +if (APPLE) + set(CATCH_UNDEFINED "-Wl,-flat_namespace") +elseif(NOT (USE_SANITIZERS OR USE_TSAN)) set(CATCH_UNDEFINED "-Wl,-z,defs") -endif () +else(APPLE) + set(CATCH_UNDEFINED "") +endif(APPLE) ## ## Header file installation --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
