Clean up cmake linking to avoid implicit link to system libraries

Rye · Rye · commit 68728a6982a3 · 2024-12-10T10:35:26.000-05:00
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
@@ -170,7 +170,7 @@ if (LINUX)
   )
 
   add_link_options(
-      "LINKER:--build-id" 
+      "LINKER:--build-id"
       "LINKER:--as-needed"
       "LINKER:-z,relro"
       "LINKER:-z,now"
@@ -201,15 +201,9 @@ if (DARWIN)
   set(CLANG_DISABLE_FATAL_WARNINGS OFF)
   set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
-  # Ensure that CMAKE_CXX_FLAGS has the correct -g debug information format --
-  # see Variables.cmake.
-  string(REPLACE "-gdwarf-2" "-g${CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT}"
-    CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  # NOTE: it's critical that the optimization flag is put in front.
-  # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
-  ## Really?? On developer machines too?
-  ##set(ENABLE_SIGNING TRUE)
-  ##set(SIGNING_IDENTITY "Developer ID Application: Linden Research, Inc.")
+
+  # Ensure debug symbols are always generated
+  add_compile_options(-g --debug) # --debug is a clang synonym for -g that bypasses cmake behaviors
 endif(DARWIN)
 
 if(LINUX OR DARWIN)
diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake
@@ -21,6 +21,11 @@ if (WINDOWS)
         debug ${ARCH_PREBUILT_DIRS_DEBUG}/libvorbis.lib
     )
 else (WINDOWS)
-  target_link_libraries(ll::vorbis INTERFACE vorbisfile vorbis ogg vorbisenc )
+  target_link_libraries(ll::vorbis INTERFACE 
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisfile.a
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbis.a
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisenc.a
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libogg.a
+        )
 endif (WINDOWS)
 
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
@@ -25,31 +25,29 @@ if (WINDOWS)
           libboost_regex-mt${addrsfx}
           libboost_system-mt${addrsfx}
           libboost_thread-mt${addrsfx}
-          libboost_url-mt${addrsfx})
-elseif (LINUX)
-  target_link_libraries( ll::boost INTERFACE
-          boost_fiber-mt${addrsfx}
-          boost_context-mt${addrsfx}
-          boost_filesystem-mt${addrsfx}
-          boost_program_options-mt${addrsfx}
-          boost_regex-mt${addrsfx}
-          boost_system-mt${addrsfx}
-          boost_thread-mt${addrsfx}
-          boost_url-mt${addrsfx})
+          libboost_url-mt${addrsfx}
+          )
 elseif (DARWIN)
   target_link_libraries( ll::boost INTERFACE
-          boost_context-mt${addrsfx}
-          boost_fiber-mt${addrsfx}
-          boost_filesystem-mt${addrsfx}
-          boost_program_options-mt${addrsfx}
-          boost_regex-mt${addrsfx}
-          boost_system-mt${addrsfx}
-          boost_thread-mt${addrsfx}
-          boost_url-mt${addrsfx})
-endif (WINDOWS)
-
-if (LINUX)
-    set(BOOST_SYSTEM_LIBRARY ${BOOST_SYSTEM_LIBRARY} rt)
-    set(BOOST_THREAD_LIBRARY ${BOOST_THREAD_LIBRARY} rt)
-endif (LINUX)
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_context-mt.a
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_fiber-mt.a
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_filesystem-mt.a
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_program_options-mt.a
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_regex-mt.a
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_system-mt.a
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_thread-mt.a
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_url-mt.a
+          )
+else ()
+  target_link_libraries( ll::boost INTERFACE
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_context-mt${addrsfx}.a
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_fiber-mt${addrsfx}.a
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_filesystem-mt${addrsfx}.a
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_program_options-mt${addrsfx}.a
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_regex-mt${addrsfx}.a
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_system-mt${addrsfx}.a
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_thread-mt${addrsfx}.a
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_url-mt${addrsfx}.a
+          )
+endif ()
 
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -171,7 +171,6 @@ elseif(DARWIN)
     set(release_files
         libndofdev.dylib
         libSDL2.dylib
-        libSDL2-2.0.dylib
        )
 
     if(LLCOMMON_LINK_SHARED)
diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake
@@ -14,14 +14,14 @@ if (USE_KDU)
   include(Prebuilt)
   use_prebuilt_binary(kdu)
   if (WINDOWS)
-    target_link_libraries( ll::kdu INTERFACE kdu.lib)
+    target_link_libraries( ll::kdu INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/kdu.lib)
   else (WINDOWS)
