diff options
| author | Anton Novoselov <[email protected]> | 2017-08-01 12:53:38 +0300 |
|---|---|---|
| committer | Anton Novoselov <[email protected]> | 2017-08-01 12:53:38 +0300 |
| commit | 236f03c0b9a4982328ed1201978f7f69d192d9b2 (patch) | |
| tree | e486f2fa39dba203563895541e92c60ed3e25759 /test/compiler | |
| parent | Added screens to welcome page (diff) | |
| download | blast-236f03c0b9a4982328ed1201978f7f69d192d9b2.tar.xz blast-236f03c0b9a4982328ed1201978f7f69d192d9b2.zip | |
Blast 1.1 release (windows / linux)
see docs/release_notes.txt for details
Diffstat (limited to 'test/compiler')
| -rw-r--r-- | test/compiler/cmake/BlastPerfTests.cmake | 3 | ||||
| -rw-r--r-- | test/compiler/cmake/BlastUnitTests.cmake | 6 | ||||
| -rw-r--r-- | test/compiler/cmake/linux/BlastPerfTests.cmake | 5 | ||||
| -rw-r--r-- | test/compiler/cmake/linux/BlastUnitTests.cmake | 5 |
4 files changed, 18 insertions, 1 deletions
diff --git a/test/compiler/cmake/BlastPerfTests.cmake b/test/compiler/cmake/BlastPerfTests.cmake index 885b0f7..7c17c04 100644 --- a/test/compiler/cmake/BlastPerfTests.cmake +++ b/test/compiler/cmake/BlastPerfTests.cmake @@ -127,6 +127,9 @@ SET_TARGET_PROPERTIES(BlastPerfTests PROPERTIES ) #TARGET_COMPILE_OPTIONS(BlastPerfTests PRIVATE /wd4005 /wd4244) +TARGET_COMPILE_OPTIONS(BlastPerfTests + PRIVATE ${BLASTPERFTESTS_PLATFORM_COMPILE_OPTIONS} +) TARGET_LINK_LIBRARIES(BlastPerfTests diff --git a/test/compiler/cmake/BlastUnitTests.cmake b/test/compiler/cmake/BlastUnitTests.cmake index 4e09bfb..30ee9b4 100644 --- a/test/compiler/cmake/BlastUnitTests.cmake +++ b/test/compiler/cmake/BlastUnitTests.cmake @@ -144,6 +144,10 @@ SET_TARGET_PROPERTIES(BlastUnitTests PROPERTIES COMPILE_PDB_NAME_RELEASE "BlastUnitTests${CMAKE_RELEASE_POSTFIX}" ) +TARGET_COMPILE_OPTIONS(BlastUnitTests + PRIVATE ${BLASTUNITTESTS_PLATFORM_COMPILE_OPTIONS} +) + #TARGET_COMPILE_OPTIONS(BlastUnitTests PRIVATE /wd4005 /wd4244) MESSAGE("UnitTests LL: ${BLASTUNITTESTS_PLATFORM_LINKED_LIBS}") @@ -151,7 +155,7 @@ MESSAGE("UnitTests LL: ${BLASTUNITTESTS_PLATFORM_LINKED_LIBS}") # Do final direct sets after the target has been defined TARGET_LINK_LIBRARIES(BlastUnitTests - PRIVATE NvBlastExtShaders NvBlastExtPhysX NvBlastTk ${GOOGLETEST_LIBRARIES} + PRIVATE NvBlastExtShaders NvBlastExtPhysX NvBlastTk NvBlastExtSerialization ${GOOGLETEST_LIBRARIES} PRIVATE ${BLASTUNITTESTS_PLATFORM_LINKED_LIBS} PUBLIC $<$<CONFIG:debug>:${PXFOUNDATION_LIB_DEBUG}> $<$<CONFIG:debug>:${PXTASK_LIB_DEBUG}> diff --git a/test/compiler/cmake/linux/BlastPerfTests.cmake b/test/compiler/cmake/linux/BlastPerfTests.cmake index 1ef9eb8..0491df5 100644 --- a/test/compiler/cmake/linux/BlastPerfTests.cmake +++ b/test/compiler/cmake/linux/BlastPerfTests.cmake @@ -22,3 +22,8 @@ SET(BLASTPERFTESTS_PLATFORM_LINKED_LIBS -lpthread -lm ) + +IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + #Required to link against the Google Test binaries in pacman + SET(BLASTPERFTESTS_PLATFORM_COMPILE_OPTIONS "-D_GLIBCXX_USE_CXX11_ABI=0") +ENDIF()
\ No newline at end of file diff --git a/test/compiler/cmake/linux/BlastUnitTests.cmake b/test/compiler/cmake/linux/BlastUnitTests.cmake index e8a333a..62e9bee 100644 --- a/test/compiler/cmake/linux/BlastUnitTests.cmake +++ b/test/compiler/cmake/linux/BlastUnitTests.cmake @@ -22,3 +22,8 @@ SET(BLASTUNITTESTS_PLATFORM_LINKED_LIBS -lpthread -lm ) + +IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + #Required to link against the Google Test binaries in pacman + SET(BLASTUNITTESTS_PLATFORM_COMPILE_OPTIONS "-D_GLIBCXX_USE_CXX11_ABI=0") +ENDIF() |