[glog] Update to version 0.3.5

brucedjones · Jul 10, 2017 · 9bbe305 · 9bbe305
1 parent ecf671b
commit 9bbe305
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 60 deletions.
diff --git a/ports/glog/CONTROL b/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
diff --git a/ports/glog/fix-cmake-install-files.patch b/ports/glog/fix-cmake-install-files.patch
diff --git a/ports/glog/portfile.cmake b/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
-    URLS "https://github.com/google/glog/archive/0472b91c5defdf90cff7292e3bf7bd86770a9a0a.zip"
-    FILENAME "glog-0472b91c5defdf90cff7292e3bf7bd86770a9a0a.zip"
-    SHA512 24506ad1cc05e8361379b925ecfc8f32cc47692a47598401cca340eb2a528fe28b8b0d3636983056c7910469d105095bd3bacacff6278bffa18d85603c3dbfa8
-)
-vcpkg_extract_source_archive(${ARCHIVE})
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-cmake-install-files.patch"
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/glog
+    REF v0.3.5
+    SHA512 a54a3b8b4b7660d7558ba5168c659bc3c8323c30908a4f6a4bbc6f9cd899350f3243aabc720daebfdeb799b276b51ba1eaa1a0f83149c4e1a038d552ada1ed72
+    HEAD_REF master
 )
 
 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)
-file(COPY ${GLOG_CMAKE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/glog)
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/glog")
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-# changes target search path
-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 )
+vcpkg_copy_pdbs()
 
 # 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)
-