-    target_link_libraries( ll::kdu INTERFACE libkdu.a)
+    target_link_libraries( ll::kdu INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libkdu.a)
   endif (WINDOWS)
 
   target_include_directories( ll::kdu SYSTEM INTERFACE
           ${AUTOBUILD_INSTALL_DIR}/include/kdu
           ${LIBS_OPEN_DIR}/llkdu
           )
-  target_compile_definitions(ll::kdu INTERFACE KDU_X86_INTRINSICS=1 KDU_NO_THREADS=1)
+  target_compile_definitions(ll::kdu INTERFACE KDU_NO_THREADS=1)
 endif (USE_KDU)
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
@@ -43,7 +43,7 @@ target_include_directories( ll::colladadom SYSTEM INTERFACE
 if (WINDOWS)
     target_link_libraries(ll::colladadom INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libcollada14dom23-s.lib ll::libxml ll::minizip-ng )
 elseif (DARWIN)
-    target_link_libraries(ll::colladadom INTERFACE collada14dom ll::boost ll::libxml ll::minizip-ng)
+    target_link_libraries(ll::colladadom INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libcollada14dom.a ll::boost ll::libxml ll::minizip-ng)
 elseif (LINUX)
-    target_link_libraries(ll::colladadom INTERFACE collada14dom ll::boost ll::libxml ll::minizip-ng)
+    target_link_libraries(ll::colladadom INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libcollada14dom.a ll::boost ll::libxml ll::minizip-ng)
 endif()
diff --git a/indra/cmake/LibVLCPlugin.cmake b/indra/cmake/LibVLCPlugin.cmake
@@ -24,13 +24,7 @@ if (WINDOWS)
     )
 elseif (DARWIN)
     target_link_libraries( ll::libvlc INTERFACE
-            libvlc.dylib
-            libvlccore.dylib
-    )
-elseif (LINUX)
-    # Specify a full path to make sure we get a static link
-    target_link_libraries( ll::libvlc INTERFACE
-        ${LIBS_PREBUILT_DIR}/lib/libvlc.a
-        ${LIBS_PREBUILT_DIR}/lib/libvlccore.a
+    ${ARCH_PREBUILT_DIRS_RELEASE}/libvlc.dylib
+    ${ARCH_PREBUILT_DIRS_RELEASE}/libvlccore.dylib
     )
 endif (WINDOWS)
diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
@@ -8,7 +8,7 @@ set(ARCH_PREBUILT_DIRS_PLUGINS ${AUTOBUILD_INSTALL_DIR}/plugins)
 set(ARCH_PREBUILT_DIRS_RELEASE ${AUTOBUILD_INSTALL_DIR}/lib/release)
 set(ARCH_PREBUILT_DIRS_DEBUG ${AUTOBUILD_INSTALL_DIR}/lib/debug)
 
-if (WINDOWS OR DARWIN )
+if (WINDOWS OR DARWIN)
   # Kludge for older cmake versions, 3.20+ is needed to use a genex in add_custom_command( OUTPUT <var> ... )
   # Using this will work okay-ish, as Debug is not supported anyway. But for property multi config and also
   # ninja support the genex version is preferred.
@@ -32,17 +32,6 @@ elseif (LINUX)
   set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/bin)
 endif ()
 
-# Autobuild packages must provide 'release' versions of libraries, but may provide versions for
-# specific build types.  AUTOBUILD_LIBS_INSTALL_DIRS lists first the build type directory and then
-# the 'release' directory (as a default fallback).
-# *NOTE - we have to take special care to use CMAKE_CFG_INTDIR on IDE generators (like mac and
-# windows) and CMAKE_BUILD_TYPE on Makefile based generators (like linux).  The reason for this is
-# that CMAKE_BUILD_TYPE is essentially meaningless at configuration time for IDE generators and
-# CMAKE_CFG_INTDIR is meaningless at build time for Makefile generators
-
-link_directories(${AUTOBUILD_INSTALL_DIR}/lib/$<LOWER_CASE:$<CONFIG>>)
-link_directories(${AUTOBUILD_INSTALL_DIR}/lib/release)
-
 add_library( ll::oslibraries INTERFACE IMPORTED )
 
 if (LINUX)
@@ -68,7 +57,6 @@ elseif (WINDOWS)
           legacy_stdio_definitions
           )
 else()
-  include(CMakeFindFrameworks)
   find_library(COREFOUNDATION_LIBRARY CoreFoundation)
   find_library(CARBON_LIBRARY Carbon)
   find_library(COCOA_LIBRARY Cocoa)
