ColladaDOM depends on dynamic Boost 1.81 on macOS

so we don't need the boost package or the -no_static variant of
boost181 any more.

2 files changed, 20 insertions, 29 deletions

diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index f54eb3e3db..31bb4124c2 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -10,30 +10,22 @@ if( USE_CONAN )
   return()
 elseif( NOT USE_AUTOBUILD_3P )
   if (DARWIN)
+    set(sfx "-mt")
     target_include_directories( ll::boost SYSTEM INTERFACE /opt/local/libexec/boost/1.81/include)
-    target_link_libraries( ll::boost INTERFACE
-      /opt/local/libexec/boost/1.81/lib/libboost_context-mt.a
-      /opt/local/libexec/boost/1.81/lib/libboost_fiber-mt.a
-      /opt/local/libexec/boost/1.81/lib/libboost_filesystem-mt.a
-      /opt/local/libexec/boost/1.81/lib/libboost_program_options-mt.a
-      /opt/local/libexec/boost/1.81/lib/libboost_regex-mt.a
-      /opt/local/libexec/boost/1.81/lib/libboost_system-mt.a
-      /opt/local/libexec/boost/1.81/lib/libboost_thread-mt.a
-      /opt/local/libexec/boost/1.81/lib/libboost_url-mt.a
-      )
+    target_link_directories( ll::boost INTERFACE /opt/local/libexec/boost/1.81/lib)
   else (DARWIN)
     find_package( Boost REQUIRED )
-    target_link_libraries( ll::boost INTERFACE
-      boost_context
-      boost_fiber
-      boost_filesystem
-      boost_program_options
-      boost_regex
-      boost_system
-      boost_thread
-      boost_url
-      )
   endif (DARWIN)
+  target_link_libraries( ll::boost INTERFACE
+    boost_context${sfx}
+    boost_fiber${sfx}
+    boost_filesystem${sfx}
+    boost_program_options${sfx}
+    boost_regex${sfx}
+    boost_system${sfx}
+    boost_thread${sfx}
+    boost_url${sfx}
+    )
   target_compile_definitions( ll::boost INTERFACE BOOST_BIND_GLOBAL_PLACEHOLDERS )
   return()
 endif()
@@ -61,7 +53,6 @@ elseif (LINUX)
           boost_filesystem-mt${addrsfx}
           boost_program_options-mt${addrsfx}
           boost_regex-mt${addrsfx}
-          boost_thread-mt${addrsfx}
           boost_system-mt${addrsfx}
           boost_thread-mt${addrsfx}
           boost_url-mt${addrsfx})
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index 03a5d165b3..b712b71e54 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -50,14 +50,14 @@ if( USESYSTEMLIBS )
         TARGET collada14dom
         CMAKE_FLAGS
           -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-          -DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Libxml2_LIBRARY_DIRS}
+          -DCMAKE_CXX_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS}
+          "-DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Minizip_LIBRARY_DIRS} -L${Minizip_LIBRARY_DIRS}exec/boost/1.81/lib"
           -Dlibpcrecpp_LIBRARIES:STRING=pcrecpp
           -DZLIB_LIBRARIES:STRING=${Libxml2_LIBRARIES}
           -DBoost_FILESYSTEM_LIBRARY:STRING=boost_filesystem-mt
           -DBoost_SYSTEM_LIBRARY:STRING=boost_system-mt
-          -Dlibpcrecpp_CFLAGS_OTHERS:STRING=-I${Libpcrecpp_INCLUDE_DIRS}/libxml2
-          -DEXTRA_COMPILE_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS}
-          -DBoost_CFLAGS:STRING=-I${Libpcrecpp_INCLUDE_DIRS}
+          -DEXTRA_COMPILE_FLAGS:STRING=-I${Libxml2_INCLUDE_DIRS}
+          -DBoost_CFLAGS:STRING=-I${Libpcrecpp_LIBRARY_DIRS}exec/boost/1.81/include
           -DOPT_COLLADA14:BOOL=ON
           -DCOLLADA_DOM_INCLUDE_INSTALL_DIR:FILEPATH=${LIBS_PREBUILT_DIR}/include/collada
           -DCOLLADA_DOM_SOVERSION:STRING=0
@@ -88,13 +88,13 @@ if( USESYSTEMLIBS )
         TARGET collada14dom
         CMAKE_FLAGS
           -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-          -DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Libxml2_LIBRARY_DIRS}
+          -DCMAKE_CXX_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS}
+          -DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Minizip_LIBRARY_DIRS}
           -Dlibpcrecpp_LIBRARIES:STRING=pcrecpp
           -DZLIB_LIBRARIES:STRING=${Libxml2_LIBRARIES}
           -DBoost_FILESYSTEM_LIBRARY:STRING=boost_filesystem
           -DBoost_SYSTEM_LIBRARY:STRING=boost_system
-          -Dlibpcrecpp_CFLAGS_OTHERS:STRING=-I${Libxml2_INCLUDE_DIRS}
-          -DEXTRA_COMPILE_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS}
+          -DEXTRA_COMPILE_FLAGS:STRING=-I${Libxml2_INCLUDE_DIRS}
           -DBoost_CFLAGS:STRING=-I${Libpcrecpp_INCLUDE_DIRS}
           -DOPT_COLLADA14:BOOL=ON
           -DCOLLADA_DOM_INCLUDE_INSTALL_DIR:FILEPATH=${LIBS_PREBUILT_DIR}/include/collada
@@ -121,7 +121,7 @@ if( USESYSTEMLIBS )
           ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/modules
         DESTINATION ${LIBS_PREBUILT_DIR}/include/collada
         )
-      file(WRITE ${PREBUILD_TRACKING_DIR}/colladadom_installed "0")
+      file(WRITE ${PREBUILD_TRACKING_DIR}/colladadom_installed "${colladadom_installed}")
     endif (${COLLADADOM_RESULT})
   endif( ${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/colladadom_installed OR NOT ${colladadom_installed} EQUAL 0 )
 else( USESYSTEMLIBS )