Checkout
Branko ─îibej
committed
on 31 May 16
Make get-deps.sh download Googlemock and Googletest from GitHub.
Also rename gmock->googlemock throughout the code
(except for a few places … Show more
Make get-deps.sh download Googlemock and Googletest from GitHub.

Also rename gmock->googlemock throughout the code

(except for a few places in get_deps.sh).

* .: Ignore directory 'googlemock' instaed of 'gmock-fused'.

* get-deps.sh: Renamed gmock to googlemock.

 (GMOCK_VERSION): Bump to 1.7.0

 (GMOCK, GMOCK_URL): Update to the new location on GitHub.

 (GTEST, GTEST_URL, GTEST_VERSION): New variables.

 (get_googlemock): Updated to download both Googlemock and Googletest sources.

* configure.ac: Renamed gmock to googlemock.

 (SVN_USE_GOOGLEMOCK): Fixed one instance that was mistyped.

* build.conf: Renamed gmock to googlemock.

 (cxxhl-tests): Updated target definition.

 (libgooglemock): Updated source path and sources list.

* Makefile.in: Renamed gmock to googlemock.

 (GOOGLEMOCK_INCLUDES): Changed, these are now only the include paths that

  are needed by tests that use Googlemock, not the Googlemock library itself.

 (GOOGLEMOCK_LIB_INCLUDES): New, these are the include paths for the library.

 (COMPILE_GOOGLEMOCK_CXX): Use the correct include paths.

Show less