On the cxxhl branch: Introduce different compile and link options for
C++HL and the C++ parts of JavaHL, so that the former will be compiled
as C++11 and the latter as C++98, as it is now.
Also rename 'gmock' to 'googlemock' everywhere, because it turns out
that 'gmock' is the name of a mocking test framework for Groovy and
using the shortened name for the C++ test framework would be confusing.
* build/ac-macros/compiler.m4
(SVN_CXX_MODE_SETUP): Rename CXXMODEFLAGS to CXX98MODEFLAGS.
Introduce CXX11MODEFLAGS to force the compiler into C++11 mode.
* configure.ac: Rename gmock to googlemock.
Display both C++98 and C++11 compiler flags, and the C mode flags.
* Makefile.in: Rename gmock to googlemock.
(CXXMODEFLAGS): Remove. Replace with the following:
(CXX98MODEFLAGS, CXX11MODEFLAGS): New; replacement for CXXMODEFLAGS.
(COMPILE_CXX98, COMPILE_CXX98_NOWARN,
LT_COMPILE_CXX98, LT_COMPILE_CXX98_NOWARN,
COMPILE_CXX11, COMPILE_CXX11_NOWARN,
LT_COMPILE_CXX11, LT_COMPILE_CXX11_NOWARN):
New; replacements for COMPILE_CXX, COMPILE_CXX_NOWARN,
and LT_COMPILE_CXX, LT_COMPILE_CXX_NOWARN.
(LINK_CXX98, LINK_CXX98_LIB, LINK_CXX11, LINK_CXX11_LIB):
New; replacements for LINK_CXX and LINK_CXX_LIB.
(COMPILE_JAVAHL_CXX, LINK_JAVAHL_CXX, COMPILE_CXXHL_CXX,
COMPILE_GOOGLEMOCK_CXX, COMPILE_CXXHL_GOOGLEMOCK_CXX): Updated definitions.
(.cpp.o, .cpp.lo): Removed unused suffix rules.
(cxxhl): New target alias.
* build.conf
(libsvn_auth_kwallet, libsvncxxhl, cxxhl-tests):
Update compile and link commands.
(libgooglemock): Renamed from libgmock and updated.
* INSTALL,
gen-make.py,
get-deps.sh,
doc/programmer/gtest-guide.txt,
build/generator/gen_win_dependencies.py: Rename gmock to googlemock.
* .: Update the svn:ignore property.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/cxxhl@1659277 13f79535-47bb-0310-9956-ffa450edef68
9 files changed
