This is an automated email from the ASF dual-hosted git repository.
adonisling 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 ce9a160d16 [enhancement](macOS) Make CLion work out of the box (#14689)
ce9a160d16 is described below
commit ce9a160d1698881254e8eaa63b5bbd2fb318bdb7
Author: Adonis Ling <adonis0...@gmail.com>
AuthorDate: Thu Dec 1 10:40:04 2022 +0800
[enhancement](macOS) Make CLion work out of the box (#14689)
We can't build the project after import it to CLion on macOS. Some options
must be provided by default.
---
be/CMakeLists.txt | 24 +++++++++++++++++++++---
be/src/tools/CMakeLists.txt | 4 +++-
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/be/CMakeLists.txt b/be/CMakeLists.txt
index cf51ddc492..28ef74079d 100644
--- a/be/CMakeLists.txt
+++ b/be/CMakeLists.txt
@@ -65,8 +65,22 @@ else()
add_definitions(-DBOOST_STACKTRACE_USE_NOOP)
endif()
-option(GLIBC_COMPATIBILITY "Enable compatibility with older glibc libraries."
ON)
+# 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)
+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)
+endif()
+option(USE_JEMALLOC "Use jemalloc" ON)
+
message(STATUS "GLIBC_COMPATIBILITY is ${GLIBC_COMPATIBILITY}")
+message(STATUS "USE_LIBCPP is ${USE_LIBCPP}")
+message(STATUS "USE_MEM_TRACKER is ${USE_MEM_TRACKER}")
+message(STATUS "USE_JEMALLOC is ${USE_JEMALLOC}")
# set CMAKE_BUILD_TYPE
if (NOT CMAKE_BUILD_TYPE)
@@ -86,13 +100,17 @@ message(STATUS "Build target arch is
${CMAKE_BUILD_TARGET_ARCH}")
# Set dirs
set(BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-set(ENV{DORIS_HOME} "${BASE_DIR}/../")
+set(ENV{DORIS_HOME} "${BASE_DIR}/..")
set(BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}")
-set(THIRDPARTY_DIR "$ENV{DORIS_THIRDPARTY}/installed/")
set(GENSRC_DIR "${BASE_DIR}/../gensrc/build/")
set(SRC_DIR "${BASE_DIR}/src/")
set(TEST_DIR "${CMAKE_SOURCE_DIR}/test/")
set(OUTPUT_DIR "${BASE_DIR}/output")
+if (NOT DEFINED ENV{DORIS_THIRDPARTY})
+ set(ENV{DORIS_THIRDPARTY} "$ENV{DORIS_HOME}/thirdparty")
+endif()
+set(THIRDPARTY_DIR "$ENV{DORIS_THIRDPARTY}/installed")
+message(STATUS "THIRDPARTY_DIR is ${THIRDPARTY_DIR}")
option(MAKE_TEST "ON for make unit test or OFF for not" OFF)
message(STATUS "make test: ${MAKE_TEST}")
diff --git a/be/src/tools/CMakeLists.txt b/be/src/tools/CMakeLists.txt
index b8d0febfdf..1f583e01a4 100644
--- a/be/src/tools/CMakeLists.txt
+++ b/be/src/tools/CMakeLists.txt
@@ -35,9 +35,11 @@ target_link_libraries(meta_tool
install(DIRECTORY DESTINATION ${OUTPUT_DIR}/lib/)
install(TARGETS meta_tool DESTINATION ${OUTPUT_DIR}/lib/)
+if (NOT OS_MACOSX)
# Meta tool never need debug info
add_custom_command(TARGET meta_tool POST_BUILD
COMMAND ${CMAKE_OBJCOPY} --only-keep-debug $<TARGET_FILE:meta_tool>
$<TARGET_FILE:meta_tool>.dbg
COMMAND ${CMAKE_STRIP} --strip-debug --strip-unneeded
$<TARGET_FILE:meta_tool>
COMMAND ${CMAKE_OBJCOPY} --add-gnu-debuglink=$<TARGET_FILE:meta_tool>.dbg
$<TARGET_FILE:meta_tool>
- )
\ No newline at end of file
+ )
+endif()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
