This is an automated email from the ASF dual-hosted git repository.

zykkk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new d02b45e847 [chore](cmake) Refactor be CMakeLists option (#22499)
d02b45e847 is described below

commit d02b45e8477986fe41dacd0b98c218e273087cb3
Author: Jack Drogon <[email protected]>
AuthorDate: Thu Aug 3 19:25:04 2023 +0800

    [chore](cmake) Refactor be CMakeLists option (#22499)
    
    Signed-off-by: Jack Drogon <[email protected]>
---
 be/CMakeLists.txt | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/be/CMakeLists.txt b/be/CMakeLists.txt
index fe4aa132c1..02c0243f41 100644
--- a/be/CMakeLists.txt
+++ b/be/CMakeLists.txt
@@ -67,18 +67,17 @@ else()
 endif()
 
 # Options
-if (NOT OS_MACOSX)
-    option(GLIBC_COMPATIBILITY "Enable compatibility with older glibc 
libraries." ON)
-    option(USE_LIBCPP "Use libc++" OFF)
-    option(USE_MEM_TRACKER, "Use memory tracker" ON)
-    option(USE_UNWIND "Use libunwind" ON)
-else()
-    option(GLIBC_COMPATIBILITY "Enable compatibility with older glibc 
libraries." OFF)
-    option(USE_LIBCPP "Use libc++" ON)
-    option(USE_MEM_TRACKER, "Use memory tracker" OFF)
-    option(USE_UNWIND "Use libunwind" OFF)
-endif()
+option(GLIBC_COMPATIBILITY "Enable compatibility with older glibc libraries." 
ON)
+option(USE_LIBCPP "Use libc++" OFF)
+option(USE_MEM_TRACKER, "Use memory tracker" ON)
+option(USE_UNWIND "Use libunwind" ON)
 option(USE_JEMALLOC "Use jemalloc" ON)
+if (OS_MACOSX)
+    set(GLIBC_COMPATIBILITY OFF)
+    set(USE_LIBCPP ON)
+    set(USE_MEM_TRACKER OFF)
+    set(USE_UNWIND OFF)
+endif()
 
 if (DISPLAY_BUILD_TIME)
     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "time -f 'TimeUsage: 
real=%es, user=%Us, sys=%Ss'")


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to