indra/cmake/CEFPlugin.cmake

@@ -2,18 +2,14 @@
 include(Linking)
 include(Prebuilt)
 
-if (USESYSTEMLIBS)
-    set(CEFPLUGIN OFF CACHE BOOL
-        "CEFPLUGIN support for the llplugin/llmedia test apps.")
-else (USESYSTEMLIBS)
-    use_prebuilt_binary(dullahan)
-    set(CEFPLUGIN ON CACHE BOOL
-        "CEFPLUGIN support for the llplugin/llmedia test apps.")
-        set(CEF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/cef)
-endif (USESYSTEMLIBS)
+include_guard()
+add_library( ll::cef INTERFACE IMPORTED )
+
+use_prebuilt_binary(dullahan)
+target_include_directories( ll::cef SYSTEM INTERFACE  ${LIBS_PREBUILT_DIR}/include/cef)
 
 if (WINDOWS)
-    set(CEF_PLUGIN_LIBRARIES
+    target_link_libraries( ll::cef INTERFACE
         ${ARCH_PREBUILT_DIRS_RELEASE}/libcef.lib
         ${ARCH_PREBUILT_DIRS_RELEASE}/libcef_dll_wrapper.lib
         ${ARCH_PREBUILT_DIRS_RELEASE}/dullahan.lib
@@ -24,14 +20,14 @@ elseif (DARWIN)
         message(FATAL_ERROR "AppKit not found")
     endif()
 
-    set(CEF_PLUGIN_LIBRARIES
+    target_link_libraries( ll::cef INTERFACE
         ${ARCH_PREBUILT_DIRS_RELEASE}/libcef_dll_wrapper.a
         ${ARCH_PREBUILT_DIRS_RELEASE}/libdullahan.a
         ${APPKIT_LIBRARY}
        )
 
 elseif (LINUX)
-    set(CEF_PLUGIN_LIBRARIES
+    target_link_libraries( ll::cef INTERFACE
         dullahan
         cef
         cef_dll_wrapper.a

indra/cmake/CMakeCopyIfDifferent.cmake

@@ -10,20 +10,20 @@
 
 MACRO(COPY_IF_DIFFERENT FROM_DIR TO_DIR TARGETS)
 # Macro to implement copy_if_different for a list of files
-# Arguments - 
+# Arguments -
 #   FROM_DIR - this is the source directory
 #   TO_DIR   - this is the destination directory
 #   TARGETS  - A variable to receive a list of targets
-#   FILES    - names of the files to copy 
-#              TODO: add globing. 
+#   FILES    - names of the files to copy
+#              TODO: add globing.
 SET(AddTargets "")
 FOREACH(SRC ${ARGN})
-    GET_FILENAME_COMPONENT(SRCFILE ${SRC} NAME) 
+    GET_FILENAME_COMPONENT(SRCFILE ${SRC} NAME)
     IF("${FROM_DIR}" STREQUAL "")
         SET(FROM ${SRC})
     ELSE("${FROM_DIR}" STREQUAL "")
         SET(FROM ${FROM_DIR}/${SRC})
-    ENDIF("${FROM_DIR}" STREQUAL "")        
+    ENDIF("${FROM_DIR}" STREQUAL "")
     IF("${TO_DIR}" STREQUAL "")
         SET(TO ${SRCFILE})
     ELSE("${TO_DIR}" STREQUAL "")

indra/cmake/CMakeLists.txt

@@ -5,104 +5,78 @@ include(00-Common)
 project(cmake)
 
 set(cmake_SOURCE_FILES
-    CMakeLists.txt
-
-    00-Common.cmake
-    APR.cmake
-    Audio.cmake
-    Boost.cmake
-    BuildPackagesInfo.cmake
-    BuildVersion.cmake
-    CEFPlugin.cmake
-    CMakeCopyIfDifferent.cmake
-    CURL.cmake
-    Copy3rdPartyLibs.cmake
-    DBusGlib.cmake
-    DeploySharedLibs.cmake
-    DiscordSDK.cmake
-    DragDrop.cmake
-    EXPAT.cmake
-    FindAPR.cmake
-    FindAutobuild.cmake
-    FindFMODSTUDIO.cmake
-    FindHUNSPELL.cmake
-    FindNDOF.cmake
-    FindOpenJPEG.cmake
-    FindURIPARSER.cmake
-    FindXmlRpcEpi.cmake
-    FindZLIBNG.cmake
-    FMODSTUDIO.cmake
-    FreeType.cmake
-    GLEXT.cmake
-    GStreamer010Plugin.cmake
-    Hunspell.cmake
-    JPEG.cmake
-    LibXML2.cmake
-    LLAddBuildTest.cmake
-    LLAppearance.cmake
-    LLAudio.cmake
-    LLCharacter.cmake
-    LLCommon.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
-    SDL2.cmake
-    Sentry.cmake
-    TemplateCheck.cmake
-    Tut.cmake
-    UI.cmake
-    UnixInstall.cmake
-    URIPARSER.cmake
-    WebP.cmake
-    Variables.cmake
-    ViewerMiscLibs.cmake
-    VisualLeakDetector.cmake
-    LibVLCPlugin.cmake
-    XmlRpcEpi.cmake
-    XXHash.cmake
-    ZLIBNG.cmake
-    )
+        CMakeLists.txt
+        00-Common.cmake
+        APR.cmake
+        Audio.cmake
+        Boost.cmake
+        BuildPackagesInfo.cmake
+        BuildVersion.cmake
+        CEFPlugin.cmake
+        CMakeCopyIfDifferent.cmake
+        CURL.cmake
+        Copy3rdPartyLibs.cmake
+        DeploySharedLibs.cmake
+        DiscordSDK.cmake
+        DragDrop.cmake
+        EXPAT.cmake
+        FindAutobuild.cmake
+        FMODSTUDIO.cmake
+        FreeType.cmake
+        GLEXT.cmake
+        GLH.cmake
+        GLM.cmake
+        Hunspell.cmake
+        LibXML2.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
+        NDOF.cmake
+        NVAPI.cmake
+        OPENAL.cmake
+        OpenGL.cmake
+        OpenJPEG.cmake
+        OpenSSL.cmake
+        PNG.cmake
+        PluginAPI.cmake
+        Prebuilt.cmake
+        PulseAudio.cmake
+        SDBusCPP.cmake
+        SDL2.cmake
+        Sentry.cmake
+        TemplateCheck.cmake
+        TinyEXR.cmake
+        TinyGLTF.cmake
+        Tracy.cmake
+        Tut.cmake
+        UI.cmake
+        UnixInstall.cmake
+        URIPARSER.cmake
+        WebP.cmake
+        WebRTC.cmake
+        XXHash.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}
+        )

indra/cmake/CURL.cmake

@@ -2,31 +2,37 @@
 include(Prebuilt)
 include(Linking)
 
-set(CURL_FIND_QUIETLY ON)
-set(CURL_FIND_REQUIRED ON)
+include_guard()
+add_library( ll::libcurl INTERFACE IMPORTED )
 
-if (USESYSTEMLIBS)
-  include(FindCURL)
-else (USESYSTEMLIBS)
-  use_prebuilt_binary(curl)
-  if (WINDOWS)
-    set(CURL_LIBRARIES 
+use_system_binary(libcurl)
+use_prebuilt_binary(curl)
+if (WINDOWS)
+    target_link_libraries(ll::libcurl INTERFACE
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcurld.lib
       optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcurl.lib
+      ll::openssl
+      ll::nghttp2
+      ll::zlib-ng
       Normaliz.lib
       Iphlpapi.lib
     )
-  elseif(DARWIN)
-    set(CURL_LIBRARIES 
+    target_compile_definitions( ll::libcurl INTERFACE CURL_STATICLIB=1)
+elseif(DARWIN)
+    target_link_libraries(ll::libcurl INTERFACE
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcurld.a
       optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcurl.a
+      ll::openssl
+      ll::nghttp2
+      ll::zlib-ng
       resolv
     )
-  else ()
-    set(CURL_LIBRARIES
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcurld.a
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcurl.a
+else ()
+    target_link_libraries(ll::libcurl INTERFACE
+      ${ARCH_PREBUILT_DIRS}/libcurl.a
+      ll::openssl
+      ll::nghttp2
+      ll::zlib-ng
       )
-  endif ()
-  set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-endif (USESYSTEMLIBS)
+endif ()
+target_include_directories( ll::libcurl SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)

indra/cmake/Copy3rdPartyLibs.cmake

@@ -5,10 +5,12 @@
 # VisualStudio.
 
 include(CMakeCopyIfDifferent)
-include(Linking)
-include(DiscordSDK)
+include(Prebuilt)
 include(FMODSTUDIO)
+include(OPENAL)
+include(DiscordSDK)
 include(Sentry)
+include(InstallRequiredSystemLibraries)
 
 # When we copy our dependent libraries, we almost always want to copy them to
 # both the Release and the RelWithDebInfo staging directories. This has
@@ -16,50 +18,27 @@ include(Sentry)
 # copy_if_different commands. Encapsulate that usage.
 # Pass FROM_DIR, TARGETS and the files to copy. TO_DIR is implicit.
 # to_staging_dirs diverges from copy_if_different in that it appends to TARGETS.
-MACRO(to_debug_staging_dirs from_dir targets)
-  foreach(staging_dir
-          "${SHARED_LIB_STAGING_DIR_DEBUG}")
-    copy_if_different("${from_dir}" "${staging_dir}" out_targets ${ARGN})
-    list(APPEND "${targets}" "${out_targets}")
-  endforeach()
-ENDMACRO(to_debug_staging_dirs from_dir to_dir targets)
+macro(to_staging_dirs from_dir targets)
+    set( targetDir "${SHARED_LIB_STAGING_DIR}")
+    copy_if_different("${from_dir}" "${targetDir}" out_targets ${ARGN})
 
-MACRO(to_relwithdeb_staging_dirs from_dir targets)
-  foreach(staging_dir
-          "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}")
-    copy_if_different("${from_dir}" "${staging_dir}" out_targets ${ARGN})
     list(APPEND "${targets}" "${out_targets}")
-  endforeach()
-ENDMACRO(to_relwithdeb_staging_dirs from_dir to_dir targets)
-
-MACRO(to_release_staging_dirs from_dir targets)
-  foreach(staging_dir
-          "${SHARED_LIB_STAGING_DIR_RELEASE}")
-    copy_if_different("${from_dir}" "${staging_dir}" out_targets ${ARGN})
-    list(APPEND "${targets}" "${out_targets}")
-  endforeach()
-ENDMACRO(to_release_staging_dirs from_dir to_dir targets)
+endmacro()
 
 ###################################################################
 # set up platform specific lists of files that need to be copied
 ###################################################################
 if(WINDOWS)
-    if(GEN_IS_MULTI_CONFIG)
-        set(SHARED_LIB_STAGING_DIR_DEBUG            "${SHARED_LIB_STAGING_DIR}/Debug")
-        set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo")
-        set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}/Release")
-    elseif (UPPERCASE_CMAKE_BUILD_TYPE MATCHES DEBUG)
-        set(SHARED_LIB_STAGING_DIR_DEBUG            "${SHARED_LIB_STAGING_DIR}")
-    elseif (UPPERCASE_CMAKE_BUILD_TYPE MATCHES RELWITHDEBINFO)
-        set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}")
-    elseif (UPPERCASE_CMAKE_BUILD_TYPE MATCHES RELEASE)
-        set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}")
-    endif()
-
     #*******************************
     # VIVOX - *NOTE: no debug version
     set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
-    set(slvoice_src_dir "${ARCH_PREBUILT_BIN_DIRS_RELEASE}")    
+
+    # ND, it seems there is no such thing defined. At least when building a viewer
+    # Does this maybe matter on some LL buildserver? Otherwise this and the snippet using slvoice_src_dir
+    # can all go
+    if( ARCH_PREBUILT_BIN_DIRS_RELEASE )
+        set(slvoice_src_dir "${ARCH_PREBUILT_BIN_DIRS_RELEASE}")
+    endif()
     set(slvoice_files SLVoice.exe )
     if (ADDRESS_SIZE EQUAL 64)
         list(APPEND vivox_libs
@@ -90,33 +69,74 @@ if(WINDOWS)
 
     # Filenames are different for 32/64 bit BugSplat file and we don't
     # have any control over them so need to branch.
-    if (USE_SENTRY)
+    if (TARGET al::sentry)
       list(APPEND release_files sentry.dll)
     endif ()
 
-    if (USE_FMODSTUDIO)
+    if (TARGET ll::fmodstudio)
       list(APPEND debug_files fmodL.dll)
       list(APPEND release_files fmod.dll)
-    endif (USE_FMODSTUDIO)
+    endif ()
 
-    if (USE_OPENAL)
+    if (TARGET ll::openal)
       list(APPEND debug_files OpenAL32.dll alut.dll)
       list(APPEND release_files OpenAL32.dll alut.dll)
     endif ()
 
-    if (USE_KDU)
-      list(APPEND debug_files kdud.dll)
-      list(APPEND release_files kdu.dll)
-    endif (USE_KDU)
-
-    if(USE_DISCORD)
+    if(TARGET al::discord-gamesdk)
       list(APPEND release_files discord_game_sdk.dll)
     endif()
-elseif(DARWIN)
-    set(SHARED_LIB_STAGING_DIR_DEBUG            "${SHARED_LIB_STAGING_DIR}/Debug/Resources")
-    set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/Resources")
-    set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}/Release/Resources")
 
+    #*******************************
+    # Copy MS C runtime dlls, required for packaging.
+    if (MSVC80)
+        set(MSVC_VER 80)
+    elseif (MSVC_VERSION EQUAL 1600) # VisualStudio 2010
+        MESSAGE(STATUS "MSVC_VERSION ${MSVC_VERSION}")
+    elseif (MSVC_VERSION EQUAL 1800) # VisualStudio 2013, which is (sigh) VS 12
+        set(MSVC_VER 120)
+    elseif (MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) # Visual Studio 2017
+        set(MSVC_VER 140)
+    elseif (MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1930) # Visual Studio 2019
+        set(MSVC_VER 140)
+    elseif (MSVC_VERSION GREATER_EQUAL 1930 AND MSVC_VERSION LESS 1950) # Visual Studio 2022
+        set(MSVC_VER 140)
+    else (MSVC80)
+        MESSAGE(WARNING "New MSVC_VERSION ${MSVC_VERSION} of MSVC: adapt Copy3rdPartyLibs.cmake")
+    endif (MSVC80)
+
+    # These are candidate DLL names. Empirically, VS versions before 2015 have
+    # msvcp*.dll and msvcr*.dll. VS 2017 has msvcp*.dll and vcruntime*.dll.
+    # Check each of them.
+    foreach(release_msvc_file
+            concrt${MSVC_VER}.dll
+            msvcp${MSVC_VER}.dll
+            msvcp${MSVC_VER}_1.dll
+            msvcp${MSVC_VER}_2.dll
+            msvcp${MSVC_VER}_atomic_wait.dll
+            msvcp${MSVC_VER}_codecvt_ids.dll
+            vccorlib${MSVC_VER}.dll
+            vcruntime${MSVC_VER}.dll
+            vcruntime${MSVC_VER}_1.dll
+            vcruntime${MSVC_VER}_threads.dll
+            )
+    if(EXISTS "${MSVC_CRT_DIR}/${release_msvc_file}") # MSVC_CRT_DIR set in InstallRequiredSystemLibraries.cmake
+        to_staging_dirs(
+            ${MSVC_CRT_DIR}
+            third_party_targets
+            ${release_msvc_file})
+    else()
+        # This isn't a WARNING because, as noted above, every VS version
+        # we've observed has only a subset of the specified DLL names.
+        MESSAGE(STATUS "Redist lib ${release_msvc_file} not found")
+    endif()
+    endforeach()
+    MESSAGE(STATUS "Will copy redist files for MSVC ${MSVC_VER} from ${MSVC_CRT_DIR}:")
+    foreach(target ${third_party_targets})
+        MESSAGE(STATUS "${target}")
+    endforeach()
+
+elseif(DARWIN)
     set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(slvoice_files SLVoice)
     set(vivox_libs
@@ -131,22 +151,16 @@ elseif(DARWIN)
         libndofdev.dylib
        )
 
-    if (USE_FMODSTUDIO)
+    if (TARGET ll::fmodstudio)
       list(APPEND debug_files libfmodL.dylib)
       list(APPEND release_files libfmod.dylib)
-    endif (USE_FMODSTUDIO)
+    endif ()
 
-    if(USE_DISCORD)
+    if(TARGET al::discord-gamesdk)
       list(APPEND release_files discord_game_sdk.dylib)
     endif()
 
 elseif(LINUX)
-    # linux is weird, multiple side by side configurations aren't supported
-    # and we don't seem to have any debug shared libs built yet anyways...
-    set(SHARED_LIB_STAGING_DIR_DEBUG            "${SHARED_LIB_STAGING_DIR}")
-    set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}")
-    set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}")
-
     set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_libs
         libsndfile.so.1
@@ -166,22 +180,15 @@ elseif(LINUX)
     set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     # *FIX - figure out what to do with duplicate libalut.so here -brad
     set(release_files
-        libopenal.so
-        libjpeg.so
-        libjpeg.so.8
-        libjpeg.so.8.2.2
-       )
-
-    if (USE_SENTRY)
-      list(APPEND release_files libsentry.so)
-    endif ()
+            ${EXPAT_COPY}
+            )
 
