liuneng1994 commented on code in PR #5941:
URL: https://github.com/apache/incubator-gluten/pull/5941#discussion_r1630740681
##########
cpp-ch/CMakeLists.txt:
##########
@@ -27,93 +29,93 @@ message("CH_COMMIT=${CH_COMMIT}")
project(libch LANGUAGES C CXX ASM)
file(GLOB clickhouse_files "${CH_SOURCE_DIR}/*")
-if ("${CH_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}/ClickHouse")
- if (NOT clickhouse_files)
- execute_process(COMMAND git clone -b ${CH_BRANCH} --depth 3
https://github.com/${CH_ORG}/ClickHouse.git ${CH_SOURCE_DIR}
COMMAND_ERROR_IS_FATAL ANY)
- execute_process(COMMAND git reset --hard ${CH_COMMIT}
WORKING_DIRECTORY ${CH_SOURCE_DIR} COMMAND_ERROR_IS_FATAL ANY)
- execute_process(COMMAND git submodule update --init --force --depth 1
WORKING_DIRECTORY ${CH_SOURCE_DIR} COMMAND_ERROR_IS_FATAL ANY)
- else()
- execute_process(COMMAND git fetch origin ${CH_BRANCH} --depth 3
WORKING_DIRECTORY ${CH_SOURCE_DIR} COMMAND_ERROR_IS_FATAL ANY)
- execute_process(COMMAND git checkout ${CH_BRANCH} WORKING_DIRECTORY
${CH_SOURCE_DIR} COMMAND_ERROR_IS_FATAL ANY)
- execute_process(COMMAND git reset --hard ${CH_COMMIT}
WORKING_DIRECTORY ${CH_SOURCE_DIR} COMMAND_ERROR_IS_FATAL ANY)
- execute_process(COMMAND git submodule update --init --recursive
--force --depth 1 WORKING_DIRECTORY ${CH_SOURCE_DIR} COMMAND_ERROR_IS_FATAL ANY)
- endif()
+if("${CH_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}/ClickHouse")
+ if(NOT clickhouse_files)
+ execute_process(
+ COMMAND
+ git clone -b ${CH_BRANCH} --depth 3
+ https://github.com/${CH_ORG}/ClickHouse.git ${CH_SOURCE_DIR}
+ COMMAND_ERROR_IS_FATAL ANY)
+ execute_process(
+ COMMAND git reset --hard ${CH_COMMIT}
+ WORKING_DIRECTORY ${CH_SOURCE_DIR} COMMAND_ERROR_IS_FATAL ANY)
+ execute_process(
+ COMMAND git submodule update --init --force --depth 1
+ WORKING_DIRECTORY ${CH_SOURCE_DIR} COMMAND_ERROR_IS_FATAL ANY)
+ else()
+ execute_process(
+ COMMAND git fetch origin ${CH_BRANCH} --depth 3
+ WORKING_DIRECTORY ${CH_SOURCE_DIR} COMMAND_ERROR_IS_FATAL ANY)
+ execute_process(
+ COMMAND git checkout ${CH_BRANCH}
+ WORKING_DIRECTORY ${CH_SOURCE_DIR} COMMAND_ERROR_IS_FATAL ANY)
+ execute_process(
+ COMMAND git reset --hard ${CH_COMMIT}
+ WORKING_DIRECTORY ${CH_SOURCE_DIR} COMMAND_ERROR_IS_FATAL ANY)
+ execute_process(
+ COMMAND git submodule update --init --recursive --force --depth 1
+ WORKING_DIRECTORY ${CH_SOURCE_DIR} COMMAND_ERROR_IS_FATAL ANY)
+ endif()
else()
- if (NOT clickhouse_files)
- # Checking out *all* submodules takes > 5 min. Therefore, the smoke
build ("FastTest") in CI initializes only the set of
- # submodules minimally needed for a build and we cannot assume here
that all submodules are populated.
- message(ERROR "clickhouse ${CH_SOURCE_DIR} is missing or empty. to fix
try run:")
- message(STATUS " git clone --recursive --depth 1
https://github.com/Kyligence/ClickHouse.git ${CMAKE_SOURCE_DIR}")
- endif()
+ if(NOT clickhouse_files)
+ # Checking out *all* submodules takes > 5 min. Therefore, the smoke build
+ # ("FastTest") in CI initializes only the set of submodules minimally
needed
+ # for a build and we cannot assume here that all submodules are populated.
+ message(ERROR
+ "clickhouse ${CH_SOURCE_DIR} is missing or empty. to fix try run:")
+ message(
+ STATUS
+ " git clone --recursive --depth 1
https://github.com/Kyligence/ClickHouse.git ${CMAKE_SOURCE_DIR}"
+ )
+ endif()
endif()
-if (EXISTS "${CH_SOURCE_DIR}/utils/extern-local-engine")
- execute_process(COMMAND rm -rf ${CH_SOURCE_DIR}/utils/extern-local-engine)
-endif ()
-execute_process(COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/local-engine
${CH_SOURCE_DIR}/utils/extern-local-engine COMMAND_ERROR_IS_FATAL ANY)
+if(EXISTS "${CH_SOURCE_DIR}/utils/extern-local-engine")
+ execute_process(COMMAND rm -rf ${CH_SOURCE_DIR}/utils/extern-local-engine)
+endif()
+execute_process(
+ COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/local-engine
+ ${CH_SOURCE_DIR}/utils/extern-local-engine COMMAND_ERROR_IS_FATAL
ANY)
-# execute_process(COMMAND find ${CMAKE_CURRENT_SOURCE_DIR}/local-engine -regex
'.*\.\(c\|cpp\|h\)' -exec clang-format-15 --verbose -i --style=file -i {} \;)
+# execute_process(COMMAND find ${CMAKE_CURRENT_SOURCE_DIR}/local-engine -regex
+# '.*\.\(c\|cpp\|h\)' -exec clang-format-15 --verbose -i --style=file -i {} \;)
set(CH_BINARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/build")
option(ENABLE_CPP_TEST "Build CPP Unit test" OFF)
-if (ENABLE_CPP_TEST)
-add_custom_command(
- USES_TERMINAL
- COMMAND
- bash -c
- \"cmake -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
- -DENABLE_PROTOBUF=ON
- -DENABLE_TESTS=ON
- -DENABLE_JEMALLOC=ON
- -DENABLE_MULTITARGET_CODE=ON
- -DENABLE_EXTERN_LOCAL_ENGINE=ON
- -DCOMPILER_FLAGS='-fvisibility=hidden -fvisibility-inlines-hidden'
- -S ${CH_SOURCE_DIR} -G Ninja -B ${CH_BINARY_DIR} &&
- cmake --build ${CH_BINARY_DIR} --target ch unit_tests_local_engine\"
- OUTPUT _build_ch)
+if(ENABLE_CPP_TEST)
+ add_custom_command(
+ USES_TERMINAL
+ COMMAND
+ bash -c \"cmake -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_PROTOBUF=ON
+ -DENABLE_TESTS=ON -DENABLE_JEMALLOC=ON -DENABLE_MULTITARGET_CODE=ON
+ -DENABLE_EXTERN_LOCAL_ENGINE=ON -DCOMPILER_FLAGS='-fvisibility=hidden
+ -fvisibility-inlines-hidden' -S ${CH_SOURCE_DIR} -G Ninja -B
+ ${CH_BINARY_DIR} && cmake --build ${CH_BINARY_DIR} --target ch
+ unit_tests_local_engine\"
+ OUTPUT _build_ch)
else()
-add_custom_command(
- USES_TERMINAL
- COMMAND
- bash -c
- \"cmake -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
- -DENABLE_PROTOBUF=ON
- -DENABLE_TESTS=OFF
- -DENABLE_JEMALLOC=ON
- -DENABLE_MULTITARGET_CODE=ON
- -DENABLE_EXTERN_LOCAL_ENGINE=ON
- -DENABLE_ODBC=OFF
- -DENABLE_CAPNP=OFF
- -DENABLE_ROCKSDB=OFF
- -DENABLE_GRPC=OFF
- -DENABLE_RUST=OFF
- -DENABLE_H3=OFF
- -DENABLE_AMQPCPP=OFF
- -DENABLE_CASSANDRA=OFF
- -DENABLE_KAFKA=OFF
- -DENABLE_NATS=OFF
- -DENABLE_LIBPQXX=OFF
- -DENABLE_NURAFT=OFF
- -DENABLE_DATASKETCHES=OFF
- -DENABLE_SQLITE=OFF
- -DENABLE_S2_GEOMETRY=OFF
- -DENABLE_ANNOY=OFF
- -DENABLE_ULID=OFF
- -DENABLE_MYSQL=OFF
- -DENABLE_BCRYPT=OFF
- -DENABLE_LDAP=OFF
- -DENABLE_MSGPACK=OFF
- -DUSE_REPLXX=OFF
- -DENABLE_CLICKHOUSE_ALL=OFF
- -DCOMPILER_FLAGS='-fvisibility=hidden -fvisibility-inlines-hidden'
- -S ${CH_SOURCE_DIR} -G Ninja -B ${CH_BINARY_DIR} &&
- cmake --build ${CH_BINARY_DIR} --target libch\"
- OUTPUT _build_ch)
+ add_custom_command(
Review Comment:
It seems to be getting messier here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
