Bumped gtest to 1.8.0, fixed some related issues

Note: The googletest directory included has been modified from the original release: The CMakeLists.txt has been adapted and gmock and some other unnecessary folders have been removed.

CMakeLists.txt

@@ -74,7 +74,7 @@ ENDIF()
 
 # build campvis-test when enabled
 IF(CAMPVIS_ENABLE_TESTING)
-    ADD_SUBDIRECTORY(ext/gtest-1.7.0)
+    ADD_SUBDIRECTORY(ext/googletest-release-1.8.0)
     ADD_SUBDIRECTORY(test)
 ENDIF()
 

ext/googletest-release-1.8.0/.gitignore

+# Ignore CI build directory
+build/

ext/googletest-release-1.8.0/.travis.yml

+# Build matrix / environment variable are explained on:
+# http://about.travis-ci.org/docs/user/build-configuration/
+# This file can be validated on:
+# http://lint.travis-ci.org/
+
+install:
+# /usr/bin/gcc is 4.6 always, but gcc-X.Y is available.
+- if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
+# /usr/bin/clang is 3.4, lets override with modern one.
+- if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
+- echo ${PATH}
+- echo ${CXX}
+- ${CXX} --version
+- ${CXX} -v
+addons:
+  apt:
+    # List of whitelisted in travis packages for ubuntu-precise can be found here:
+    #   https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
+    # List of whitelisted in travis apt-sources:
+    #   https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
+    sources:
+    - ubuntu-toolchain-r-test
+    - llvm-toolchain-precise-3.7
+    packages:
+    - gcc-4.9
+    - g++-4.9
+    - clang-3.7
+    - valgrind
+os:
+  - linux
+  - osx
+language: cpp
+compiler:
+  - gcc
+  - clang
+script: ./travis.sh
+env:
+  matrix:
+    - GTEST_TARGET=googletest SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug   VERBOSE_MAKE=true VERBOSE
+    - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug   VERBOSE_MAKE=true VERBOSE
+    - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug CXX_FLAGS=-std=c++11  VERBOSE_MAKE=true VERBOSE
+#    - GTEST_TARGET=googletest SHARED_LIB=ON  STATIC_LIB=ON CMAKE_PKG=ON  BUILD_TYPE=release VERBOSE_MAKE=false
+#    - GTEST_TARGET=googlemock SHARED_LIB=ON  STATIC_LIB=ON CMAKE_PKG=ON  BUILD_TYPE=release VERBOSE_MAKE=false
+notifications:
+  email: false
+sudo: false

ext/googletest-release-1.8.0/CMakeLists.txt

+cmake_minimum_required(VERSION 2.6.2)
+
+project( googletest-distribution )
+
+enable_testing()
+
+add_subdirectory( googletest )

ext/googletest-release-1.8.0/README.md

