@@ -272,9 +272,25 @@ set_target_properties(aws-sdk-core PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR
272272add_library (aws-sdk-s3 STATIC IMPORTED )
273273set_target_properties (aws-sdk-s3 PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR} /lib64/libaws-cpp-sdk-s3.a)
274274
275+ add_library (aws-sdk-transfer STATIC IMPORTED )
276+ set_target_properties (aws-sdk-transfer PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR} /lib64/libaws-cpp-sdk-transfer.a)
277+
278+ add_library (aws-sdk-s3-crt STATIC IMPORTED )
279+ set_target_properties (aws-sdk-s3-crt PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR} /lib64/libaws-cpp-sdk-s3-crt.a)
280+
281+
282+ add_library (aws-crt-cpp STATIC IMPORTED )
283+ set_target_properties (aws-crt-cpp PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR} /lib64/libaws-crt-cpp.a)
284+
275285add_library (aws-c-cal STATIC IMPORTED )
276286set_target_properties (aws-c-cal PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR} /lib64/libaws-c-cal.a)
277287
288+ add_library (aws-c-auth STATIC IMPORTED )
289+ set_target_properties (aws-c-auth PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR} /lib64/libaws-c-auth.a)
290+
291+ add_library (aws-c-compression STATIC IMPORTED )
292+ set_target_properties (aws-c-compression PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR} /lib64/libaws-c-compression.a)
293+
278294add_library (aws-c-common STATIC IMPORTED )
279295set_target_properties (aws-c-common PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR} /lib64/libaws-c-common.a)
280296
@@ -284,9 +300,18 @@ set_target_properties(aws-c-event-stream PROPERTIES IMPORTED_LOCATION ${THIRDPAR
284300add_library (aws-c-io STATIC IMPORTED )
285301set_target_properties (aws-c-io PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR} /lib64/libaws-c-io.a)
286302
303+ add_library (aws-c-http STATIC IMPORTED )
304+ set_target_properties (aws-c-http PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR} /lib64/libaws-c-http.a)
305+
306+ add_library (aws-c-mqtt STATIC IMPORTED )
307+ set_target_properties (aws-c-mqtt PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR} /lib64/libaws-c-mqtt.a)
308+
287309add_library (aws-checksums STATIC IMPORTED )
288310set_target_properties (aws-checksums PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR} /lib64/libaws-checksums.a)
289311
312+ add_library (aws-c-s3 STATIC IMPORTED )
313+ set_target_properties (aws-c-s3 PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR} /lib64/libaws-c-s3.a)
314+
290315add_library (aws-s2n STATIC IMPORTED )
291316set_target_properties (aws-s2n PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR} /lib64/libs2n.a)
292317
@@ -352,11 +377,11 @@ if (COMPILER_GCC)
352377 # https://stackoverflow.com/questions/67584073/gcc-11-false-array-subscript-is-partly-outside-array-bounds-warning
353378 # https://stackoverflow.com/questions/69426070/gcc-11-order-of-arguments-triggers-false-positive-wstringop-overflow-is-this-bu
354379 set (CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-array-bounds -Wno-stringop-overread" )
355- add_compile_options (-Wno-stringop-overflow )
380+ add_compile_options (-Wno-stringop-overflow -fdiagnostics-color=always )
356381endif ()
357382
358383if (COMPILER_CLANG)
359-
384+ add_compile_options ( -fcolor-diagnostics )
360385 if (MAKE_TEST STREQUAL "OFF" )
361386 add_compile_options (-Qunused-arguments )
362387 endif ()
@@ -432,12 +457,6 @@ SET(CMAKE_CXX_FLAGS "${CXX_COMMON_FLAGS} ${CMAKE_CXX_FLAGS}")
432457
433458message (STATUS "Compiler Flags: ${CMAKE_CXX_FLAGS } " )
434459
435- if (CMAKE_GENERATOR STREQUAL "Ninja" AND NOT DISABLE_COLORED_BUILD)
436- # Turn on colored output. https://github.com/ninja-build/ninja/wiki/FAQ
437- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS } -fdiagnostics-color=always" )
438- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS } -fdiagnostics-color=always" )
439- endif ()
440-
441460# Thrift requires these two definitions for some types that we use
442461add_definitions (-DHAVE_INTTYPES_H -DHAVE_NETINET_IN_H )
443462
@@ -452,15 +471,28 @@ include_directories(
452471 ${GENSRC_DIR} /
453472 ${THIRDPARTY_DIR} /include
454473 ${GPERFTOOLS_HOME} /include
455- ${THIRDPARTY_DIR} /include/thrift/
456- ${THIRDPARTY_DIR} /include/event/
457474 ${THIRDPARTY_DIR} /include/breakpad/
458475)
459476
460477set (WL_START_GROUP "-Wl,--start-group" )
461478set (WL_END_GROUP "-Wl,--end-group" )
462479
463- set (AWS_LIBS aws-sdk-s3 aws-sdk-core aws-checksums aws-c-io aws-c-event-stream aws-c-common aws-c-cal aws-s2n)
480+ set (AWS_LIBS
481+ aws-sdk-s3
482+ aws-sdk-core
483+ aws-checksums
484+ aws-c-io
485+ aws-c-event-stream
486+ aws-c-common
487+ aws-c-cal
488+ aws-s2n
489+ aws-c-s3
490+ aws-c-auth
491+ aws-crt-cpp
492+ aws-c-compression
493+ aws-c-http
494+ aws-c-mqtt
495+ aws-sdk-s3-crt)
464496
465497# Set Doris libraries
466498set (DORIS_LINK_LIBS
0 commit comments