From b4dc8ac16f76a74a56ac2f395908a18ef274785c Mon Sep 17 00:00:00 2001 From: Rye Mutt <rye@alchemyviewer.org> Date: Sun, 18 Apr 2021 02:28:08 -0400 Subject: [PATCH] Fix warnings from meshoptimizer linking resulting in symbol conflicts --- indra/CMakeLists.txt | 2 -- indra/deps/CMakeLists.txt | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 9789e23338a..6f38c83637a 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -15,8 +15,6 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") set(CMAKE_C_STANDARD 11) set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_VISIBILITY_PRESET hidden) set_property(GLOBAL PROPERTY USE_FOLDERS ON) diff --git a/indra/deps/CMakeLists.txt b/indra/deps/CMakeLists.txt index 1cbb2407933..fbcc5cd2908 100644 --- a/indra/deps/CMakeLists.txt +++ b/indra/deps/CMakeLists.txt @@ -84,6 +84,7 @@ endif() # #Download the rest of the libraries # FetchContent_MakeAvailable(fmt) +set(MESHOPT_BUILD_SHARED_LIBS OFF) FetchContent_MakeAvailable(meshoptimizer) # # Typically you don't care so much for a third party library's tests to be -- GitLab