Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update googletest to 1.14.0

Browse Source
This commit is contained in:
Kim Kulling
2023-09-19 08:37:12 +02:00
committed by Kim Kulling
parent fa71b84c1c
commit 7fb4b24cb5
293 changed files with 83265 additions and 26293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/CMakeLists.txt
View File

@@ -45,8 +45,8 @@ INCLUDE_DIRECTORIES(
if(NOT ASSIMP_HUNTER_ENABLED)
INCLUDE_DIRECTORIES(
${Assimp_SOURCE_DIR}/contrib/gtest/include
${Assimp_SOURCE_DIR}/contrib/gtest/
${Assimp_SOURCE_DIR}/contrib/googletest/googletest/include
${Assimp_SOURCE_DIR}/contrib/googletest/googletest/
${Assimp_SOURCE_DIR}/contrib/pugixml/src
)
endif()
@@ -230,7 +230,7 @@ if(ASSIMP_HUNTER_ENABLED)
find_package(GTest CONFIG REQUIRED)
target_link_libraries(unit GTest::gtest_main GTest::gmock)
else()
target_sources(unit PUBLIC ${Assimp_SOURCE_DIR}/contrib/gtest/src/gtest-all.cc)
target_sources(unit PUBLIC ${Assimp_SOURCE_DIR}/contrib/googletest/googletest/src/gtest-all.cc)
endif()
# RapidJSON