diff options
| author | Barath Kannan <barathsotd@gmail.com> | 2018-01-17 19:00:43 +1100 |
|---|---|---|
| committer | Barath Kannan <barathsotd@gmail.com> | 2018-01-17 19:00:43 +1100 |
| commit | c30363d07b3f64b5f38531442ea92d9c1cf81d13 (patch) | |
| tree | 8a169a2a0aadf40dad50e73d226c3eca1e949327 /ports/gflags/fix-install.patch | |
| parent | 47189e90d59459be69d4f6a0b039849913031c8e (diff) | |
| parent | 28c5c6ae4601c323cbd57a13da03b9047dc282ad (diff) | |
| download | vcpkg-c30363d07b3f64b5f38531442ea92d9c1cf81d13.tar.gz vcpkg-c30363d07b3f64b5f38531442ea92d9c1cf81d13.zip | |
Merge branch 'master' into qt5_modular
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 () |