+
+# Google Test #
+
+[![Build Status](https://travis-ci.org/google/googletest.svg?branch=master)](https://travis-ci.org/google/googletest)
+[![Build status](https://ci.appveyor.com/api/projects/status/4o38plt0xbo1ubc8/branch/master?svg=true)](https://ci.appveyor.com/project/BillyDonahue/googletest/branch/master)
+
+Welcome to **Google Test**, Google's C++ test framework!
+
+This repository is a merger of the formerly separate GoogleTest and
+GoogleMock projects. These were so closely related that it makes sense to
+maintain and release them together.
+
+Please see the project page above for more information as well as the
+mailing list for questions, discussions, and development.  There is
+also an IRC channel on OFTC (irc.oftc.net) #gtest available.  Please
+join us!
+
+Getting started information for **Google Test** is available in the 
+[Google Test Primer](googletest/docs/Primer.md) documentation.
+
+**Google Mock** is an extension to Google Test for writing and using C++ mock
+classes.  See the separate [Google Mock documentation](googlemock/README.md).
+
+More detailed documentation for googletest (including build instructions) are
+in its interior [googletest/README.md](googletest/README.md) file.
+
+## Features ##
+
+  * An [XUnit](https://en.wikipedia.org/wiki/XUnit) test framework.
+  * Test discovery.
+  * A rich set of assertions.
+  * User-defined assertions.
+  * Death tests.
+  * Fatal and non-fatal failures.
+  * Value-parameterized tests.
+  * Type-parameterized tests.
+  * Various options for running the tests.
+  * XML test report generation.
+
+## Platforms ##
+
+Google test has been used on a variety of platforms:
+
+  * Linux
+  * Mac OS X
+  * Windows
+  * Cygwin
+  * MinGW
+  * Windows Mobile
+  * Symbian
+
+## Who Is Using Google Test? ##
+
+In addition to many internal projects at Google, Google Test is also used by
+the following notable projects:
+
+  * The [Chromium projects](http://www.chromium.org/) (behind the Chrome
+    browser and Chrome OS).
+  * The [LLVM](http://llvm.org/) compiler.
+  * [Protocol Buffers](https://github.com/google/protobuf), Google's data
+    interchange format.
+  * The [OpenCV](http://opencv.org/) computer vision library.
+
+## Related Open Source Projects ##
+
+[Google Test UI](https://github.com/ospector/gtest-gbar) is test runner that runs
+your test binary, allows you to track its progress via a progress bar, and
+displays a list of test failures. Clicking on one shows failure text. Google
+Test UI is written in C#.
+
+[GTest TAP Listener](https://github.com/kinow/gtest-tap-listener) is an event
+listener for Google Test that implements the
+[TAP protocol](https://en.wikipedia.org/wiki/Test_Anything_Protocol) for test
+result output. If your test runner understands TAP, you may find it useful.
+
+## Requirements ##
+
+Google Test is designed to have fairly minimal requirements to build
+and use with your projects, but there are some.  Currently, we support
+Linux, Windows, Mac OS X, and Cygwin.  We will also make our best
+effort to support other platforms (e.g. Solaris, AIX, and z/OS).
+However, since core members of the Google Test project have no access
+to these platforms, Google Test may have outstanding issues there.  If
+you notice any problems on your platform, please notify
+<googletestframework@googlegroups.com>. Patches for fixing them are
+even more welcome!
+
+### Linux Requirements ###
+
+These are the base requirements to build and use Google Test from a source
+package (as described below):
+
+  * GNU-compatible Make or gmake
+  * POSIX-standard shell
+  * POSIX(-2) Regular Expressions (regex.h)
+  * A C++98-standard-compliant compiler
+
+### Windows Requirements ###
+
+  * Microsoft Visual C++ v7.1 or newer
+
+### Cygwin Requirements ###
+
+  * Cygwin v1.5.25-14 or newer
+
+### Mac OS X Requirements ###
+
+  * Mac OS X v10.4 Tiger or newer
+  * Xcode Developer Tools
+
+### Requirements for Contributors ###
+
+We welcome patches.  If you plan to contribute a patch, you need to
+build Google Test and its own tests from a git checkout (described
+below), which has further requirements:
+
+  * [Python](https://www.python.org/) v2.3 or newer (for running some of
+    the tests and re-generating certain source files from templates)
+  * [CMake](https://cmake.org/) v2.6.4 or newer
+
+## Regenerating Source Files ##
+
+Some of Google Test's source files are generated from templates (not
+in the C++ sense) using a script.
+For example, the
+file include/gtest/internal/gtest-type-util.h.pump is used to generate
+gtest-type-util.h in the same directory.
+
+You don't need to worry about regenerating the source files
+unless you need to modify them.  You would then modify the
+corresponding `.pump` files and run the '[pump.py](googletest/scripts/pump.py)'
+generator script.  See the [Pump Manual](googletest/docs/PumpManual.md).
+
+### Contributing Code ###
+
+We welcome patches.  Please read the
+[Developer's Guide](googletest/docs/DevGuide.md)
+for how you can contribute. In particular, make sure you have signed
+the Contributor License Agreement, or we won't be able to accept the
+patch.
+
+Happy testing!

ext/googletest-release-1.8.0/appveyor.yml

+version: '{build}'
+
+os: Visual Studio 2015
+
+environment:
+  matrix:
+  - Toolset: v140
+  - Toolset: v120
+  - Toolset: v110
+  - Toolset: v100
+
+platform:
+  - Win32
+  - x64
+
+configuration:
+#  - Release
+  - Debug
+
+build:
+  verbosity: minimal
+
+artifacts:
+  - path: '_build/Testing/Temporary/*'
+    name: test_results
+
+before_build:
+- ps: |
+    Write-Output "Configuration: $env:CONFIGURATION"
+    Write-Output "Platform: $env:PLATFORM"
+    $generator = switch ($env:TOOLSET)
+    {
+        "v140" {"Visual Studio 14 2015"}
+        "v120" {"Visual Studio 12 2013"}
+        "v110" {"Visual Studio 11 2012"}
+        "v100" {"Visual Studio 10 2010"}
+    }
+    if ($env:PLATFORM -eq "x64")
+    {
+        $generator = "$generator Win64"
+    }
+
+build_script:
+- ps: |
+    if (($env:TOOLSET -eq "v100") -and ($env:PLATFORM -eq "x64"))
+    {
+        return
+    }
+    md _build -Force | Out-Null
+    cd _build
+
+    & cmake -G "$generator" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -Dgtest_build_tests=ON -Dgtest_build_samples=ON -Dgmock_build_tests=ON ..
+    if ($LastExitCode -ne 0) {
+        throw "Exec: $ErrorMessage"
+    }
+    & cmake --build . --config $env:CONFIGURATION
+    if ($LastExitCode -ne 0) {
+        throw "Exec: $ErrorMessage"
+    }
+
+test_script:
+- ps: |
+    if (($env:Toolset -eq "v100") -and ($env:PLATFORM -eq "x64"))
+    {
+        return
+    }
+
+    & ctest -C $env:CONFIGURATION --output-on-failure
+    if ($LastExitCode -ne 0) {
+        throw "Exec: $ErrorMessage"
+    }

ext/googletest-release-1.8.0/googletest/.gitignore

+# python
+*.pyc

ext/googletest-release-1.8.0/googletest/CHANGES

+Changes for 1.7.0:
+
+* New feature: death tests are supported on OpenBSD and in iOS
+  simulator now.
+* New feature: Google Test now implements a protocol to allow
+  a test runner to detect that a test program has exited
+  prematurely and report it as a failure (before it would be
+  falsely reported as a success if the exit code is 0).
+* New feature: Test::RecordProperty() can now be used outside of the
+  lifespan of a test method, in which case it will be attributed to
+  the current test case or the test program in the XML report.
+* New feature (potentially breaking): --gtest_list_tests now prints
+  the type parameters and value parameters for each test.
+* Improvement: char pointers and char arrays are now escaped properly
+  in failure messages.
+* Improvement: failure summary in XML reports now includes file and
+  line information.
+* Improvement: the <testsuites> XML element now has a timestamp attribute.
+* Improvement: When --gtest_filter is specified, XML report now doesn't
+  contain information about tests that are filtered out.
+* Fixed the bug where long --gtest_filter flag values are truncated in
+  death tests.
+* Potentially breaking change: RUN_ALL_TESTS() is now implemented as a
+  function instead of a macro in order to work better with Clang.
+* Compatibility fixes with C++ 11 and various platforms.
+* Bug/warning fixes.
+
+Changes for 1.6.0:
+
+* New feature: ADD_FAILURE_AT() for reporting a test failure at the
+  given source location -- useful for writing testing utilities.
+* New feature: the universal value printer is moved from Google Mock
+  to Google Test.
+* New feature: type parameters and value parameters are reported in
+  the XML report now.
+* A gtest_disable_pthreads CMake option.
+* Colored output works in GNU Screen sessions now.
+* Parameters of value-parameterized tests are now printed in the
+  textual output.
+* Failures from ad hoc test assertions run before RUN_ALL_TESTS() are
+  now correctly reported.
+* Arguments of ASSERT_XY and EXPECT_XY no longer need to support << to
+  ostream.
+* More complete handling of exceptions.
+* GTEST_ASSERT_XY can be used instead of ASSERT_XY in case the latter
+  name is already used by another library.
+* --gtest_catch_exceptions is now true by default, allowing a test
+  program to continue after an exception is thrown.
+* Value-parameterized test fixtures can now derive from Test and
+  WithParamInterface<T> separately, easing conversion of legacy tests.
+* Death test messages are clearly marked to make them more
+  distinguishable from other messages.
+* Compatibility fixes for Android, Google Native Client, MinGW, HP UX,
+  PowerPC, Lucid autotools, libCStd, Sun C++, Borland C++ Builder (Code Gear),
+  IBM XL C++ (Visual Age C++), and C++0x.
+* Bug fixes and implementation clean-ups.
+* Potentially incompatible changes: disables the harmful 'make install'
+  command in autotools.
+
+Changes for 1.5.0:
+
+ * New feature: assertions can be safely called in multiple threads
+   where the pthreads library is available.
+ * New feature: predicates used inside EXPECT_TRUE() and friends
+   can now generate custom failure messages.
+ * New feature: Google Test can now be compiled as a DLL.
+ * New feature: fused source files are included.
+ * New feature: prints help when encountering unrecognized Google Test flags.
+ * Experimental feature: CMake build script (requires CMake 2.6.4+).
+ * Experimental feature: the Pump script for meta programming.
+ * double values streamed to an assertion are printed with enough precision
+   to differentiate any two different values.
+ * Google Test now works on Solaris and AIX.
+ * Build and test script improvements.
+ * Bug fixes and implementation clean-ups.
+
+ Potentially breaking changes:
+
+ * Stopped supporting VC++ 7.1 with exceptions disabled.
+ * Dropped support for 'make install'.
+
+Changes for 1.4.0:
+
+ * New feature: the event listener API
+ * New feature: test shuffling
+ * New feature: the XML report format is closer to junitreport and can
+   be parsed by Hudson now.
+ * New feature: when a test runs under Visual Studio, its failures are
+   integrated in the IDE.
+ * New feature: /MD(d) versions of VC++ projects.
+ * New feature: elapsed time for the tests is printed by default.
+ * New feature: comes with a TR1 tuple implementation such that Boost
+   is no longer needed for Combine().
+ * New feature: EXPECT_DEATH_IF_SUPPORTED macro and friends.
+ * New feature: the Xcode project can now produce static gtest
+   libraries in addition to a framework.
+ * Compatibility fixes for Solaris, Cygwin, minGW, Windows Mobile,
+   Symbian, gcc, and C++Builder.
+ * Bug fixes and implementation clean-ups.
+
+Changes for 1.3.0:
+
+ * New feature: death tests on Windows, Cygwin, and Mac.
+ * New feature: ability to use Google Test assertions in other testing
+   frameworks.
+ * New feature: ability to run disabled test via
+   --gtest_also_run_disabled_tests.
+ * New feature: the --help flag for printing the usage.
+ * New feature: access to Google Test flag values in user code.
+ * New feature: a script that packs Google Test into one .h and one
+   .cc file for easy deployment.
+ * New feature: support for distributing test functions to multiple
+   machines (requires support from the test runner).
+ * Bug fixes and implementation clean-ups.
+
+Changes for 1.2.1:
+
+ * Compatibility fixes for Linux IA-64 and IBM z/OS.
+ * Added support for using Boost and other TR1 implementations.
+ * Changes to the build scripts to support upcoming release of Google C++
+   Mocking Framework.
+ * Added Makefile to the distribution package.
+ * Improved build instructions in README.
+
+Changes for 1.2.0:
+
+ * New feature: value-parameterized tests.
+ * New feature: the ASSERT/EXPECT_(NON)FATAL_FAILURE(_ON_ALL_THREADS)
+   macros.
+ * Changed the XML report format to match JUnit/Ant's.
+ * Added tests to the Xcode project.
+ * Added scons/SConscript for building with SCons.
+ * Added src/gtest-all.cc for building Google Test from a single file.
+ * Fixed compatibility with Solaris and z/OS.
+ * Enabled running Python tests on systems with python 2.3 installed,
+   e.g. Mac OS X 10.4.
+ * Bug fixes.
+
+Changes for 1.1.0:
+
+ * New feature: type-parameterized tests.
+ * New feature: exception assertions.
+ * New feature: printing elapsed time of tests.
+ * Improved the robustness of death tests.
+ * Added an Xcode project and samples.
+ * Adjusted the output format on Windows to be understandable by Visual Studio.
+ * Minor bug fixes.
+
+Changes for 1.0.1:
+
+ * Added project files for Visual Studio 7.1.
+ * Fixed issues with compiling on Mac OS X.
+ * Fixed issues with compiling on Cygwin.
+
+Changes for 1.0.0:
+
+ * Initial Open Source release of Google Test

ext/gtest-1.7.0/CMakeLists.txt → ext/googletest-release-1.8.0/googletest/CMakeLists.txt

@@ -14,16 +14,21 @@ option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
 option(
   gtest_force_shared_crt
   "Use shared (DLL) run-time lib even when Google Test is built as static lib."
-  ON)
+  OFF)
 
-##option(gtest_build_tests "Build all of gtest's own tests." OFF)
+option(gtest_build_tests "Build all of gtest's own tests." OFF)
 
-##option(gtest_build_samples "Build gtest's sample programs." OFF)
+option(gtest_build_samples "Build gtest's sample programs." OFF)
 
 option(gtest_disable_pthreads "Disable uses of pthreads in gtest." OFF)
 
+option(
+  gtest_hide_internal_symbols
+  "Build gtest with internal symbols hidden in shared libraries."
+  OFF)
+
 # Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build().
-##include(cmake/hermetic_build.cmake OPTIONAL)
+include(cmake/hermetic_build.cmake OPTIONAL)
 
 if (COMMAND pre_project_set_up_hermetic_build)
   pre_project_set_up_hermetic_build()
@@ -46,6 +51,11 @@ if (COMMAND set_up_hermetic_build)
   set_up_hermetic_build()
 endif()
 
+if (gtest_hide_internal_symbols)
+  set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+  set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+endif()
+
 # Define helper functions and macros used by Google Test.
 include(cmake/internal_utils.cmake)
 
@@ -77,9 +87,25 @@ endif()
 # Google Test libraries.  We build them using more strict warnings than what
 # are used for other targets, to ensure that gtest can be compiled by a user
 # aggressive about warnings.
-cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
-cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
-target_link_libraries(gtest_main gtest)
+cxx_library_with_type(gtest STATIC "${cxx_flags}" src/gtest-all.cc)
+#cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
+#target_link_libraries(gtest_main gtest)
+
+# If the CMake version supports it, attach header directory information
+# to the targets for when we are part of a parent build (ie being pulled
+# in via add_subdirectory() rather than being a standalone build).
+if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
+  target_include_directories(gtest      INTERFACE "${gtest_SOURCE_DIR}/include")
+  #target_include_directories(gtest_main INTERFACE "${gtest_SOURCE_DIR}/include")
+endif()
+
+########################################################################
+#
+# Install rules
+#install(TARGETS gtest gtest_main
+#  DESTINATION lib)
+install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest
+  DESTINATION include)
 
 ########################################################################
 #
@@ -89,18 +115,18 @@ target_link_libraries(gtest_main gtest)
 # gtest_build_samples option to ON.  You can do it by running ccmake
 # or specifying the -Dgtest_build_samples=ON flag when running cmake.
 
-##if (gtest_build_samples)
-##  cxx_executable(sample1_unittest samples gtest_main samples/sample1.cc)
-##  cxx_executable(sample2_unittest samples gtest_main samples/sample2.cc)
-##  cxx_executable(sample3_unittest samples gtest_main)
-##  cxx_executable(sample4_unittest samples gtest_main samples/sample4.cc)
-##  cxx_executable(sample5_unittest samples gtest_main samples/sample1.cc)
-##  cxx_executable(sample6_unittest samples gtest_main)
-##  cxx_executable(sample7_unittest samples gtest_main)
-##  cxx_executable(sample8_unittest samples gtest_main)
-##  cxx_executable(sample9_unittest samples gtest)
-##  cxx_executable(sample10_unittest samples gtest)
-##endif()
+if (gtest_build_samples)
+  cxx_executable(sample1_unittest samples gtest_main samples/sample1.cc)
+  cxx_executable(sample2_unittest samples gtest_main samples/sample2.cc)
+  cxx_executable(sample3_unittest samples gtest_main)
+  cxx_executable(sample4_unittest samples gtest_main samples/sample4.cc)
+  cxx_executable(sample5_unittest samples gtest_main samples/sample1.cc)
+  cxx_executable(sample6_unittest samples gtest_main)
+  cxx_executable(sample7_unittest samples gtest_main)
+  cxx_executable(sample8_unittest samples gtest_main)
+  cxx_executable(sample9_unittest samples gtest)
+  cxx_executable(sample10_unittest samples gtest)
+endif()
 
 ########################################################################
 #
@@ -113,148 +139,148 @@ target_link_libraries(gtest_main gtest)
 # gtest_build_tests option to ON.  You can do it by running ccmake
 # or specifying the -Dgtest_build_tests=ON flag when running cmake.
 
-##if (gtest_build_tests)
-##  # This must be set in the root directory for the tests to be run by
-##  # 'make test' or ctest.
-##  enable_testing()
-##
-##  ############################################################
-##  # C++ tests built with standard compiler flags.
-##
-##  cxx_test(gtest-death-test_test gtest_main)
-##  cxx_test(gtest_environment_test gtest)
-##  cxx_test(gtest-filepath_test gtest_main)
-##  cxx_test(gtest-linked_ptr_test gtest_main)
-##  cxx_test(gtest-listener_test gtest_main)
-##  cxx_test(gtest_main_unittest gtest_main)
-##  cxx_test(gtest-message_test gtest_main)
-##  cxx_test(gtest_no_test_unittest gtest)
-##  cxx_test(gtest-options_test gtest_main)
-##  cxx_test(gtest-param-test_test gtest
-##    test/gtest-param-test2_test.cc)
-##  cxx_test(gtest-port_test gtest_main)
-##  cxx_test(gtest_pred_impl_unittest gtest_main)
-##  cxx_test(gtest_premature_exit_test gtest
-##    test/gtest_premature_exit_test.cc)
-##  cxx_test(gtest-printers_test gtest_main)
-##  cxx_test(gtest_prod_test gtest_main
-##    test/production.cc)
-##  cxx_test(gtest_repeat_test gtest)
-##  cxx_test(gtest_sole_header_test gtest_main)
-##  cxx_test(gtest_stress_test gtest)
-##  cxx_test(gtest-test-part_test gtest_main)
-##  cxx_test(gtest_throw_on_failure_ex_test gtest)
-##  cxx_test(gtest-typed-test_test gtest_main
-##    test/gtest-typed-test2_test.cc)
-##  cxx_test(gtest_unittest gtest_main)
-##  cxx_test(gtest-unittest-api_test gtest)
-##
-##  ############################################################
-##  # C++ tests built with non-standard compiler flags.
-##
-##  # MSVC 7.1 does not support STL with exceptions disabled.
-##  if (NOT MSVC OR MSVC_VERSION GREATER 1310)
-##    cxx_library(gtest_no_exception "${cxx_no_exception}"
-##      src/gtest-all.cc)
-##    cxx_library(gtest_main_no_exception "${cxx_no_exception}"
-##      src/gtest-all.cc src/gtest_main.cc)
-##  endif()
-##  cxx_library(gtest_main_no_rtti "${cxx_no_rtti}"
-##    src/gtest-all.cc src/gtest_main.cc)
-##
-##  cxx_test_with_flags(gtest-death-test_ex_nocatch_test
-##    "${cxx_exception} -DGTEST_ENABLE_CATCH_EXCEPTIONS_=0"
-##    gtest test/gtest-death-test_ex_test.cc)
-##  cxx_test_with_flags(gtest-death-test_ex_catch_test
-##    "${cxx_exception} -DGTEST_ENABLE_CATCH_EXCEPTIONS_=1"
-##    gtest test/gtest-death-test_ex_test.cc)
-##
-##  cxx_test_with_flags(gtest_no_rtti_unittest "${cxx_no_rtti}"
-##    gtest_main_no_rtti test/gtest_unittest.cc)
-##
-##  cxx_shared_library(gtest_dll "${cxx_default}"
-##    src/gtest-all.cc src/gtest_main.cc)
-##
-##  cxx_executable_with_flags(gtest_dll_test_ "${cxx_default}"
-##    gtest_dll test/gtest_all_test.cc)
-##  set_target_properties(gtest_dll_test_
-##                        PROPERTIES
-##                        COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
-##
-##  if (NOT MSVC OR MSVC_VERSION LESS 1600)  # 1600 is Visual Studio 2010.
-##    # Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that
-##    # conflict with our own definitions. Therefore using our own tuple does not
-##    # work on those compilers.
-##    cxx_library(gtest_main_use_own_tuple "${cxx_use_own_tuple}"
-##      src/gtest-all.cc src/gtest_main.cc)
-##
-##    cxx_test_with_flags(gtest-tuple_test "${cxx_use_own_tuple}"
-##      gtest_main_use_own_tuple test/gtest-tuple_test.cc)
-##
-##    cxx_test_with_flags(gtest_use_own_tuple_test "${cxx_use_own_tuple}"
-##      gtest_main_use_own_tuple
-##      test/gtest-param-test_test.cc test/gtest-param-test2_test.cc)
-##  endif()
-##
-##  ############################################################
-##  # Python tests.
-##
-##  cxx_executable(gtest_break_on_failure_unittest_ test gtest)
-##  py_test(gtest_break_on_failure_unittest)
-##
-##  # Visual Studio .NET 2003 does not support STL with exceptions disabled.
-##  if (NOT MSVC OR MSVC_VERSION GREATER 1310)  # 1310 is Visual Studio .NET 2003
-##    cxx_executable_with_flags(
-##      gtest_catch_exceptions_no_ex_test_
-##      "${cxx_no_exception}"
-##      gtest_main_no_exception
-##      test/gtest_catch_exceptions_test_.cc)
-##  endif()
-##
-##  cxx_executable_with_flags(
-##    gtest_catch_exceptions_ex_test_
-##    "${cxx_exception}"
-##    gtest_main
-##    test/gtest_catch_exceptions_test_.cc)
-##  py_test(gtest_catch_exceptions_test)
-##
-##  cxx_executable(gtest_color_test_ test gtest)
-##  py_test(gtest_color_test)
-##
-##  cxx_executable(gtest_env_var_test_ test gtest)
-##  py_test(gtest_env_var_test)
-##
-##  cxx_executable(gtest_filter_unittest_ test gtest)
-##  py_test(gtest_filter_unittest)
-##
-##  cxx_executable(gtest_help_test_ test gtest_main)
-##  py_test(gtest_help_test)
-##
-##  cxx_executable(gtest_list_tests_unittest_ test gtest)
-##  py_test(gtest_list_tests_unittest)
-##
-##  cxx_executable(gtest_output_test_ test gtest)
-##  py_test(gtest_output_test)
-##
-##  cxx_executable(gtest_shuffle_test_ test gtest)
-##  py_test(gtest_shuffle_test)
-##
-##  # MSVC 7.1 does not support STL with exceptions disabled.
-##  if (NOT MSVC OR MSVC_VERSION GREATER 1310)
-##    cxx_executable(gtest_throw_on_failure_test_ test gtest_no_exception)
-##    set_target_properties(gtest_throw_on_failure_test_
-##      PROPERTIES
-##      COMPILE_FLAGS "${cxx_no_exception}")
-##    py_test(gtest_throw_on_failure_test)
-##  endif()
-##
-##  cxx_executable(gtest_uninitialized_test_ test gtest)
-##  py_test(gtest_uninitialized_test)
-##
-##  cxx_executable(gtest_xml_outfile1_test_ test gtest_main)
-##  cxx_executable(gtest_xml_outfile2_test_ test gtest_main)
-##  py_test(gtest_xml_outfiles_test)
-##
-##  cxx_executable(gtest_xml_output_unittest_ test gtest)
-##  py_test(gtest_xml_output_unittest)
-##endif()
\ No newline at end of file
+if (gtest_build_tests)
+  # This must be set in the root directory for the tests to be run by
+  # 'make test' or ctest.
+  enable_testing()
+
+  ############################################################
+  # C++ tests built with standard compiler flags.
+
+  cxx_test(gtest-death-test_test gtest_main)
+  cxx_test(gtest_environment_test gtest)
+  cxx_test(gtest-filepath_test gtest_main)
+  cxx_test(gtest-linked_ptr_test gtest_main)
+  cxx_test(gtest-listener_test gtest_main)
+  cxx_test(gtest_main_unittest gtest_main)
+  cxx_test(gtest-message_test gtest_main)