aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffin Downs <35574547+grdowns@users.noreply.github.com>2019-04-12 07:17:23 -0700
committerGitHub <noreply@github.com>2019-04-12 07:17:23 -0700
commit7927c412499036f301788c21af4d796b64a84f67 (patch)
tree277b04d13950f11387afc3ac7518c7b44d0aa7dc
parente5b9e23d1f9ac40e4af99e8099ecf8026b6e200a (diff)
parentf39b96100a0a50fffa662230c182d8e91f610e7e (diff)
downloadvcpkg-7927c412499036f301788c21af4d796b64a84f67.tar.gz
vcpkg-7927c412499036f301788c21af4d796b64a84f67.zip
Merge pull request #6065 from PhoebeHui/dev/Phoebe/UpgradesGlog
[Glog]Upgrades 2019.03.29
-rw-r--r--ports/glog/CONTROL2
-rw-r--r--ports/glog/glog_disable_debug_postfix.patch13
-rw-r--r--ports/glog/portfile.cmake6
3 files changed, 18 insertions, 3 deletions
diff --git a/ports/glog/CONTROL b/ports/glog/CONTROL
index fad754f7c..19b9a35be 100644
--- a/ports/glog/CONTROL
+++ b/ports/glog/CONTROL
@@ -1,4 +1,4 @@
Source: glog
-Version: 0.3.5-1
+Version: 0.4.0
Description: C++ implementation of the Google logging module
Build-Depends: gflags
diff --git a/ports/glog/glog_disable_debug_postfix.patch b/ports/glog/glog_disable_debug_postfix.patch
new file mode 100644
index 000000000..7b882e1fa
--- /dev/null
+++ b/ports/glog/glog_disable_debug_postfix.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 808330e..de0e477 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -44,7 +44,7 @@ include (CTest)
+ include (DetermineGflagsNamespace)
+ include (GNUInstallDirs)
+
+-set (CMAKE_DEBUG_POSTFIX d)
++#set (CMAKE_DEBUG_POSTFIX d)
+ set (CMAKE_THREAD_PREFER_PTHREAD 1)
+
+ if (WITH_GFLAGS)
diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake
index 1fa6b0164..da6b76f4f 100644
--- a/ports/glog/portfile.cmake
+++ b/ports/glog/portfile.cmake
@@ -11,9 +11,11 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/glog
- REF v0.3.5
- SHA512 a54a3b8b4b7660d7558ba5168c659bc3c8323c30908a4f6a4bbc6f9cd899350f3243aabc720daebfdeb799b276b51ba1eaa1a0f83149c4e1a038d552ada1ed72
+ REF v0.4.0
+ SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176
HEAD_REF master
+ PATCHES
+ glog_disable_debug_postfix.patch
)
vcpkg_configure_cmake(