From 794b6712829d8f0632ce06ef79a32d97fc51ed00 Mon Sep 17 00:00:00 2001 From: Joe Abraham Date: Tue, 10 Sep 2024 12:18:23 +0530 Subject: [PATCH] xx --- CMake/resolve_dependency_modules/fizz.cmake | 34 --------------------- CMakeLists.txt | 4 --- scripts/setup-macos.sh | 1 - 3 files changed, 39 deletions(-) delete mode 100644 CMake/resolve_dependency_modules/fizz.cmake diff --git a/CMake/resolve_dependency_modules/fizz.cmake b/CMake/resolve_dependency_modules/fizz.cmake deleted file mode 100644 index fa805f032c5c..000000000000 --- a/CMake/resolve_dependency_modules/fizz.cmake +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -include_guard(GLOBAL) - -set(FIZZ_VERSION 2024.09.01) -set(FIZZ_BUILD_SHA256_CHECKSUM - fbabbc77e8f90f55f5a20bcaa36d4743f3f6c7a4572d48c6c9a62a88df70dcdb) -set(FIZZ_SOURCE_URL - "https://github.com/facebookincubator/fizz/archive/refs/tags/v2024.05.20.00.tar.gz") - -resolve_dependency_url(FIZZ) - -message(STATUS "Fetching and building fizz from source") -FetchContent_Declare( - fizz - URL ${FIZZ_SOURCE_URL} - URL_HASH ${FIZZ_BUILD_SHA256_CHECKSUM}) - - -set(FIZZ_INSTALL ON) -set(fizz_BUILD_TESTS OFF) -FetchContent_MakeAvailable(fizz) -list(APPEND CMAKE_PREFIX_PATH ${fizz_BINARY_DIR}) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6491409efbdd..67720d0587e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -476,8 +476,6 @@ if(${VELOX_BUILD_TESTING}) endif() if(VELOX_ENABLE_REMOTE_FUNCTIONS) - set_source(fizz) - resolve_dependency(fizz CONFIG v2024.05.20.00 REQUIRED) find_package(fizz CONFIG REQUIRED) find_package(wangle CONFIG REQUIRED) find_package(proxygen CONFIG REQUIRED) @@ -490,8 +488,6 @@ if(VELOX_ENABLE_REMOTE_FUNCTIONS) find_package(fizz CONFIG REQUIRED) find_package(wangle CONFIG REQUIRED) find_package(FBThrift CONFIG REQUIRED) - find_package(proxygen CONFIG REQUIRED) - find_package(proxygenhttpserver CONFIG REQUIRED) endif() if(DEFINED FOLLY_BENCHMARK_STATIC_LIB) diff --git a/scripts/setup-macos.sh b/scripts/setup-macos.sh index 85802147273a..84550d61ba47 100755 --- a/scripts/setup-macos.sh +++ b/scripts/setup-macos.sh @@ -310,7 +310,6 @@ function install_velox_deps { run_and_time install_duckdb run_and_time install_protobuf run_and_time install_simdjson - run_and_time install_simdjson } (return 2> /dev/null) && return # If script was sourced, don't run commands.