Andreas Schuh
76cbe0d003
Change default GFLAGS_NAMESPACE to "google;gflags" and add GFLAGS_INCLUDE_DIR with default "gflags" to cache.
...
This ensures binary compatibility with previous 2.x release versions while allowing users to refer to the gflags library symbols using the preferred "gflags" namespace identifier.
2014-07-17 02:45:50 +01:00
Andreas Schuh
2b81a76bed
fix: Include guard of alternative "gflags" namespace header.
2014-07-17 02:14:41 +01:00
Andreas Schuh
659b440f9e
Support alternative namespaces in GFLAGS_NAMESPACE CMake variable.
...
The first element in the GFLAGS_NAMESPACE list is used as primary/default namespace. The symbols are then imported from this primary namespace into each of the other alternative namespaces with the using keyword. This is in particular used to maintain backwards compatibility with previous gflags library versions that used the "google" namespace instead of the new default "gflags" namespace.
2014-05-02 14:56:58 +01:00
Andreas Schuh
a93de007a6
Define GFLAGS_NAMESPACE in public headers.
...
This avoids any mistakes where once @GFLAGS_NAMESPACE@ was used in public .h.in files, or the #define GFLAGS_NAMESPACE in internal source files.
2014-05-02 12:00:35 +01:00
Andreas Schuh
05b155ff59
Merge remote-tracking branch 'google/bugfix/#82-shared-library-versioning'
2014-05-02 11:13:18 +01:00
Andreas Schuh
cd7aece14e
Use major version number only as SOVERSION.
2014-05-02 11:12:05 +01:00
Andreas Schuh
b8c6fef385
Merge remote-tracking branch 'google/bugfix/#82-shared-library-versioning'
2014-05-01 20:44:09 +01:00
Andreas Schuh
bf889786c2
Set VERSION property of library targets to <major>.<minor>.
2014-05-01 20:16:16 +01:00
Andreas Schuh
e160474c52
Merge remote-tracking branch 'google/develop'
2014-05-01 20:00:11 +01:00
Andreas Schuh
6828323bc6
Merge pull request #10 from ivaxer/doc-namespace-rename
...
doc: rename namespace from google (deprecated) to gflags (default)
2014-05-01 19:59:36 +01:00
Andreas Schuh
31f0e290d6
Use LIB_INSTALL_DIR to initialize LIBRARY_INSTALL_DIR.
...
In particular the Fedora package maintainers pass LIB_INSTALL_DIR instead of LIBRARY_INSTALL_DIR.
2014-05-01 19:58:25 +01:00
Andreas Schuh
3c30390ac4
Merge remote-tracking branch 'google/master' into develop
2014-05-01 19:49:53 +01:00
Andreas Schuh
e9144aa159
Make LIBRARY_INSTALL_DIR configurable by the user.
2014-05-01 19:49:24 +01:00
Andreas Schuh
44d1d163cc
Merge pull request #9 from ivaxer/lib-suffix
...
Append LIB_SUFFIX to LIBRARY_INSTALL_DIR.
2014-05-01 19:40:03 +01:00
John Khvatov
d9d06b99a4
doc: rename namespace from google (deprecated) to gflags (default)
2014-05-01 05:21:38 +04:00
John Khvatov
55490439d0
cmake: append LIB_SUFFIX to LIBRARY_INSTALL_DIR
2014-05-01 04:11:54 +04:00
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