summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2023-09-10 20:28:50 +0800
committerErik Kundiman <erik@megapahit.org>2023-09-10 20:28:50 +0800
commit5c1d8537c940450cdc6f8548aec478c440e68b5a (patch)
treed680a4313cca84a766801e49227eb23ed6c93238
parentfe169f5b007f0f6342c3c9091978e1583b4cf072 (diff)
Swap dependency between llmath & llmeshoptimizer
It seems easier the other way around. This is only so building shared libraries won't fail.
-rw-r--r--indra/llmath/CMakeLists.txt3
-rw-r--r--indra/llmeshoptimizer/CMakeLists.txt2
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)