diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2018-01-24 15:35:01 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-01-24 15:35:01 -0800 |
| commit | d4cf299de62a97d573445bf55c70816947940072 (patch) | |
| tree | 5e2bab3e640dc765dec2ce3318522571ba8cdce6 | |
| parent | fd2f9816cc7aaecd52d335591d46efa3c9ea2f00 (diff) | |
| download | vcpkg-d4cf299de62a97d573445bf55c70816947940072.tar.gz vcpkg-d4cf299de62a97d573445bf55c70816947940072.zip | |
[gflags] Use vcpkg_fixup_cmake_targets() instead of patching
| -rw-r--r-- | ports/gflags/CONTROL | 2 | ||||
| -rw-r--r-- | ports/gflags/fix-install.patch | 15 | ||||
| -rw-r--r-- | ports/gflags/portfile.cmake | 7 |
3 files changed, 2 insertions, 22 deletions
diff --git a/ports/gflags/CONTROL b/ports/gflags/CONTROL index c41d49217..a1bcb795c 100644 --- a/ports/gflags/CONTROL +++ b/ports/gflags/CONTROL @@ -1,3 +1,3 @@ Source: gflags -Version: 2.2.1 +Version: 2.2.1-1 Description: A C++ library that implements commandline flags processing diff --git a/ports/gflags/fix-install.patch b/ports/gflags/fix-install.patch deleted file mode 100644 index eda5b7f98..000000000 --- a/ports/gflags/fix-install.patch +++ /dev/null @@ -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 diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index 59811f487..0e89a8f16 100644 --- a/ports/gflags/portfile.cmake +++ b/ports/gflags/portfile.cmake @@ -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) |