organicmaps/gflags
13
Fork 0
mirror of https://github.com/gflags/gflags.git synced 2025-04-05 13:35:04 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions
201 commits 7 branches 25 tags 1.9 MiB
Commit graph

201 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Schuh
e65f49a4cd Merge remote-tracking branch 'google/master' into develop 2014-04-07 17:09:39 +01:00
Andreas Schuh
dc2b2c7fec Merge pull request #8 from shawke/patch-1 
Fix compatibility of CMakeCXXInformation.cmake module with older versions of CMake
 2014-04-07 17:08:17 +01:00
shawke
cac974eb07 Fix compatibility with older versions of CMake 
The "SONAME_FLAG" was introduced in CMake 2.8.9, while the current CMake scripts require 2.8.4 (first line of CMakeLists.txt). Increasing the required CMake version will block building in less recent OSes (e.g., for Ubuntu 12.04 LTS, the latest version from the official repositories is currently 2.8.7). The more compatible solution will be to use the old variable name, i.e. the one which was used before CMake was patched.

NB: this issue is triggered upon specifying -DBUILD_SHARED_LIBS=ON.

Related bug report: http://public.kitware.com/Bug/view.php?id=13884 
Commit which implemented this new variable: http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1409ac5
 2014-04-07 18:03:26 +02:00
Andreas Schuh
44a58145e3 Merge remote-tracking branch 'google/release' into develop 2014-03-30 15:44:24 +01:00
Andreas Schuh
07031f9703 Merge remote-tracking branch 'google/release' 2014-03-30 15:41:29 +01:00
Andreas Schuh
4003103499 Add ChangeLog entries for release 2.1.1. 2014-03-30 15:41:02 +01:00
Andreas Schuh
cf0619e458 Merge remote-tracking branch 'google/release' into develop 2014-03-30 15:35:13 +01:00
Andreas Schuh
eb3b78a4ff Merge remote-tracking branch 'google/release' 2014-03-30 15:34:40 +01:00
Andreas Schuh
ef5c5474b2 Set CPACK_PACKAGE_ARCHITECTURE to darwin on Mac OS. 2014-03-30 15:34:13 +01:00
Andreas Schuh
0890b699e9 Add NEWS of release version 2.1.1. 2014-03-30 15:18:26 +01:00
Andreas Schuh
eb5e1f7fe4 Bump version to 2.1.1. 2014-03-30 15:17:49 +01:00
Andreas Schuh
7bc160b304 Merge remote-tracking branch 'google/develop' into release 2014-03-30 15:16:35 +01:00
Andreas Schuh
dc8543a473 Add test which uses gflags_declare.h. 
Update issue 79
Added a test which uses gflags_declare.h as any other project would use it to avoid such avoidable build configuration mistakes.
 2014-03-30 15:16:00 +01:00
