diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-01-31 11:22:35 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-01-31 11:22:35 -0800 |
| commit | 76c28ad78e728cceb9dd0d5f6bec5c3454d74d4d (patch) | |
| tree | dd05707a71f2daf4dafc8538d79b8a7dd9e7b2bd | |
| parent | 5700754bd11fe9b22728bd8682c9cfe67a69a462 (diff) | |
| download | vcpkg-76c28ad78e728cceb9dd0d5f6bec5c3454d74d4d.tar.gz vcpkg-76c28ad78e728cceb9dd0d5f6bec5c3454d74d4d.zip | |
[gflags] Fix regression in previous gflags update for existing users.
| -rw-r--r-- | ports/gflags/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/gflags/revert-fix-install.patch | 15 |
2 files changed, 20 insertions, 0 deletions
diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index 0e89a8f16..dcbbb7426 100644 --- a/ports/gflags/portfile.cmake +++ b/ports/gflags/portfile.cmake @@ -12,6 +12,11 @@ vcpkg_from_github( HEAD_REF master ) +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES "${CMAKE_CURRENT_LIST_DIR}/revert-fix-install.patch" +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA diff --git a/ports/gflags/revert-fix-install.patch b/ports/gflags/revert-fix-install.patch new file mode 100644 index 000000000..80793b65c --- /dev/null +++ b/ports/gflags/revert-fix-install.patch @@ -0,0 +1,15 @@ +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 "share/${PACKAGE_NAME}") +- set (PKGCONFIG_INSTALL_DIR "") ++ set (CONFIG_INSTALL_DIR "lib/cmake/${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 |