diff --git a/src/main/cpp/cmake/patches/velox/apply.cmake b/src/main/cpp/cmake/patches/velox/apply.cmake index 77f5921bf..f8d99028b 100644 --- a/src/main/cpp/cmake/patches/velox/apply.cmake +++ b/src/main/cpp/cmake/patches/velox/apply.cmake @@ -2,7 +2,7 @@ # Invoked by FetchContent_Declare's PATCH_COMMAND. # Variables: SOURCE_DIR, PATCH_DIR -set(PATCHES fix-cmake-project-dir.patch) +set(PATCHES) foreach(patch IN LISTS PATCHES) execute_process( diff --git a/src/main/cpp/cmake/patches/velox/fix-cmake-project-dir.patch b/src/main/cpp/cmake/patches/velox/fix-cmake-project-dir.patch deleted file mode 100644 index 960d16634..000000000 --- a/src/main/cpp/cmake/patches/velox/fix-cmake-project-dir.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/CMake/third-party/FBThriftCppLibrary.cmake -+++ b/CMake/third-party/FBThriftCppLibrary.cmake -@@ -44,7 +44,7 @@ - # Generate relative paths in #includes - file( - RELATIVE_PATH include_prefix -- "${CMAKE_SOURCE_DIR}" -+ "${PROJECT_SOURCE_DIR}" - "${CMAKE_CURRENT_SOURCE_DIR}/${THRIFT_FILE}" - ) - get_filename_component(include_prefix ${include_prefix} DIRECTORY) -@@ -123,7 +123,7 @@ - -o "${output_dir}" - "${CMAKE_CURRENT_SOURCE_DIR}/${THRIFT_FILE}" - WORKING_DIRECTORY -- "${CMAKE_BINARY_DIR}" -+ "${PROJECT_BINARY_DIR}" - MAIN_DEPENDENCY - "${THRIFT_FILE}" - DEPENDS -@@ -136,7 +136,7 @@ - target_include_directories( - "${LIB_NAME}" - PUBLIC -- "$" -+ "$" - "$" - ${Xxhash_INCLUDE_DIR} - ) -@@ -173,7 +173,7 @@ - target_include_directories( - "${LIB_NAME}.thrift_includes" - INTERFACE -- "$" -+ "$" - "$" - ) - foreach(dep IN LISTS ARG_DEPENDS) diff --git a/src/main/cpp/velox-ref-md5.txt b/src/main/cpp/velox-ref-md5.txt index a59dc9ac1..90dd7d3d0 100644 --- a/src/main/cpp/velox-ref-md5.txt +++ b/src/main/cpp/velox-ref-md5.txt @@ -1 +1 @@ -bc3ebd1dbba98bd056fe93cd88124b1a +005c12c860d837be4ff9e0096086ed74 diff --git a/src/main/cpp/velox-ref.txt b/src/main/cpp/velox-ref.txt index f6ef8f3dc..28464017a 100644 --- a/src/main/cpp/velox-ref.txt +++ b/src/main/cpp/velox-ref.txt @@ -1 +1 @@ -e37eabc470b3564ac92eac07ab8f8bbbe212e070 +ae44d34da5edddbccdc8c93b7924e55164f22693