-    if (USE_FMODSTUDIO)
+    if (TARGET ll::fmodstudio)
       list(APPEND debug_files libfmodL.so)
       list(APPEND release_files libfmod.so)
-    endif (USE_FMODSTUDIO)
+    endif ()
 
-    if(USE_DISCORD)
+    if(TARGET al::discord-gamesdk)
       list(APPEND release_files libdiscord_game_sdk.so)
     endif()
 
@@ -210,75 +217,33 @@ endif(WINDOWS)
 # Done building the file lists, now set up the copy commands.
 ################################################################
 
-if (GEN_IS_MULTI_CONFIG OR UPPERCASE_CMAKE_BUILD_TYPE MATCHES DEBUG)
-    copy_if_different(
-        ${slvoice_src_dir}
-        "${SHARED_LIB_STAGING_DIR_DEBUG}"
-        out_targets
-        ${slvoice_files}
-        )
-    list(APPEND third_party_targets ${out_targets})
-
-    to_debug_staging_dirs(
-        ${vivox_lib_dir}
-        third_party_targets
-        ${vivox_libs}
-        )
-
-    to_debug_staging_dirs(
-        ${debug_src_dir}
-        third_party_targets
-        ${debug_files}
-        )
-endif()
+# Curiously, slvoice_files are only copied to SHARED_LIB_STAGING_DIR_RELEASE.
+# It's unclear whether this is oversight or intentional, but anyway leave the
+# single copy_if_different command rather than using to_staging_dirs.
 
