diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-01-10 13:45:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 13:45:25 -0800 |
| commit | 2939b01fb906e10fe8dc5e5480800244fb7efc1c (patch) | |
| tree | f4a4e9565f070471ee6531f1a65794ed224bf157 /ports/gflags/fix-install.patch | |
| parent | d99a1601115bb6ebbc933049603f326ba4024dfd (diff) | |
| parent | 8c09cad80ec3fb0fb433bd44a9feb68eb8e68c01 (diff) | |
| download | vcpkg-2939b01fb906e10fe8dc5e5480800244fb7efc1c.tar.gz vcpkg-2939b01fb906e10fe8dc5e5480800244fb7efc1c.zip | |
Merge pull request #2547 from kobykahane/gflags_2_2_1
[gflags] update to 2.2.1
Diffstat (limited to 'ports/gflags/fix-install.patch')
| -rw-r--r-- | ports/gflags/fix-install.patch | 43 |
1 files changed, 6 insertions, 37 deletions
diff --git a/ports/gflags/fix-install.patch b/ports/gflags/fix-install.patch index a2e6061f8..eda5b7f98 100644 --- a/ports/gflags/fix-install.patch +++ b/ports/gflags/fix-install.patch @@ -1,46 +1,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3fd9d70..0debb89 100644 +index 922a038..7d6af45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -397,11 +397,11 @@ endif () - # ---------------------------------------------------------------------------- - # installation directories - if (OS_WINDOWS) -- set (RUNTIME_INSTALL_DIR Bin) -- set (LIBRARY_INSTALL_DIR Lib) -- set (INCLUDE_INSTALL_DIR Include) -- set (CONFIG_INSTALL_DIR CMake) +@@ -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 (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 "") else () set (RUNTIME_INSTALL_DIR bin) # The LIB_INSTALL_DIR and LIB_SUFFIX variables are used by the Fedora -@@ -501,14 +501,22 @@ configure_file (cmake/version.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-co - if (BUILD_SHARED_LIBS AND INSTALL_SHARED_LIBS) - foreach (opts IN ITEMS "" _nothreads) - if (BUILD_gflags${opts}_LIB) -- install (TARGETS gflags${opts}_shared DESTINATION ${LIBRARY_INSTALL_DIR} EXPORT ${EXPORT_NAME}) -+ install (TARGETS gflags${opts}_shared -+ EXPORT ${EXPORT_NAME} -+ RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR} -+ LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR} -+ ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR}) - endif () - endforeach () - endif () - if (BUILD_STATIC_LIBS AND INSTALL_STATIC_LIBS) - foreach (opts IN ITEMS "" _nothreads) - if (BUILD_gflags${opts}_LIB) -- install (TARGETS gflags${opts}_static DESTINATION ${LIBRARY_INSTALL_DIR} EXPORT ${EXPORT_NAME}) -+ install (TARGETS gflags${opts}_static -+ EXPORT ${EXPORT_NAME} -+ RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR} -+ LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR} -+ ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR}) - endif () - endforeach () - endif () |