Merge pull request #1427 from KindDragon/glog-fix

Glog update to version 0.3.5

ports/gflags/CONTROL

@@ -1,3 +1,3 @@
 Source: gflags
-Version: 2.2.0-3
+Version: 2.2.0-4
 Description: A C++ library that implements commandline flags processing

ports/glog/CONTROL

@@ -1,4 +1,4 @@
 Source: glog
-Version: 0.3.4-0472b91-1
+Version: 0.3.5
 Description: C++ implementation of the Google logging module
 Build-Depends: gflags

ports/glog/fix-cmake-install-files.patch

@@ -1,32 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1429590..5ed110d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -390,7 +390,8 @@ if (HAVE_NO_UNNAMED_TYPE_TEMPLATE_ARGS)
- endif (HAVE_NO_UNNAMED_TYPE_TEMPLATE_ARGS)
- 
- if (gflags_FOUND)
--  target_include_directories (glog PUBLIC ${gflags_INCLUDE_DIR})
-+  # when set to PUBLIC, will cause some wrong interface_include_directory for vcpkg
-+  target_include_directories (glog PRIVATE ${gflags_INCLUDE_DIR})
-   target_link_libraries (glog PUBLIC ${gflags_LIBRARIES})
- 
-   if (NOT BUILD_SHARED_LIBS)
-@@ -557,7 +558,7 @@ endif (gflags_FOUND)
- 
- configure_package_config_file (glog-config.cmake.in
-   ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake
--  INSTALL_DESTINATION lib/cmake/glog
-+  INSTALL_DESTINATION share/glog
-   NO_CHECK_REQUIRED_COMPONENTS_MACRO)
- 
- write_basic_package_version_file (glog-config-version.cmake VERSION
-@@ -569,6 +570,6 @@ export (PACKAGE glog)
- install (FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake
-   ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake
--  DESTINATION lib/cmake/glog)
-+  DESTINATION share/glog)
- 
--install (EXPORT glog-targets NAMESPACE glog:: DESTINATION lib/cmake/glog)
-+install (EXPORT glog-targets NAMESPACE glog:: DESTINATION share/glog)

ports/glog/portfile.cmake

@@ -7,46 +7,28 @@
 #
 
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glog-0472b91c5defdf90cff7292e3bf7bd86770a9a0a)
+
-vcpkg_download_distfile(ARCHIVE
+vcpkg_from_github(
-    URLS "https://github.com/google/glog/archive/0472b91c5defdf90cff7292e3bf7bd86770a9a0a.zip"
+    OUT_SOURCE_PATH SOURCE_PATH
-    FILENAME "glog-0472b91c5defdf90cff7292e3bf7bd86770a9a0a.zip"
+    REPO google/glog
-    SHA512 24506ad1cc05e8361379b925ecfc8f32cc47692a47598401cca340eb2a528fe28b8b0d3636983056c7910469d105095bd3bacacff6278bffa18d85603c3dbfa8
+    REF v0.3.5
-)
+    SHA512 a54a3b8b4b7660d7558ba5168c659bc3c8323c30908a4f6a4bbc6f9cd899350f3243aabc720daebfdeb799b276b51ba1eaa1a0f83149c4e1a038d552ada1ed72
-vcpkg_extract_source_archive(${ARCHIVE})
+    HEAD_REF master
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-cmake-install-files.patch"
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
-    # OPTIONS_RELEASE -DOPTIMIZE=1
-    # OPTIONS_DEBUG -DDEBUGGABLE=1
 )
 
 vcpkg_install_cmake()
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/glog)
 
-file(GLOB GLOG_CMAKE_FILES ${CURRENT_PACKAGES_DIR}/debug/share/glog/*.cmake)
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/glog")
-file(COPY ${GLOG_CMAKE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/glog)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-# changes target search path
+vcpkg_copy_pdbs()
-file(READ ${CURRENT_PACKAGES_DIR}/debug/share/glog/glog-targets-debug.cmake GLOG_DEBUG_MODULE)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" GLOG_DEBUG_MODULE "${GLOG_DEBUG_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/glog/glog-targets-debug.cmake "${GLOG_DEBUG_MODULE}")
-
-# remove not used cmake files
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share )
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake )
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake )
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/glog)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/glog/COPYING ${CURRENT_PACKAGES_DIR}/share/glog/copyright)
-