From eb5e1f7fe44992058db423594cba5c94da85462c Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Sun, 30 Mar 2014 15:17:49 +0100 Subject: [PATCH 1/3] Bump version to 2.1.1. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8afdddf..b11c697 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ include (utils) # ---------------------------------------------------------------------------- # package information set (PACKAGE_NAME "gflags") -set (PACKAGE_VERSION "2.1.0") +set (PACKAGE_VERSION "2.1.1") set (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set (PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") set (PACKAGE_BUGREPORT "https://code.google.com/p/gflags/issues/") From 0890b699e97d7f8ffc898f3c5de6e2645be74e0c Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Sun, 30 Mar 2014 15:18:26 +0100 Subject: [PATCH 2/3] Add NEWS of release version 2.1.1. --- NEWS.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NEWS.txt b/NEWS.txt index ba8d91c..7418607 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,3 +1,14 @@ +=== 30 March 2014 === + +I've just released gflags 2.1.1. + +This release fixes a few bugs in the configuration of gflags_declare.h +and adds a separate GFLAGS_INCLUDE_DIR CMake variable to the build configuration. +Setting GFLAGS_NAMESPACE to "google" no longer changes also the include +path of the public header files. This allows the use of the library with +other Google projects such as glog which still use the deprecated "google" +namespace for the gflags library, but include it as "gflags/gflags.h". + === 20 March 2014 === I've just released gflags 2.1. From ef5c5474b29318a418c1628038865ee252e98b0e Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Sun, 30 Mar 2014 15:34:13 +0100 Subject: [PATCH 3/3] Set CPACK_PACKAGE_ARCHITECTURE to darwin on Mac OS. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b11c697..17d38b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -392,6 +392,8 @@ if (BUILD_PACKAGING) set (CPACK_SYSTEM_NAME "win32") endif () set (CPACK_PACKAGE_ARCHITECTURE) + elseif (APPLE) + set (CPACK_PACKAGE_ARCHITECTURE darwin) else () string (TOLOWER "${CMAKE_SYSTEM_NAME}" CPACK_SYSTEM_NAME) if (CMAKE_CXX_FLAGS MATCHES "-m32")