-if (GEN_IS_MULTI_CONFIG OR UPPERCASE_CMAKE_BUILD_TYPE MATCHES RELWITHDEBINFO)
+if( slvoice_src_dir )
     copy_if_different(
-        ${slvoice_src_dir}
-        "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
-        out_targets
-        ${slvoice_files}
-        )
+            ${slvoice_src_dir}
+            "${SHARED_LIB_STAGING_DIR}"
+            out_targets
+            ${slvoice_files}
+    )
     list(APPEND third_party_targets ${out_targets})
-
-    to_relwithdeb_staging_dirs(
-        ${vivox_lib_dir}
-        third_party_targets
-        ${vivox_libs}
-        )
-
-    to_relwithdeb_staging_dirs(
-        ${release_src_dir}
-        third_party_targets
-        ${release_files}
-        )
-endif()
-
-if (GEN_IS_MULTI_CONFIG OR UPPERCASE_CMAKE_BUILD_TYPE MATCHES RELEASE)
-    copy_if_different(
-        ${slvoice_src_dir}
-        "${SHARED_LIB_STAGING_DIR_RELEASE}"
-        out_targets
-        ${slvoice_files}
-        )
-    list(APPEND third_party_targets ${out_targets})
-
-    to_release_staging_dirs(
-        ${vivox_lib_dir}
-        third_party_targets
-        ${vivox_libs}
-        )
-
-    to_release_staging_dirs(
-        ${release_src_dir}
-        third_party_targets
-        ${release_files}
-        )
 endif()
 
