From 292acb5b41cef5442b0192bfb3a620383bdc0d7a Mon Sep 17 00:00:00 2001 From: David Neto Date: Tue, 1 Dec 2015 12:01:59 -0500 Subject: [PATCH] Don't add -frtti for tests. Use newer googletest. Using -frtti caused link failures when both of the following are in effect: -DDISABLE_EXCEPTIONS=ON -DDISABLE_RTTI=ON The correct fix is to use tip-of-tree googletest. Specifically, we need a version of googletest with the fix in https://github.com/google/googletest/pull/612 In particular, it must be later than googletest 1.7.0. --- CMakeLists.txt | 7 ------- README.md | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 65c4ef5982..6826b9835f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -219,13 +219,6 @@ if (NOT ${SPIRV_SKIP_EXECUTABLES}) add_executable(UnitSPIRV ${TEST_SOURCES}) default_compile_options(UnitSPIRV) - if (UNIX) - # The tests use mocking, and mocking requires runtime type information - # for the test classes. Until we adopt a version of gmock that avoids - # this problem (see https://github.com/google/googletest/issues/610), - # add RTTI. - target_compile_options(UnitSPIRV PRIVATE -frtti) - endif() target_include_directories(UnitSPIRV PRIVATE ${gmock_SOURCE_DIR}/include ${gtest_SOURCE_DIR}/include) target_link_libraries(UnitSPIRV PRIVATE ${SPIRV_TOOLS} gmock) diff --git a/README.md b/README.md index c099e71f3e..c3253b785b 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,12 @@ source is not provided with this project. Download the `googletest` source into the `/external/googletest` directory before configuring and building the project. +*Note*: You must use a version of googletest that includes +[a fix](https://github.com/google/googletest/pull/612) for +[googletest issue 610](https://github.com/google/googletest/issues/610). +The fix is included on the googletest master branch any time after 2015-11-10. +In particular, googletest must be newer than version 1.7.0. + ## Build The project uses [CMake](https://cmake.org/) to generate platform-specific