diff --git a/indra/cmake/Meshoptimizer.cmake b/indra/cmake/Meshoptimizer.cmake
@@ -10,11 +10,11 @@ use_system_binary(meshoptimizer)
 use_prebuilt_binary(meshoptimizer)
 
 if (WINDOWS)
-  target_link_libraries( ll::meshoptimizer INTERFACE meshoptimizer.lib)
+  target_link_libraries( ll::meshoptimizer INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/meshoptimizer.lib)
 elseif (LINUX)
-  target_link_libraries( ll::meshoptimizer INTERFACE libmeshoptimizer.a)
+  target_link_libraries( ll::meshoptimizer INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libmeshoptimizer.a)
 elseif (DARWIN)
-  target_link_libraries( ll::meshoptimizer INTERFACE libmeshoptimizer.a)
+  target_link_libraries( ll::meshoptimizer INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libmeshoptimizer.a)
 endif (WINDOWS)
 
 target_include_directories( ll::meshoptimizer SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/meshoptimizer)
diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake
@@ -14,9 +14,11 @@ if (NDOF)
   endif (WINDOWS OR DARWIN)
 
   if (WINDOWS)
-    target_link_libraries( ll::ndof INTERFACE libndofdev)
-  elseif (DARWIN OR LINUX)
-    target_link_libraries( ll::ndof INTERFACE ndofdev)
+    target_link_libraries( ll::ndof INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libndofdev.lib)
+  elseif (DARWIN)
+    target_link_libraries( ll::ndof INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libndofdev.dylib)
+  elseif (LINUX)
+    target_link_libraries( ll::ndof INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libndofdev.a)
   endif (WINDOWS)
   target_compile_definitions( ll::ndof INTERFACE LIB_NDOF=1)
 else()
diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake
@@ -30,8 +30,8 @@ if (USE_OPENAL)
             )
   else()
     target_link_libraries( ll::openal INTERFACE
-            openal
-            alut
+            ${ARCH_PREBUILT_DIRS_RELEASE}/libopenal.dylib
+            ${ARCH_PREBUILT_DIRS_RELEASE}/libalut.dylib
             )
   endif()
 endif ()
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake
@@ -7,5 +7,9 @@ add_library( ll::openjpeg INTERFACE IMPORTED )
 use_system_binary(openjpeg)
 use_prebuilt_binary(openjpeg)
 
+if(DARWIN)
+target_link_libraries(ll::openjpeg INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libopenjp2.a )
+else()
 target_link_libraries(ll::openjpeg INTERFACE openjp2 )
+endif()
 target_include_directories( ll::openjpeg SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/openjpeg)
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
@@ -9,10 +9,13 @@ use_system_binary(openssl)
 use_prebuilt_binary(openssl)
 if (WINDOWS)
   target_link_libraries(ll::openssl INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libssl.lib ${ARCH_PREBUILT_DIRS_RELEASE}/libcrypto.lib Crypt32.lib)
-elseif (LINUX)
-  target_link_libraries(ll::openssl INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libssl.a ${ARCH_PREBUILT_DIRS_RELEASE}/libcrypto.a dl)
 else()
-  target_link_libraries(ll::openssl INTERFACE ssl crypto)
+  target_link_libraries(ll::openssl INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libssl.a ${ARCH_PREBUILT_DIRS_RELEASE}/libcrypto.a)
 endif (WINDOWS)
+
+if(LINUX)
+  target_link_libraries(ll::openssl INTERFACE dl)
+endif()
+
 target_include_directories( ll::openssl SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
 
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
@@ -149,24 +149,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "${CMAKE_MATCH_1}")
   message(STATUS "CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY = '${CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY}'")
 
-  string(REGEX MATCH " -g([^ ]*)" scratch "$ENV{LL_BUILD}")
-  set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "${CMAKE_MATCH_1}")
-  # -gdwarf-2 is passed in LL_BUILD according to 00-COMPILE-LINK-RUN.txt.
-  # However, when CMake 3.9.2 sees -gdwarf-2, it silently deletes the whole -g
-  # switch, producing no symbols at all! The same thing happens if we specify
-  # plain -g ourselves, i.e. CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT is
-  # the empty string. Specifying -gdwarf-with-dsym or just -gdwarf drives a
-  # different CMake behavior: it substitutes plain -g. As of 2017-09-19,
-  # viewer-build-variables/variables still passes -gdwarf-2, which is the
-  # no-symbols case. Set -gdwarf, triggering CMake to substitute plain -g --
-  # at least that way we should get symbols, albeit mangled ones. It Would Be
-  # Nice if CMake's behavior could be predicted from a consistent mental
-  # model, instead of only observed experimentally.
-  string(REPLACE "dwarf-2" "dwarf"
-    CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT
-    "${CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT}")
-  message(STATUS "CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT = '${CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT}'")
-
   string(REGEX MATCH "-O([^ ]*)" scratch "$ENV{LL_BUILD}")
   set(CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL "${CMAKE_MATCH_1}")
   message(STATUS "CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL = '${CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL}'")