-if(NOT USESYSTEMLIBS)
-  add_custom_target(
-      stage_third_party_libs ALL
-      DEPENDS ${third_party_targets}
-      )
-endif(NOT USESYSTEMLIBS)
+to_staging_dirs(
+    ${vivox_lib_dir}
+    third_party_targets
+    ${vivox_libs}
+    )
+
+to_staging_dirs(
+    ${release_src_dir}
+    third_party_targets
+    ${release_files}
+    )
+
+add_custom_target(
+        stage_third_party_libs ALL
+        DEPENDS ${third_party_targets}
+)

indra/cmake/CubemapToEquirectangularJS.cmake

@@ -2,4 +2,4 @@
 use_prebuilt_binary(cubemaptoequirectangular)
 
 # Main JS file
-configure_file("${AUTOBUILD_INSTALL_DIR}/js/CubemapToEquirectangular.js" "${CMAKE_SOURCE_DIR}/newview/skins/default/html/common/equirectangular/js/CubemapToEquirectangular.js" COPYONLY)
+configure_file("${LIBS_PREBUILT_DIR}/js/CubemapToEquirectangular.js" "${CMAKE_SOURCE_DIR}/newview/skins/default/html/common/equirectangular/js/CubemapToEquirectangular.js" COPYONLY)

indra/cmake/DBusGlib.cmake

-# -*- cmake -*-
-include(Prebuilt)
-
-if (USESYSTEMLIBS)
-  include(FindPkgConfig)
-
-  pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1)
-
-elseif (LINUX)
-  use_prebuilt_binary(dbus_glib)
-  set(DBUSGLIB_FOUND ON FORCE BOOL)
-  set(DBUSGLIB_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/include/dbus
-      )
-  # We don't need to explicitly link against dbus-glib itself, because
-  # the viewer probes for the system's copy at runtime.
-  set(DBUSGLIB_LIBRARIES
-      gobject-2.0
-      glib-2.0
-      )
-endif (USESYSTEMLIBS)
-
-if (DBUSGLIB_FOUND)
-  set(DBUSGLIB ON CACHE BOOL "Build with dbus-glib message bus support.")
-endif (DBUSGLIB_FOUND)
-
-if (DBUSGLIB)
-  add_definitions(-DLL_DBUS_ENABLED=1)
-endif (DBUSGLIB)

indra/cmake/DeploySharedLibs.cmake

@@ -5,7 +5,7 @@
 # This  script requires a few cmake variable to be set on the command line:
 # BIN_NAME= The full path the the binary to search for dependecies.
 # SEARCH_DIRS= The full paths to dirs to search for dependencies.
-# DST_PATH= The full path where the dependecies will be copied. 
+# DST_PATH= The full path where the dependecies will be copied.
 
 include(GetPrerequisites)
 

indra/cmake/DiscordSDK.cmake

 # -*- cmake -*-
-include(Linking)
 include(Prebuilt)
-include(Variables)
+
+include_guard()
+
+#Discord Integration
+if (DEFINED ENV{USE_DISCORD})
+  set(USE_DISCORD $ENV{USE_DISCORD} CACHE BOOL "Enable Discord client integration" FORCE)
+endif()
+
+if(DEFINED ENV{DISCORD_CLIENTID})
+  set(DISCORD_CLIENTID $ENV{DISCORD_CLIENTID} CACHE STRING "Discord Client ID" FORCE)
+else()
+  set(DISCORD_CLIENTID "564763931009220608" CACHE STRING "Discord Client ID")
+endif()
+
+if (INSTALL_PROPRIETARY AND NOT DISCORD_CLIENTID STREQUAL "")
+  set(USE_DISCORD ON CACHE BOOL "Enable Discord client integration")
+endif ()
 
 if (USE_DISCORD)
-  if (STANDALONE)
-    # In that case, we use the version of the library installed on the system
-    set(DISCORD_FIND_REQUIRED ON)
-    include(FindFMODSTUDIO)
-  else (STANDALONE)
-    use_prebuilt_binary(discord-gamesdk)    
+    add_library( al::discord-gamesdk INTERFACE IMPORTED )
+
+    use_prebuilt_binary(discord-gamesdk)
     if (WINDOWS)
