mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 18:20:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[gflags] Use vcpkg_fixup_cmake_targets() instead of patching

Browse Source
This commit is contained in:
Alexander Karatarakis 2018-01-24 15:35:01 -08:00
parent fd2f9816cc
commit d4cf299de6
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/gflags/CONTROL
View File

@ -1,3 +1,3 @@
Source: gflags
Version: 2.2.1
Version: 2.2.1-1
Description: A C++ library that implements commandline flags processing

15
ports/gflags/fix-install.patch
View File

@ -1,15 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 922a038..7d6af45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -410,8 +410,8 @@ if (OS_WINDOWS)
set (RUNTIME_INSTALL_DIR "bin")
set (LIBRARY_INSTALL_DIR "lib")
set (INCLUDE_INSTALL_DIR "include")
- set (CONFIG_INSTALL_DIR "lib/cmake/${PACKAGE_NAME}")
- set (PKGCONFIG_INSTALL_DIR)
+ set (CONFIG_INSTALL_DIR "share/${PACKAGE_NAME}")
+ set (PKGCONFIG_INSTALL_DIR "")
else ()
set (RUNTIME_INSTALL_DIR bin)
# The LIB_INSTALL_DIR and LIB_SUFFIX variables are used by the Fedora

7
ports/gflags/portfile.cmake
View File

@ -12,11 +12,6 @@ vcpkg_from_github(
HEAD_REF master
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-install.patch"
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
@ -27,7 +22,7 @@ vcpkg_configure_cmake(
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gflags)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)