Andreas Schuh
9a257c0b66 Merge remote-tracking branch 'google/develop' into release 2014-03-30 14:46:28 +01:00
Andreas Schuh
94c23575c7 Update NEWS. 2014-03-27 01:45:47 +00:00
Andreas Schuh
0f2751ebfb Merge branch 'develop' of github.com:schuhschuh/gflags into develop 2014-03-27 01:30:30 +00:00
Andreas Schuh
020dc487c3 Merge branch 'refs/heads/bugfix/#77-@GFLAGS_IS_A_DLL@-expands-to-empty' into develop 2014-03-27 01:29:02 +00:00
Andreas Schuh
0c6e5fdb3f Add GFLAGS_INCLUDE_DIR CMake variable (Fixes issue #80). 
Both GFLAGS_NAMESPACE and GFLAGS_INCLUDE_DIR can be used to customize the installation of the gflags library. One specifies the C++ namespace name of the gflags symbols, the other the include subdirectory path of the public header files. By default, both are set to "gflags", but other Google libraries still expect "google" as C++ namespace name, but not necessarily also include path.
 2014-03-27 01:14:24 +00:00
Andreas Schuh
38c4402f58 Use GFLAGS_IS_A_DLL=1 in public headers if BUILD_SHARED_LIBS is enabled (Fixes issue #77). 2014-03-27 01:14:24 +00:00
Andreas Schuh
7c80cfd87c Remove devel package content summary from README 2014-03-27 01:11:30 +00:00
Andreas Schuh
30d045d0ec Merge remote-tracking branch 'google/feature/#80-configurable-include-path' into develop 2014-03-27 01:09:49 +00:00
Andreas Schuh
aff8ef820a Add GFLAGS_INCLUDE_DIR CMake variable (Fixes issue #80). 
Both GFLAGS_NAMESPACE and GFLAGS_INCLUDE_DIR can be used to customize the installation of the gflags library. One specifies the C++ namespace name of the gflags symbols, the other the include subdirectory path of the public header files. By default, both are set to "gflags", but other Google libraries still expect "google" as C++ namespace name, but not necessarily also include path.
 2014-03-27 01:09:20 +00:00
Andreas Schuh
38213112a5 Replace GFLAGS_NAMESPACE by @GFLAGS_NAMESPACE@ in gflags_declare.h (Fixes issue #79). 2014-03-26 19:37:01 +00:00
Andreas Schuh
4aa1984c51 Merge remote-tracking branch 'google/bugfix/#77-@GFLAGS_IS_A_DLL@-expands-to-empty' into develop 2014-03-26 19:33:24 +00:00
Andreas Schuh
6040eac5b3 Use GFLAGS_IS_A_DLL=1 in public headers if BUILD_SHARED_LIBS is enabled (Fixes issue #77). 2014-03-25 15:30:37 +00:00
Andreas Schuh
09f7800768 Use GFLAGS_IS_A_DLL=1 in public headers if BUILD_SHARED_LIBS is enabled (Fixes issue #77). 2014-03-25 15:29:56 +00:00
Andreas Schuh
bbe1895559 Remove devel package content summary from README 2014-03-22 01:00:11 +00:00
Andreas Schuh
3fd9fa7000 Resolve conflicts upon pull. 2014-03-20 21:25:35 +00:00
Andreas Schuh
cf40f73c40 Set package architecture to i386 when compiling with -m32. 2014-03-20 20:56:05 +00:00
Andreas Schuh
0e1c5ce039 Merge remote-tracking branch 'google/release' into develop 2014-03-20 20:29:11 +00:00
Andreas Schuh
2a9ef084a9 Merge remote-tracking branch 'google/hotfix/rpm-package-architecture' into release 2014-03-20 20:27:48 +00:00
Andreas Schuh
0c15028124 Merge remote-tracking branch 'google/hotfix/rpm-package-architecture' 2014-03-20 20:24:30 +00:00
Andreas Schuh
d699559081 Fix architecture used for RPM packages and DEB/RPM package file names. 2014-03-20 20:21:30 +00:00
Andreas Schuh
04a30c86de Merge remote-tracking branch 'google/release' into 'master'. 
Conflicts:
	gflags-vs2003.sln
	gflags-vs2010.sln
	gflags-vs2012.sln
	vsprojects/gflags_unittest/gflags_unittest-vs2010.vcxproj
	vsprojects/libgflags/libgflags-vs2010.vcxproj
 2014-03-20 16:37:14 +00:00
Andreas Schuh
882db5d018 Mention Git branching model in NEWS. 2014-03-20 16:35:30 +00:00
Andreas Schuh
33e2cbe2c6 Add release notes. 2014-03-20 16:32:54 +00:00
Andreas Schuh
3e96a19026 Change version to 2.1.0, i.e., use common semantic versioning system including patch number for bug fix releases. 2014-03-20 16:19:00 +00:00
Andreas Schuh
0100be50ec Add missing entry to ChangeLog for v2.1 release. 2014-03-20 16:15:10 +00:00
Andreas Schuh
76f2ffadb4 Add ChangeLog entries for v2.1 release. 2014-03-20 16:02:15 +00:00
Andreas Schuh
978c567d02 Ignore packages subdirectory (if it exists). 2014-03-20 04:43:01 +00:00
Andreas Schuh
06ad5027d2 Merge branch 'refs/heads/feature/cpack-package-generation' into develop 2014-03-20 04:38:03 +00:00
Andreas Schuh
a49a656f1e Use dpkg --print-architecture also for RPM generator. 2014-03-20 04:24:57 +00:00
Andreas Schuh
e8890f274a Set additional DEB CPack variables in package.cmake.in. 2014-03-20 04:20:15 +00:00
Andreas Schuh
fc6e079cfc Change package vendor to just a name. 2014-03-20 04:09:02 +00:00
Andreas Schuh
52bf642cf8 Remove brief description from README to avoid duplicate appearance in RPM and other packages. 2014-03-20 04:06:27 +00:00
Andreas Schuh
4b1ca7d5f1 Add missing year to ChangeLog entry. RPM is now generated successfully. 2014-03-20 03:53:50 +00:00
Andreas Schuh
4258af12b7 Remove separating lines from ChangeLog again. 2014-03-20 03:51:30 +00:00
Andreas Schuh
313e39e323 Add missing name to ChangeLog entry and further format changes. 2014-03-20 03:49:21 +00:00
Andreas Schuh
dc9674ee46 Remove time fields from ChangeLog entries which are not compatible with RPM spec. 2014-03-20 03:42:22 +00:00
Andreas Schuh
b6f61ab0ce Fix bugs in package configuration file. 2014-03-20 03:38:59 +00:00