From 6e4f095baa8e33effe80b68ddf834a3b80f2bb67 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sat, 29 Jul 2023 20:58:27 +0800
Subject: Setting BUILD_SHARED_LIBS on is now possible

by removing cyclic dependencies, and allowing shlib undefined on
SLPlugin alone.
---
 indra/llimagej2coj/CMakeLists.txt      | 3 ++-
 indra/llmath/CMakeLists.txt            | 3 ++-
 indra/llplugin/slplugin/CMakeLists.txt | 5 +++++
 indra/llwindow/CMakeLists.txt          | 5 ++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llimagej2coj/CMakeLists.txt b/indra/llimagej2coj/CMakeLists.txt
index 93e85668dd..5bd4c75426 100644
--- a/indra/llimagej2coj/CMakeLists.txt
+++ b/indra/llimagej2coj/CMakeLists.txt
@@ -21,9 +21,10 @@ list(APPEND llimagej2coj_SOURCE_FILES ${llimagej2coj_HEADER_FILES})
 
 add_library (llimagej2coj ${llimagej2coj_SOURCE_FILES})
 
+include_directories( ${CMAKE_SOURCE_DIR}/llimage )
 target_link_libraries( llimagej2coj
         llcommon
-        llimage
+        #llimage
         ll::openjpeg
     )
 
diff --git a/indra/llmath/CMakeLists.txt b/indra/llmath/CMakeLists.txt
index eb29df245a..955bade204 100644
--- a/indra/llmath/CMakeLists.txt
+++ b/indra/llmath/CMakeLists.txt
@@ -99,7 +99,8 @@ list(APPEND llmath_SOURCE_FILES ${llmath_HEADER_FILES})
 
 add_library (llmath ${llmath_SOURCE_FILES})
 
-target_link_libraries(llmath llcommon llmeshoptimizer)
+include_directories(${CMAKE_SOURCE_DIR}/llmeshoptimizer)
+target_link_libraries(llmath llcommon)
 target_include_directories( llmath  INTERFACE   ${CMAKE_CURRENT_SOURCE_DIR})
 
 # Add tests
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 0ea6495eac..f1a75ff97f 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -60,6 +60,11 @@ if (DARWIN)
   )
 endif (DARWIN)
 
+if (BUILD_SHARED_LIBS)
+  set_target_properties(SLPlugin PROPERTIES LINK_FLAGS_RELEASE
+    "${LINK_FLAGS_RELEASE} -Wl,--allow-shlib-undefined")
+endif ()
+
 if (LL_TESTS)
   ll_deploy_sharedlibs_command(SLPlugin)
 endif (LL_TESTS)
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index c2989e84c9..53b104dab2 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -51,7 +51,7 @@ set(llwindow_LINK_LIBRARIES
         llcommon
         llimage
         llmath
-        llrender
+        #llrender
         llfilesystem
         llxml
         ll::glh_linear
@@ -59,6 +59,9 @@ set(llwindow_LINK_LIBRARIES
         ll::uilibraries
         ll::SDL
         )
+
+include_directories(${CMAKE_SOURCE_DIR}/llrender)
+
 # Libraries on which this library depends, needed for Linux builds
 # Sort by high-level to low-level
 if (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-- 
cgit v1.2.3