diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-01-08 18:47:27 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-01-08 18:47:27 +0000 |
| commit | 245f492cecd15f589cf542e8ff25eda0a9ebfb3c (patch) | |
| tree | 3b937c0f52fc8d580b9067d602cdcba136adf3a7 | |
| parent | Implemented manual loading of d3d12.dll (closed https://github.com/DiligentGr... (diff) | |
| download | DiligentCore-245f492cecd15f589cf542e8ff25eda0a9ebfb3c.tar.gz DiligentCore-245f492cecd15f589cf542e8ff25eda0a9ebfb3c.zip | |
Fixed clang linker warnings in gtest
| -rw-r--r-- | Tests/DiligentCoreAPITest/src/ShaderResourceArrayTest.cpp | 2 | ||||
| -rw-r--r-- | ThirdParty/CMakeLists.txt | 5 |
2 files changed, 6 insertions, 1 deletions
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) |