Skip to content

Commit

Permalink
Don't add -frtti for tests. Use newer googletest.
Browse files Browse the repository at this point in the history
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
google/googletest#612
In particular, it must be later than googletest 1.7.0.
  • Loading branch information
dneto0 committed Dec 1, 2015
1 parent bdc50b5 commit 292acb5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
7 changes: 0 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ source is not provided with this project. Download the `googletest` source
into the `<spirv-dir>/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
Expand Down

0 comments on commit 292acb5

Please sign in to comment.