@@ -184,10 +166,18 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   endif()
   message(STATUS "CMAKE_OSX_SYSROOT = '${CMAKE_OSX_SYSROOT}'")
 
+  # Force debug symbol generation under xcode generator
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_GENERATE_DEBUGGING_SYMBOLS YES)
+  set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf-with-dsym)
+  message(STATUS "CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT = '${CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT}'")
+
+  # Strip dead code
+  set(CMAKE_XCODE_ATTRIBUTE_DEAD_CODE_STRIPPING YES)
+
   set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0")
   set(CMAKE_XCODE_ATTRIBUTE_GCC_STRICT_ALIASING NO)
   set(CMAKE_XCODE_ATTRIBUTE_GCC_FAST_MATH NO)
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_X86_VECTOR_INSTRUCTIONS ssse3)
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_X86_VECTOR_INSTRUCTIONS sse4.2)
   # we must hard code this to off for now.  xcode's built in signing does not
   # handle embedded app bundles such as CEF and others. Any signing for local
   # development must be done after the build as we do in viewer_manifest.py for
@@ -200,6 +190,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   # "-" represents "Sign to Run Locally" and empty string represents "Do Not Sign"
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "")
+  set(CMAKE_XCODE_ATTRIBUTE_LD_WARN_DUPLICATE_LIBRARIES NO)
   set(CMAKE_XCODE_ATTRIBUTE_DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING YES)
   set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_64_TO_32_BIT_CONVERSION NO)
   set(CMAKE_OSX_ARCHITECTURES "${ARCH}")
diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake
@@ -9,7 +9,7 @@ target_include_directories( ll::webrtc SYSTEM INTERFACE "${LIBS_PREBUILT_DIR}/in
 use_prebuilt_binary(webrtc)
 
 if (WINDOWS)
-    target_link_libraries( ll::webrtc INTERFACE webrtc.lib )
+    target_link_libraries( ll::webrtc INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/webrtc.lib )
 elseif (DARWIN)
     FIND_LIBRARY(COREAUDIO_LIBRARY CoreAudio)
     FIND_LIBRARY(COREGRAPHICS_LIBRARY CoreGraphics)
@@ -18,15 +18,15 @@ elseif (DARWIN)
     FIND_LIBRARY(COCOA_LIBRARY Cocoa)
 
     target_link_libraries( ll::webrtc INTERFACE
-        libwebrtc.a
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libwebrtc.a
         ${COREAUDIO_LIBRARY}
         ${AUDIOTOOLBOX_LIBRARY}
         ${COREGRAPHICS_LIBRARY}
         ${COREFOUNDATION_LIBRARY}
         ${COCOA_LIBRARY}
     )
 elseif (LINUX)
-    target_link_libraries( ll::webrtc INTERFACE libwebrtc.a X11 )
+    target_link_libraries( ll::webrtc INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libwebrtc.a X11 )
 endif (WINDOWS)
 
 
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
@@ -12,6 +12,7 @@ project(llwindow)
 
 include(00-Common)
 include(DragDrop)
+include(Linking)
 include(LLCommon)
 include(LLImage)
 include(LLWindow)
@@ -181,7 +182,5 @@ endif (SDL2_FOUND)
   target_include_directories(llwindow INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 
 if (DARWIN)
-  include(CMakeFindFrameworks)
-  find_library(CARBON_LIBRARY Carbon)
   target_link_libraries(llwindow ${CARBON_LIBRARY})
 endif (DARWIN)

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,6 @@ elseif(DARWIN)`
`171`	`171`	`set(release_files`
`172`	`172`	`libndofdev.dylib`
`173`	`173`	`libSDL2.dylib`
`174`		`- libSDL2-2.0.dylib`
`175`	`174`	`)`
`176`	`175`
`177`	`176`	`if(LLCOMMON_LINK_SHARED)`