-      set(DISCORD_LIBRARY 
+      target_link_libraries( al::discord-gamesdk INTERFACE
           ${ARCH_PREBUILT_DIRS_RELEASE}/discordgamesdk.lib
           ${ARCH_PREBUILT_DIRS_RELEASE}/discord_game_sdk.dll.lib)
     elseif (DARWIN)
-      set(DISCORD_LIBRARY 
+      target_link_libraries( al::discord-gamesdk INTERFACE
           ${ARCH_PREBUILT_DIRS_RELEASE}/libdiscordgamesdk.a
           ${ARCH_PREBUILT_DIRS_RELEASE}/discord_game_sdk.dylib)
     elseif (LINUX)
-      set(DISCORD_LIBRARY 
-          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libdiscord_game_sdk.so
-          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libdiscordgamesdk.a)
-    endif (WINDOWS)
-    set(DISCORD_LIBRARIES ${DISCORD_LIBRARY})
-    set(DISCORD_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/discord/)
-
-    add_definitions(-DUSE_DISCORD=1)
-  endif (STANDALONE)
-
-  if(DISCORD_CLIENTID STREQUAL "")
-    message(FATAL_ERROR "You must set a ClientID with -DDISCORD_CLIENTID= to enable Discord integration")
-  endif()
+      target_link_libraries( al::discord-gamesdk INTERFACE
+          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libdiscordgamesdk.a
+          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libdiscord_game_sdk.so )
+          endif (WINDOWS)
+    target_include_directories( al::discord-gamesdk SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/discord/)
 
+    if(DISCORD_CLIENTID STREQUAL "")
+        message(FATAL_ERROR "You must set a ClientID with -DDISCORD_CLIENTID= to enable Discord integration")
+    endif()
+    target_compile_definitions( al::discord-gamesdk INTERFACE AL_DISCORD=1 DISCORD_CLIENTID=${DISCORD_CLIENTID})
 endif (USE_DISCORD)
-

indra/cmake/DragDrop.cmake

 # -*- cmake -*-
 
-  set(OS_DRAG_DROP ON CACHE BOOL "Build the viewer with OS level drag and drop turned on or off")
-
-  if (OS_DRAG_DROP)
+set(OS_DRAG_DROP ON CACHE BOOL "Build the viewer with OS level drag and drop turned on or off")
 
+if (OS_DRAG_DROP)
     if (WINDOWS)
-      add_definitions(-DLL_OS_DRAGDROP_ENABLED=1)
+        add_definitions(-DLL_OS_DRAGDROP_ENABLED=1)
     endif (WINDOWS)
-
     if (DARWIN)
-      add_definitions(-DLL_OS_DRAGDROP_ENABLED=1)
+        add_definitions(-DLL_OS_DRAGDROP_ENABLED=1)
     endif (DARWIN)
-
     if (LINUX)
-      add_definitions(-DLL_OS_DRAGDROP_ENABLED=0)
+        add_definitions(-DLL_OS_DRAGDROP_ENABLED=1)
     endif (LINUX)
-
-  endif (OS_DRAG_DROP)
+endif (OS_DRAG_DROP)
 

indra/cmake/EXPAT.cmake

 # -*- cmake -*-
 include(Prebuilt)
 
-set(EXPAT_FIND_QUIETLY ON)
-set(EXPAT_FIND_REQUIRED ON)
+include_guard()
+add_library( ll::expat INTERFACE IMPORTED )
 
-if (USESYSTEMLIBS)
-  include(FindEXPAT)
-else (USESYSTEMLIBS)
-    use_prebuilt_binary(expat)
-    if (WINDOWS)
-        set(EXPAT_LIBRARIES
+use_system_binary(expat)
+use_prebuilt_binary(expat)
+if (WINDOWS)
+    target_compile_definitions( ll::expat INTERFACE XML_STATIC=1)
+    target_link_libraries( ll::expat  INTERFACE
             debug ${ARCH_PREBUILT_DIRS_DEBUG}/libexpatd.lib
             optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libexpat.lib)
-    else ()
-        set(EXPAT_LIBRARIES
+else ()
+    target_link_libraries( ll::expat  INTERFACE
             debug ${ARCH_PREBUILT_DIRS_DEBUG}/libexpat.a
             optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libexpat.a)
-    endif ()
-    set(EXPAT_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-endif (USESYSTEMLIBS)
+endif ()
+target_include_directories( ll::expat SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include )

indra/cmake/Epoxy.cmake

-# -*- cmake -*-
-include(Linking)
-include(Prebuilt)
-
-if (USESYSTEMLIBS)
-  include(FindPkgConfig)
-
-  pkg_check_modules(EPOXY REQUIRED epoxy)
-else (USESYSTEMLIBS)
-  #use_prebuilt_binary(libepoxy)
-  set(EPOXY_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/)
-  if (WINDOWS)
-    set(EPOXY_LIBRARIES 
-        debug ${ARCH_PREBUILT_DIRS_DEBUG}/epoxy.lib
-        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/epoxy.lib)
-  else ()
-    set(EPOXY_LIBRARIES epoxy)
-  endif()
-endif (USESYSTEMLIBS)
\ No newline at end of file

indra/cmake/ExamplePlugin.cmake

@@ -2,15 +2,5 @@
 include(Linking)
 include(Prebuilt)
 
-if (USESYSTEMLIBS)
-    set(EXAMPLEPLUGIN OFF CACHE BOOL
+set(EXAMPLEPLUGIN ON CACHE BOOL
         "EXAMPLEPLUGIN support for the llplugin/llmedia test apps.")
-else (USESYSTEMLIBS)
-    set(EXAMPLEPLUGIN ON CACHE BOOL
-        "EXAMPLEPLUGIN support for the llplugin/llmedia test apps.")
-endif (USESYSTEMLIBS)
-
-if (WINDOWS)
-elseif (DARWIN)
-elseif (LINUX)
-endif (WINDOWS)

indra/cmake/FMODSTUDIO.cmake

 # -*- cmake -*-
-include(Linking)
-include(Prebuilt)
 
-# FMOD can be set when launching the make using the argument -DUSE_FMODSTUDIO:BOOL=ON
+include_guard()
+
+# FMODSTUDIO can be set when launching the make using the argument -DUSE_FMODSTUDIO:BOOL=ON
 # When building using proprietary binaries though (i.e. having access to LL private servers),
 # we always build with FMODSTUDIO.
-# Open source devs should use the -DFMODSTUDIO:BOOL=ON then if they want to build with FMOD, whether
-# they are using STANDALONE or not.
 if (INSTALL_PROPRIETARY)
-  set(USE_FMODSTUDIO ON CACHE BOOL "Use FMOD Studio audio subsystem" FORCE)
+  set(USE_FMODSTUDIO ON CACHE BOOL "Using FMODSTUDIO sound library.")
 endif (INSTALL_PROPRIETARY)
 
+# ND: To streamline arguments passed, switch from FMODSTUDIO to USE_FMODSTUDIO
+# To not break all old build scripts convert old arguments but warn about it
+if(FMODSTUDIO)
+  message( WARNING "Use of the FMODSTUDIO argument is deprecated, please switch to USE_FMODSTUDIO")
+  set(USE_FMODSTUDIO ${FMODSTUDIO})
+endif()
+
 if (USE_FMODSTUDIO)
-  if (STANDALONE)
-    # In that case, we use the version of the library installed on the system
-    set(FMODSTUDIO_FIND_REQUIRED ON)
-    include(FindFMODSTUDIO)
-  else (STANDALONE)
-    if (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
-      # If the path have been specified in the arguments, use that
-      set(FMODSTUDIO_LIBRARIES ${FMODSTUDIO_LIBRARY})
-      MESSAGE(STATUS "Using FMODSTUDIO path: ${FMODSTUDIO_LIBRARIES}, ${FMODSTUDIO_INCLUDE_DIR}")
-    else (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
-      # If not, we're going to try to get the package listed in autobuild.xml
-      # Note: if you're not using INSTALL_PROPRIETARY, the package URL should be local (file:/// URL) 
-      # as accessing the private LL location will fail if you don't have the credential
-      include(Prebuilt)
-      use_prebuilt_binary(fmodstudio)    
-      if (WINDOWS)
-        set(FMODSTUDIO_LIBRARY 
+  add_library( ll::fmodstudio INTERFACE IMPORTED )
+  target_compile_definitions( ll::fmodstudio INTERFACE LL_FMODSTUDIO=1)
+
+  if (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
+    # If the path have been specified in the arguments, use that
+
+    target_link_libraries(ll::fmodstudio INTERFACE ${FMODSTUDIO_LIBRARY})
+    target_include_directories( ll::fmodstudio SYSTEM INTERFACE  ${FMODSTUDIO_INCLUDE_DIR})
+  else (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
+    # If not, we're going to try to get the package listed in autobuild.xml
+    # Note: if you're not using INSTALL_PROPRIETARY, the package URL should be local (file:/// URL)
+    # as accessing the private LL location will fail if you don't have the credential
+    include(Prebuilt)
+    use_prebuilt_binary(fmodstudio)
+    if (WINDOWS)
+      target_link_libraries( ll::fmodstudio INTERFACE
             debug ${ARCH_PREBUILT_DIRS_DEBUG}/fmodL_vc.lib
             optimized ${ARCH_PREBUILT_DIRS_RELEASE}/fmod_vc.lib)
-      elseif (DARWIN)
-        set(FMODSTUDIO_LIBRARY 
-            debug fmodL
-            optimized fmod)
-      elseif (LINUX)
-        set(FMODSTUDIO_LIBRARY 
-            debug fmodL
-            optimized fmod)
-      endif (WINDOWS)
-      set(FMODSTUDIO_LIBRARIES ${FMODSTUDIO_LIBRARY})
-      set(FMODSTUDIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/fmodstudio)
-    endif (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
-  endif (STANDALONE)
-endif (USE_FMODSTUDIO)
+    elseif (DARWIN)
+      #despite files being called libfmod.dylib, we are searching for fmod
+      target_link_libraries( ll::fmodstudio INTERFACE  fmod)
+    elseif (LINUX)
+      target_link_libraries( ll::fmodstudio INTERFACE  fmod)
+    endif (WINDOWS)
+
+    target_include_directories( ll::fmodstudio SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/fmodstudio)
+  endif (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
+else()
+  set( USE_FMODSTUDIO "OFF")
+endif ()
 

indra/cmake/FindAPR.cmake

-# -*- cmake -*-
-
-# - Find Apache Portable Runtime
-# Find the APR includes and libraries
-# This module defines
-#  APR_INCLUDE_DIR and APRUTIL_INCLUDE_DIR, where to find apr.h, etc.
-#  APR_LIBRARIES and APRUTIL_LIBRARIES, the libraries needed to use APR.
-#  APR_FOUND and APRUTIL_FOUND, If false, do not try to use APR.
-# also defined, but not for general use are
-#  APR_LIBRARY and APRUTIL_LIBRARY, where to find the APR library.
-
-# APR first.
-
-FIND_PATH(APR_INCLUDE_DIR apr.h
-/usr/local/include/apr-1
-/usr/local/include/apr-1.0
-/usr/include/apr-1
-/usr/include/apr-1.0
-)
-
-SET(APR_NAMES ${APR_NAMES} apr-1)
-FIND_LIBRARY(APR_LIBRARY
-  NAMES ${APR_NAMES}
-  PATHS /usr/lib /usr/local/lib
-  )
-
-IF (APR_LIBRARY AND APR_INCLUDE_DIR)
-    SET(APR_LIBRARIES ${APR_LIBRARY})
-    SET(APR_FOUND "YES")
-ELSE (APR_LIBRARY AND APR_INCLUDE_DIR)
-  SET(APR_FOUND "NO")
-ENDIF (APR_LIBRARY AND APR_INCLUDE_DIR)
-
-
-IF (APR_FOUND)
-   IF (NOT APR_FIND_QUIETLY)
-      MESSAGE(STATUS "Found APR: ${APR_LIBRARIES}")
-   ENDIF (NOT APR_FIND_QUIETLY)
-ELSE (APR_FOUND)
-   IF (APR_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find APR library")
-   ENDIF (APR_FIND_REQUIRED)
-ENDIF (APR_FOUND)
-
-# Deprecated declarations.
-SET (NATIVE_APR_INCLUDE_PATH ${APR_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_APR_LIB_PATH ${APR_LIBRARY} PATH)
-
-MARK_AS_ADVANCED(
-  APR_LIBRARY
-  APR_INCLUDE_DIR
-  )
-
-# Next, APRUTIL.
-
-FIND_PATH(APRUTIL_INCLUDE_DIR apu.h
-/usr/local/include/apr-1
-/usr/local/include/apr-1.0
-/usr/include/apr-1
-/usr/include/apr-1.0
-)
-
-SET(APRUTIL_NAMES ${APRUTIL_NAMES} aprutil-1)
-FIND_LIBRARY(APRUTIL_LIBRARY
-  NAMES ${APRUTIL_NAMES}
-  PATHS /usr/lib /usr/local/lib
-  )
-
-IF (APRUTIL_LIBRARY AND APRUTIL_INCLUDE_DIR)
-    SET(APRUTIL_LIBRARIES ${APRUTIL_LIBRARY})
-    SET(APRUTIL_FOUND "YES")
-ELSE (APRUTIL_LIBRARY AND APRUTIL_INCLUDE_DIR)
-  SET(APRUTIL_FOUND "NO")
-ENDIF (APRUTIL_LIBRARY AND APRUTIL_INCLUDE_DIR)
-
-
-IF (APRUTIL_FOUND)
-   IF (NOT APRUTIL_FIND_QUIETLY)
-      MESSAGE(STATUS "Found APRUTIL: ${APRUTIL_LIBRARIES}")
-   ENDIF (NOT APRUTIL_FIND_QUIETLY)
-ELSE (APRUTIL_FOUND)
-   IF (APRUTIL_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find APRUTIL library")
-   ENDIF (APRUTIL_FIND_REQUIRED)
-ENDIF (APRUTIL_FOUND)
-
-# Deprecated declarations.
-SET (NATIVE_APRUTIL_INCLUDE_PATH ${APRUTIL_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_APRUTIL_LIB_PATH ${APRUTIL_LIBRARY} PATH)
-
-MARK_AS_ADVANCED(
-  APRUTIL_LIBRARY
-  APRUTIL_INCLUDE_DIR
-  )

indra/cmake/FindAutobuild.cmake

@@ -22,11 +22,11 @@ IF (NOT AUTOBUILD_EXECUTABLE)
 
     SET(AUTOBUILD_EXECUTABLE)
     FIND_PROGRAM(
-      AUTOBUILD_EXECUTABLE 
+      AUTOBUILD_EXECUTABLE
       NAMES ${AUTOBUILD_EXE_NAMES}
-      PATHS 
+      PATHS
         ENV PATH
-        ${CMAKE_SOURCE_DIR}/.. 
+        ${CMAKE_SOURCE_DIR}/..
         ${CMAKE_SOURCE_DIR}/../..
         ${CMAKE_SOURCE_DIR}/../../..
       PATH_SUFFIXES "/autobuild/bin/"

indra/cmake/FindFMODSTUDIO.cmake

-# -*- cmake -*-
-
-# - Find FMODSTUDIO
-# Find the FMODSTUDIO includes and library
-# This module defines
-#  FMODSTUDIO_INCLUDE_DIR, where to find fmod.h and fmod_errors.h
-#  FMODSTUDIO_LIBRARIES, the libraries needed to use FMODSTUDIO.
-#  FMODSTUDIO, If false, do not try to use FMODSTUDIO.
-# also defined, but not for general use are
-#  FMODSTUDIO_LIBRARY, where to find the FMODSTUDIO library.
-
-FIND_PATH(FMODSTUDIO_INCLUDE_DIR fmod.h PATH_SUFFIXES fmod)
-
-SET(FMODSTUDIO_NAMES ${FMODSTUDIO_NAMES} fmod fmod_vc)
-FIND_LIBRARY(FMODSTUDIO_LIBRARY
-  NAMES ${FMODSTUDIO_NAMES}
-  PATH_SUFFIXES fmod
-  )
-
-IF (FMODSTUDIO_SDK_DIR OR WINDOWS)
-    if(WINDOWS)
-        set(FMODSTUDIO_SDK_DIR "$ENV{PROGRAMFILES}/FMOD SoundSystem/FMOD Programmers API Windows" CACHE PATH "Path to FMODSTUDIO")
-        STRING(REGEX REPLACE "\\\\" "/" FMODSTUDIO_SDK_DIR ${FMODSTUDIO_SDK_DIR}) 
-    endif(WINDOWS)
-    find_library(FMODSTUDIO_LIBRARY
-             fmod_vc fmodL_vc 
-             PATHS
-             ${FMODSTUDIO_SDK_DIR}/api/lib
-             ${FMODSTUDIO_SDK_DIR}/api
-             ${FMODSTUDIO_SDK_DIR}
-             )
-    find_path(FMODSTUDIO_INCLUDE_DIR fmod.h
-        ${FMODSTUDIO_SDK_DIR}/api/inc
-        ${FMODSTUDIO_SDK_DIR}/api
-        ${FMODSTUDIO_SDK_DIR}
-      )
-    find_path(FMODSTUDIO_INCLUDE_DIR fmod.h
-        ${FMODSTUDIO_SDK_DIR}/api/inc
-        ${FMODSTUDIO_SDK_DIR}/api
-        ${FMODSTUDIO_SDK_DIR}
-      )
-    IF (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
-      SET(FMODSTUDIO_LIBRARIES ${FMODSTUDIO_LIBRARY})
-      SET(FMODSTUDIO_FOUND "YES")
-    endif (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
-ENDIF (FMODSTUDIO_SDK_DIR OR WINDOWS)
-
-IF (FMODSTUDIO_FOUND)
-  IF (NOT FMODSTUDIO_FIND_QUIETLY)
-    MESSAGE(STATUS "Found FMODSTUDIO: ${FMODSTUDIO_LIBRARIES}")
-  ENDIF (NOT FMODSTUDIO_FIND_QUIETLY)
-ELSE (FMODSTUDIO_FOUND)
-  IF (FMODSTUDIO_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could not find FMODSTUDIO library")
-  ENDIF (FMODSTUDIO_FIND_REQUIRED)
-ENDIF (FMODSTUDIO_FOUND)
-
-# Deprecated declarations.
-SET (NATIVE_FMODSTUDIO_INCLUDE_PATH ${FMODSTUDIO_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_FMODSTUDIO_LIB_PATH ${FMODSTUDIO_LIBRARY} PATH)
-
-MARK_AS_ADVANCED(
-  FMODSTUDIO_LIBRARY
-  FMODSTUDIO_INCLUDE_DIR
-  )

indra/cmake/FindGooglePerfTools.cmake

-# -*- cmake -*-
-
-# - Find Google perftools
-# Find the Google perftools includes and libraries
-# This module defines
-#  GOOGLE_PERFTOOLS_INCLUDE_DIR, where to find heap-profiler.h, etc.
-#  GOOGLE_PERFTOOLS_FOUND, If false, do not try to use Google perftools.
-# also defined for general use are
-#  TCMALLOC_LIBRARIES, where to find the tcmalloc library.
-#  STACKTRACE_LIBRARIES, where to find the stacktrace library.
-#  PROFILER_LIBRARIES, where to find the profiler library.
-
-FIND_PATH(GOOGLE_PERFTOOLS_INCLUDE_DIR google/heap-profiler.h
-/usr/local/include
-/usr/include
-)
-
-SET(TCMALLOC_NAMES ${TCMALLOC_NAMES} tcmalloc)
-FIND_LIBRARY(TCMALLOC_LIBRARY
-  NAMES ${TCMALLOC_NAMES}
-  PATHS /usr/lib /usr/local/lib
-  )
-
-IF (TCMALLOC_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
-    SET(TCMALLOC_LIBRARIES ${TCMALLOC_LIBRARY})
-    SET(GOOGLE_PERFTOOLS_FOUND "YES")
-ELSE (TCMALLOC_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
-  SET(GOOGLE_PERFTOOLS_FOUND "NO")
-ENDIF (TCMALLOC_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
-
-SET(STACKTRACE_NAMES ${STACKTRACE_NAMES} stacktrace)
-FIND_LIBRARY(STACKTRACE_LIBRARY
-  NAMES ${STACKTRACE_LIBRARY}
-  PATHS /usr/lib /usr/local/lib
-  )
-
-IF (STACKTRACE_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
-    SET(STACKTRACE_LIBRARIES ${STACKTRACE_LIBRARY})
-ENDIF (STACKTRACE_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
-
-SET(PROFILER_NAMES ${PROFILER_NAMES} profiler)
-FIND_LIBRARY(PROFILER_LIBRARY
-  NAMES ${PROFILER_LIBRARY}
-  PATHS /usr/lib /usr/local/lib
-  )
-
-IF (PROFILER_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
-    SET(PROFILER_LIBRARIES ${PROFILER_LIBRARY})
-ENDIF (PROFILER_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
-
-IF (GOOGLE_PERFTOOLS_FOUND)
-   IF (NOT GOOGLE_PERFTOOLS_FIND_QUIETLY)
-      MESSAGE(STATUS "Found Google perftools: ${GOOGLE_PERFTOOLS_LIBRARIES}")
-   ENDIF (NOT GOOGLE_PERFTOOLS_FIND_QUIETLY)
-ELSE (GOOGLE_PERFTOOLS_FOUND)
-   IF (GOOGLE_PERFTOOLS_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find Google perftools library")
-   ENDIF (GOOGLE_PERFTOOLS_FIND_REQUIRED)
-ENDIF (GOOGLE_PERFTOOLS_FOUND)
-
-MARK_AS_ADVANCED(
-  TCMALLOC_LIBRARY
-  STACKTRACE_LIBRARY
-  PROFILER_LIBRARY
-  GOOGLE_PERFTOOLS_INCLUDE_DIR
-  )

indra/cmake/FindHUNSPELL.cmake

-# -*- cmake -*-
-
-# - Find HUNSPELL
-# This module defines
-#  HUNSPELL_INCLUDE_DIR, where to find libhunspell.h, etc.
-#  HUNSPELL_LIBRARY, the library needed to use HUNSPELL.
-#  HUNSPELL_FOUND, If false, do not try to use HUNSPELL.
-
-find_path(HUNSPELL_INCLUDE_DIR hunspell.h
-  PATH_SUFFIXES hunspell
-  )
-
-set(HUNSPELL_NAMES ${HUNSPELL_NAMES} libhunspell-1.3 libhunspell)
-find_library(HUNSPELL_LIBRARY
-  NAMES ${HUNSPELL_NAMES}
-  )
-
-if (HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR)
-  set(HUNSPELL_FOUND "YES")
-else (HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR)
-  set(HUNSPELL_FOUND "NO")
-endif (HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR)
-
-
-if (HUNSPELL_FOUND)
-  if (NOT HUNSPELL_FIND_QUIETLY)
-    message(STATUS "Found Hunspell: Library in '${HUNSPELL_LIBRARY}' and header in '${HUNSPELL_INCLUDE_DIR}' ")
-  endif (NOT HUNSPELL_FIND_QUIETLY)
-else (HUNSPELL_FOUND)
-  if (HUNSPELL_FIND_REQUIRED)
-    message(FATAL_ERROR " * * *\nCould not find HUNSPELL library! * * *")
-  endif (HUNSPELL_FIND_REQUIRED)
-endif (HUNSPELL_FOUND)
-
-mark_as_advanced(
-  HUNSPELL_LIBRARY
-  HUNSPELL_INCLUDE_DIR
-  )

indra/cmake/FindNDOF.cmake

-# -*- cmake -*-
-
-# - Find NDOF
-# Find the NDOF includes and library
-# This module defines
-#  NDOF_INCLUDE_DIR, where to find ndofdev_external.h, etc.
-#  NDOF_LIBRARY, the library needed to use NDOF.
-#  NDOF_FOUND, If false, do not try to use NDOF.
-
-find_path(NDOF_INCLUDE_DIR ndofdev_external.h
-  PATH_SUFFIXES ndofdev
-  )
-
-set(NDOF_NAMES ${NDOF_NAMES} ndofdev libndofdev)
-find_library(NDOF_LIBRARY
-  NAMES ${NDOF_NAMES}
-  )
-
-if (NDOF_LIBRARY AND NDOF_INCLUDE_DIR)
-  set(NDOF_FOUND "YES")
-else (NDOF_LIBRARY AND NDOF_INCLUDE_DIR)
-  set(NDOF_FOUND "NO")
-endif (NDOF_LIBRARY AND NDOF_INCLUDE_DIR)
-
-
-if (NDOF_FOUND)
-  if (NOT NDOF_FIND_QUIETLY)
-    message(STATUS "Found NDOF: Library in '${NDOF_LIBRARY}' and header in '${NDOF_INCLUDE_DIR}' ")
-  endif (NOT NDOF_FIND_QUIETLY)
-else (NDOF_FOUND)
-  if (NDOF_FIND_REQUIRED)
-    message(FATAL_ERROR " * * *\nCould not find NDOF library!\nIf you don't need Space Navigator Joystick support you can skip this test by configuring with -DNDOF:BOOL=OFF\n * * *")
-  endif (NDOF_FIND_REQUIRED)
-endif (NDOF_FOUND)
-
-mark_as_advanced(
-  NDOF_LIBRARY
-  NDOF_INCLUDE_DIR
-  )