aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/benchmark/fix-cmakelists.patch13
-rw-r--r--ports/benchmark/portfile.cmake7
2 files changed, 1 insertions, 19 deletions
diff --git a/ports/benchmark/fix-cmakelists.patch b/ports/benchmark/fix-cmakelists.patch
deleted file mode 100644
index 51eadde46..000000000
--- a/ports/benchmark/fix-cmakelists.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 244484b..903dea4 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -37,7 +37,7 @@ endif()
- set(include_install_dir "include")
- set(lib_install_dir "lib/")
- set(bin_install_dir "bin/")
--set(config_install_dir "lib/cmake/${PROJECT_NAME}")
-+set(config_install_dir "share/${PROJECT_NAME}/cmake/")
-
- set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
-
diff --git a/ports/benchmark/portfile.cmake b/ports/benchmark/portfile.cmake
index 58cdc8e0f..621f3acc2 100644
--- a/ports/benchmark/portfile.cmake
+++ b/ports/benchmark/portfile.cmake
@@ -17,11 +17,6 @@ vcpkg_from_github(
HEAD_REF master
)
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
- PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-cmakelists.patch"
-)
-
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
@@ -33,7 +28,7 @@ vcpkg_install_cmake()
vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/benchmark)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)