DRTVWR-489: Fix things up after a messy merge with main because of a gigantic CMake patch. Sadly, my macOS box updated to Xcode14.3 overnight and that caused many warnings/errors with variables being initialized and then used but not in a way that affected anything.. Building on Xcode 14.3 also requires that MACOSX_DEPLOYMENT_TARGET be set to > 10.13. Waiting on a decision about that but checking this in in the meantime. Builds on macOS with appropriate build variables set for MACOSX_DEPLOYMENT_TARGET = 10.14 but not really expecting this to build in TC because (REDACTED). Windows version probably hopelessly broken - switching to that now.

1 files changed, 67 insertions, 99 deletions

diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 31cd5d770d..f0b35c08f3 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -5,110 +5,78 @@ include(00-Common)
 project(cmake)
 
 set(cmake_SOURCE_FILES
-    CMakeLists.txt
-
-    00-Common.cmake
-    APR.cmake
-    Audio.cmake
-    Boost.cmake
-    bugsplat.cmake
-    BuildVersion.cmake
-    CEFPlugin.cmake
-    CEFPlugin.cmake
-    CMakeCopyIfDifferent.cmake
-    ConfigurePkgConfig.cmake
-    CURL.cmake
-    Copy3rdPartyLibs.cmake
-    DBusGlib.cmake
-    DeploySharedLibs.cmake
-    DragDrop.cmake
-    EXPAT.cmake
-    FindAPR.cmake
-    FindAutobuild.cmake
-    FindGLH.cmake
-    FindHUNSPELL.cmake
-    FindICU4C.cmake
-    FindJsonCpp.cmake
-    FindNDOF.cmake
-    FindOpenJPEG.cmake
-    FindSCP.cmake
-    FindURIPARSER.cmake
-    FindXmlRpcEpi.cmake
-    FindZLIBNG.cmake
-    FMODSTUDIO.cmake
-    FreeType.cmake
-    GLEXT.cmake
-    GLH.cmake
-##  GStreamer010Plugin.cmake
-    GoogleMock.cmake
-    Havok.cmake
-    Hunspell.cmake
-    ICU4C.cmake
-    JPEG.cmake
-    JsonCpp.cmake
-    LLAddBuildTest.cmake
-    LLAppearance.cmake
-    LLAudio.cmake
-    LLCharacter.cmake
-    LLCommon.cmake
-    LLCrashLogger.cmake
-    LLImage.cmake
-    LLImageJ2COJ.cmake
-    LLInventory.cmake
-    LLKDU.cmake
-    LLLogin.cmake
-    LLMath.cmake
-    LLMeshOptimizer.cmake
-    LLMessage.cmake
-    LLPhysicsExtensions.cmake
-    LLPlugin.cmake
-    LLPrimitive.cmake
-    LLRender.cmake
-    LLSharedLibs.cmake
-    LLTestCommand.cmake
-    LLUI.cmake
-    LLFileSystem.cmake
-    LLWindow.cmake
-    LLXML.cmake
-    Linking.cmake
-    MediaPluginBase.cmake
-    MESHOPTIMIZER.cmake
-    NDOF.cmake
-    OPENAL.cmake
-    OpenGL.cmake
-    OpenJPEG.cmake
-    OpenSSL.cmake
-    PNG.cmake
-    PluginAPI.cmake
-    Prebuilt.cmake
-    PulseAudio.cmake
-    Python.cmake
-    TemplateCheck.cmake
-    Tut.cmake
-    UI.cmake
-    UnixInstall.cmake
-    URIPARSER.cmake
-    Variables.cmake
-    ViewerMiscLibs.cmake
-    VisualLeakDetector.cmake
-    LibVLCPlugin.cmake
-    XmlRpcEpi.cmake
-    ZLIBNG.cmake
-    )
+        CMakeLists.txt
+        00-Common.cmake
+        APR.cmake
+        Audio.cmake
+        Boost.cmake
+        bugsplat.cmake
+        BuildVersion.cmake
+        CEFPlugin.cmake
+        CEFPlugin.cmake
+        CMakeCopyIfDifferent.cmake
+        ConfigurePkgConfig.cmake
+        CURL.cmake
+        Copy3rdPartyLibs.cmake
+        DBusGlib.cmake
+        DeploySharedLibs.cmake
+        DragDrop.cmake
+        EXPAT.cmake
+        FindAutobuild.cmake
+        FMODSTUDIO.cmake
+        FreeType.cmake
+        GLEXT.cmake
+        GLH.cmake
+        GoogleMock.cmake
+        Havok.cmake
+        Hunspell.cmake
+        JsonCpp.cmake
+        LLAddBuildTest.cmake
+        LLAppearance.cmake
+        LLAudio.cmake
+        LLCommon.cmake
+        LLImage.cmake
+        LLKDU.cmake
+        LLPhysicsExtensions.cmake
+        LLPrimitive.cmake
+        LLSharedLibs.cmake
+        LLTestCommand.cmake
+        LLWindow.cmake
+        Linking.cmake
+        Meshoptimizer.cmake
+        NDOF.cmake
+        OPENAL.cmake
+        OpenGL.cmake
+        OpenJPEG.cmake
+        OpenSSL.cmake
+        PNG.cmake
+        PluginAPI.cmake
+        Prebuilt.cmake
+        PulseAudio.cmake
+        Python.cmake
+        TemplateCheck.cmake
+        Tut.cmake
+        UI.cmake
+        UnixInstall.cmake
+        URIPARSER.cmake
+        Variables.cmake
+        ViewerMiscLibs.cmake
+        VisualLeakDetector.cmake
+        LibVLCPlugin.cmake
+        XmlRpcEpi.cmake
+        ZLIBNG.cmake
+        )
 
 source_group("Shared Rules" FILES ${cmake_SOURCE_FILES})
 
 set(master_SOURCE_FILES
-    ../CMakeLists.txt
-    )
+        ../CMakeLists.txt
+        )
 
 source_group("Master Rules" FILES ${master_SOURCE_FILES})
 
-set_source_files_properties(${cmake_SOURCE_FILES} ${master_SOURCE_FILES}
-                            PROPERTIES HEADER_FILE_ONLY TRUE)
-
 add_library(cmake
-            cmake_dummy.cpp
-            ${cmake_SOURCE_FILES}
-            ${master_SOURCE_FILES}
-            )
+        cmake_dummy.cpp
+        ${cmake_SOURCE_FILES}
+        ${master_SOURCE_FILES}
+        )