From 7358422abf81bd12b75ba90ca05ef1f8cb5c1724 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Thu, 6 Feb 2025 20:37:03 -0800 Subject: [PATCH] update --- cmake/vcpkg-ports/abseil/portfile.cmake | 10 ------- .../onnx/fix-dependency-protobuf.patch | 28 ------------------- 2 files changed, 38 deletions(-) delete mode 100644 cmake/vcpkg-ports/onnx/fix-dependency-protobuf.patch diff --git a/cmake/vcpkg-ports/abseil/portfile.cmake b/cmake/vcpkg-ports/abseil/portfile.cmake index fd90e7bb63..0b2bff688b 100644 --- a/cmake/vcpkg-ports/abseil/portfile.cmake +++ b/cmake/vcpkg-ports/abseil/portfile.cmake @@ -11,15 +11,6 @@ vcpkg_from_github( PATCHES absl_windows.patch ) -# With ABSL_PROPAGATE_CXX_STD=ON abseil automatically detect if it is being -# compiled with C++14 or C++17, and modifies the installed `absl/base/options.h` -# header accordingly. This works even if CMAKE_CXX_STANDARD is not set. Abseil -# uses the compiler default behavior to update `absl/base/options.h` as needed. -set(ABSL_USE_CXX17_OPTION "") -if("cxx17" IN_LIST FEATURES) - set(ABSL_USE_CXX17_OPTION "-DCMAKE_CXX_STANDARD=17") -endif() - set(ABSL_STATIC_RUNTIME_OPTION "") if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_CRT_LINKAGE STREQUAL "static") set(ABSL_STATIC_RUNTIME_OPTION "-DABSL_MSVC_STATIC_RUNTIME=ON") @@ -30,7 +21,6 @@ vcpkg_cmake_configure( DISABLE_PARALLEL_CONFIGURE OPTIONS -DABSL_PROPAGATE_CXX_STD=ON - ${ABSL_USE_CXX17_OPTION} ${ABSL_STATIC_RUNTIME_OPTION} ) diff --git a/cmake/vcpkg-ports/onnx/fix-dependency-protobuf.patch b/cmake/vcpkg-ports/onnx/fix-dependency-protobuf.patch deleted file mode 100644 index c435922d01..0000000000 --- a/cmake/vcpkg-ports/onnx/fix-dependency-protobuf.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d81ac1d..9f97998 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -149,6 +149,7 @@ if(ONNX_BUILD_TESTS) - set(googletest_STATIC_LIBRARIES GTest::gtest) - endif() - -+find_package(protobuf CONFIG REQUIRED) - if((ONNX_USE_LITE_PROTO AND TARGET protobuf::libprotobuf-lite) OR ((NOT ONNX_USE_LITE_PROTO) AND TARGET protobuf::libprotobuf)) - # Sometimes we need to use protoc compiled for host architecture while linking - # libprotobuf against target architecture. See https://github.com/caffe2/caffe -diff --git a/cmake/ONNXConfig.cmake.in b/cmake/ONNXConfig.cmake.in -index d588f8a..dbd4398 100644 ---- a/cmake/ONNXConfig.cmake.in -+++ b/cmake/ONNXConfig.cmake.in -@@ -6,9 +6,8 @@ - # library version information - set(ONNX_VERSION "@ONNX_VERSION@") - --list(APPEND CMAKE_PREFIX_PATH "@PROTOBUF_DIR@") --set(Protobuf_INCLUDE_DIR "@PROTOBUF_INCLUDE_DIR@") --find_package(Protobuf REQUIRED) -+include(CMakeFindDependencyMacro) -+find_dependency(protobuf CONFIG) - - # import targets - include ("${CMAKE_CURRENT_LIST_DIR}/ONNXTargets.cmake")