Skip to content

Commit

Permalink
clean up root cml.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
assignUser committed Dec 5, 2024
1 parent 61205c3 commit 2d4ae11
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -233,10 +233,6 @@ if(${VELOX_FORCE_COLORED_OUTPUT})
endif()
endif()

# At the moment we prefer static linking but by default cmake looks for shared
# libs first. This will still fallback to shared libs when static ones are not
# found
list(INSERT CMAKE_FIND_LIBRARY_SUFFIXES 0 a)
if(VELOX_ENABLE_S3)
# Set AWS_ROOT_DIR if you have a custom install location of AWS SDK CPP.
if(AWSSDK_ROOT_DIR)
Expand Down Expand Up @@ -293,7 +289,8 @@ endif()
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED True)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
set(CMAKE_CXX_EXTENSIONS ON) # Big Int is an extension

execute_process(
COMMAND
Expand Down Expand Up @@ -373,7 +370,6 @@ if(${VELOX_ENABLE_GPU})
if(CMAKE_BUILD_TYPE MATCHES Debug)
add_compile_options("$<$<COMPILE_LANGUAGE:CUDA>:-G>")
endif()
include_directories("${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}")
find_package(CUDAToolkit REQUIRED)
endif()

Expand Down Expand Up @@ -424,11 +420,10 @@ set(BOOST_INCLUDE_LIBRARIES
velox_set_source(Boost)
velox_resolve_dependency(Boost 1.77.0 COMPONENTS ${BOOST_INCLUDE_LIBRARIES})

# Range-v3 will be enable when the codegen code actually lands keeping it here
# for reference. find_package(range-v3)

velox_set_source(gflags)

velox_resolve_dependency(gflags COMPONENTS ${VELOX_GFLAGS_TYPE})

if(NOT TARGET gflags::gflags)
# This is a bit convoluted, but we want to be able to use gflags::gflags as a
# target even when velox is built as a subproject which uses
Expand Down Expand Up @@ -494,8 +489,6 @@ endif()
velox_set_source(simdjson)
velox_resolve_dependency(simdjson 3.9.3)

# Locate or build folly.
add_compile_definitions(FOLLY_HAVE_INT128_T=1)
velox_set_source(folly)
velox_resolve_dependency(folly)

Expand Down Expand Up @@ -586,7 +579,6 @@ find_package(double-conversion 3.1.5 REQUIRED)
include_directories(SYSTEM velox)
include_directories(SYSTEM velox/external)

# these were previously vendored in third-party/
if(NOT VELOX_DISABLE_GOOGLETEST)
velox_set_source(GTest)
velox_resolve_dependency(GTest)
Expand Down

0 comments on commit 2d4ae11

Please sign in to comment.