From 875b8c71fb1bfdddf26e896a0409a6aca0df713e Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sun, 10 Sep 2023 20:28:50 +0800 Subject: Swap dependency between llmath & llmeshoptimizer It seems easier the other way around. This is only so building shared libraries won't fail. --- indra/llmath/CMakeLists.txt | 3 +-- indra/llmeshoptimizer/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/indra/llmath/CMakeLists.txt b/indra/llmath/CMakeLists.txt index dfd7491790..c85d9c75c7 100644 --- a/indra/llmath/CMakeLists.txt +++ b/indra/llmath/CMakeLists.txt @@ -100,8 +100,7 @@ list(APPEND llmath_SOURCE_FILES ${llmath_HEADER_FILES}) add_library (llmath ${llmath_SOURCE_FILES}) -include_directories(${CMAKE_SOURCE_DIR}/llmeshoptimizer) -target_link_libraries(llmath llcommon) +target_link_libraries(llmath llcommon llmeshoptimizer) target_include_directories( llmath INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) if (USESYSTEMLIBS AND CMAKE_CXX_COMPILER_ID MATCHES "GNU") diff --git a/indra/llmeshoptimizer/CMakeLists.txt b/indra/llmeshoptimizer/CMakeLists.txt index 1511e75b39..100e4448cb 100644 --- a/indra/llmeshoptimizer/CMakeLists.txt +++ b/indra/llmeshoptimizer/CMakeLists.txt @@ -25,9 +25,9 @@ list(APPEND llmeshoptimizer_SOURCE_FILES ${llmeshoptimizer_HEADER_FILES}) add_library (llmeshoptimizer ${llmeshoptimizer_SOURCE_FILES}) target_include_directories( llmeshoptimizer INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_SOURCE_DIR}/llmath) target_link_libraries(llmeshoptimizer llcommon - llmath ll::meshoptimizer) include(LibraryInstall) -- cgit v1.2.3 From 9a83ffbb902ada9cf5bde1559f2429f793b589eb Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Tue, 12 Sep 2023 19:27:23 +0800 Subject: Set but not used variable isn't an error Encountered when using Clang on Linux. Switched to Clang cause sometimes errors can be less escapable on GCC. --- indra/llcommon/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index b1dc65ffc5..f42f9cda0f 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -295,6 +295,9 @@ else () PROPERTIES COMPILE_FLAGS -Wno-stringop-truncation) set_source_files_properties(llevent.cpp PROPERTIES COMPILE_FLAGS -Wno-nonnull) + elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + set_source_files_properties(llsys.cpp PROPERTIES + COMPILE_FLAGS -Wno-unused-but-set-variable) endif() endif () -- cgit v1.2.3