Commit graph

230 commits

Author SHA1 Message Date
Andreas Schuh
67dc01d3e0 Merge branch 'master' of github.com:schuhschuh/gflags into update-cmake-example 2015-03-24 14:39:48 +00:00
Andreas Schuh
04c73f86c3 doc: Remove no longer needed include_directories command from example 2015-03-24 14:39:43 +00:00
Andreas Schuh
02e8c78f9d doc: Spelling correction 2015-03-24 13:21:35 +00:00
Andreas Schuh
0133710d47 add: Common build directory names to ignore list 2015-03-24 12:59:56 +00:00
Andreas Schuh
d8d218ac6f doc: Add gh-pages branch as submodule in doc directory 2015-03-24 12:58:23 +00:00
Andreas Schuh
957f0d291c add: .nojekyll file 2015-03-24 12:55:52 +00:00
Andreas Schuh
63b9776eee fix: Rename documentation HTML file to index.html 2015-03-24 12:55:31 +00:00
Andreas Schuh
3a49eafd20 add: Files from doc/ directory of master branch 2015-03-24 12:51:30 +00:00
Andreas Schuh
6e390924d3 Merge branch 'feature/#83-alternative-namespace' 2015-03-24 12:42:53 +00:00
Andreas Schuh
2614f123fd doc: Convert INSTALL instructions to Markdown 2015-03-24 12:41:43 +00:00
Andreas Schuh
eb89101a1a doc: Replace README by previous NEWS in Markdown format 2015-03-24 12:34:22 +00:00
Andreas Schuh
2a40e19137 cmake: Add advanced cache entries for GFLAGS_NAMESPACE and GFLAGS_INCLUDE_DIR 2015-03-24 12:33:52 +00:00
Andreas Schuh
376ef823be cmake: Do not cache GFLAGS_NAMESPACE and GFLAGS_INCLUDE_DIR.
These CMake variables are now set to a default which both maintains binary backwards compatibility with previous versions of the library, but at the same time allows already the use of the new "gflags" namespace instead of "google". Users may still override the default using the -D option of cmake, for example, when they use the library directly as submodule in their own project and prefer a different namespace/installation directory.
2014-07-17 11:21:36 +01:00
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