From 245f492cecd15f589cf542e8ff25eda0a9ebfb3c Mon Sep 17 00:00:00 2001 From: assiduous Date: Wed, 8 Jan 2020 10:47:27 -0800 Subject: Fixed clang linker warnings in gtest --- Tests/DiligentCoreAPITest/src/ShaderResourceArrayTest.cpp | 2 +- ThirdParty/CMakeLists.txt | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Tests/DiligentCoreAPITest/src/ShaderResourceArrayTest.cpp b/Tests/DiligentCoreAPITest/src/ShaderResourceArrayTest.cpp index 29499b70..1aba53c0 100644 --- a/Tests/DiligentCoreAPITest/src/ShaderResourceArrayTest.cpp +++ b/Tests/DiligentCoreAPITest/src/ShaderResourceArrayTest.cpp @@ -189,7 +189,7 @@ TEST(ShaderResourceLayout, ResourceArray) SubResData.Stride = TexDesc.Width * 4; } - float ColorOffset[4] = {(float)t * 0.13f, (float)t * 0.21f, (float)t * 0.29f, 0}; + //float ColorOffset[4] = {(float)t * 0.13f, (float)t * 0.21f, (float)t * 0.29f, 0}; //TestTexturing::GenerateTextureData(pDevice, Data, SubResouces, TexDesc, ColorOffset); TextureData TexData; TexData.pSubResources = SubResouces.data(); diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt index d561324c..77fef1f2 100644 --- a/ThirdParty/CMakeLists.txt +++ b/ThirdParty/CMakeLists.txt @@ -97,6 +97,11 @@ if(${DILIGENT_BUILD_TESTS}) set(gtest_force_shared_crt ON CACHE BOOL "Use shared (DLL) run-time lib even when Google Test is built as static lib.") add_subdirectory(googletest) set_directory_root_folder("googletest" "DiligentCore/ThirdParty/googletest") + set_target_properties(gtest gtest_main PROPERTIES + CXX_VISIBILITY_PRESET hidden # -fvisibility=hidden + C_VISIBILITY_PRESET hidden # -fvisibility=hidden + VISIBILITY_INLINES_HIDDEN TRUE + ) endif() install(FILES googletest/LICENSE DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME googletest-License.txt) -- cgit v1.2.3