Merge pull request #1 from Microsoft/master

Update vcpkg from upstream

5 files changed, 28 insertions, 66 deletions

diff --git a/ports/gflags/0001-patch-dir.patch b/ports/gflags/0001-patch-dir.patch
new file mode 100644
index 000000000..d3aaa00fb
--- /dev/null
+++ b/ports/gflags/0001-patch-dir.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3709073..8e919cb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -503,7 +503,7 @@ endif ()
+ # ----------------------------------------------------------------------------
+ # installation rules
+ set (EXPORT_NAME ${PACKAGE_NAME}-targets)
+-file (RELATIVE_PATH INSTALL_PREFIX_REL2CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CONFIG_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}")
++set (INSTALL_PREFIX_REL2CONFIG_DIR "../..")
+ configure_file (cmake/config.cmake.in  "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-install.cmake" @ONLY)
+ configure_file (cmake/version.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-version.cmake" @ONLY)
+ 
diff --git a/ports/gflags/CONTROL b/ports/gflags/CONTROL
index 8833c2f56..0a8d83aee 100644
--- a/ports/gflags/CONTROL
+++ b/ports/gflags/CONTROL
@@ -1,3 +1,3 @@
 Source: gflags
-Version: 2.2.0-3
+Version: 2.2.1-3
 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 a2e6061f8..000000000
--- a/ports/gflags/fix-install.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3fd9d70..0debb89 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)
--  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 ()
diff --git a/ports/gflags/fix-static-linking.patch b/ports/gflags/fix-static-linking.patch
deleted file mode 100644
index 0cefed2e3..000000000
--- a/ports/gflags/fix-static-linking.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/gflags.h.in b/src/gflags.h.in
-index 43b3f7a..82e640f 100644
---- a/src/gflags.h.in
-+++ b/src/gflags.h.in
-@@ -86,7 +86,7 @@
- 
- // We always want to export variables defined in user code
- #ifndef GFLAGS_DLL_DEFINE_FLAG
--#  ifdef _MSC_VER
-+#  if GFLAGS_IS_A_DLL && defined(_MSC_VER)
- #    define GFLAGS_DLL_DEFINE_FLAG __declspec(dllexport)
- #  else
- #    define GFLAGS_DLL_DEFINE_FLAG
diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake
index 463b6d9b2..31ffeafa5 100644
--- a/ports/gflags/portfile.cmake
+++ b/ports/gflags/portfile.cmake
@@ -1,18 +1,21 @@
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    message(FATAL_ERROR "${PORT} does not currently support UWP")
+endif()
+
 include(vcpkg_common_functions)
-find_program(GIT git)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gflags/gflags
-    REF v2.2.0
-    SHA512 e2106ca70ff539024f888bca12487b3bf7f4f51928acf5ae3e1022f6bbd5e3b7882196ec50b609fd52f739e1f7b13eec7d4b3535d8216ec019a3577de6b4228d
+    REF v2.2.1
+    SHA512 e919cbdcff1f993ddbfa9c06d8e595566a4717c27ff62f388a64c0e6b4683a93211c24ce78485eae84c2c76053341574064e6c56af185fc2782e2816b26e1fc9
     HEAD_REF master
 )
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-install.patch"
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-static-linking.patch"
+    PATCHES
+        ${CMAKE_CURRENT_LIST_DIR}/0001-patch-dir.patch # gflags was estimating a wrong relative path between the gflags-config.cmake file and the include path; "../.." goes from share/gflags/ to the triplet root
 )
 
 vcpkg_configure_cmake(
@@ -22,10 +25,15 @@ vcpkg_configure_cmake(
         -DGFLAGS_REGISTER_BUILD_DIR:BOOL=OFF
         -DGFLAGS_REGISTER_INSTALL_PREFIX:BOOL=OFF
         -DBUILD_gflags_nothreads_LIB:BOOL=OFF
+        -DCMAKE_DEBUG_POSTFIX=d
 )
 
 vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gflags)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin)
+endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)