indra/cmake/ConfigurePkgConfig.cmake

-# -*- cmake -*-
-
-SET(DEBUG_PKG_CONFIG "YES")
-
-# Don't change this if manually set by user.
-IF("$ENV{PKG_CONFIG_LIBDIR}" STREQUAL "")
-
-  # Guess at architecture-specific system library paths.
-  if (ADDRESS_SIZE EQUAL 32)
-    SET(PKG_CONFIG_NO_MULTI_GUESS /usr/lib32 /usr/lib)
-    SET(PKG_CONFIG_NO_MULTI_LOCAL_GUESS /usr/local/lib32 /usr/local/lib)
-    SET(PKG_CONFIG_MULTI_GUESS /usr/lib/i386-linux-gnu)
-    SET(PKG_CONFIG_MULTI_LOCAL_GUESS /usr/local/lib/i386-linux-gnu)
-  else (ADDRESS_SIZE EQUAL 32)
-    SET(PKG_CONFIG_NO_MULTI_GUESS /usr/lib64 /usr/lib)
-    SET(PKG_CONFIG_NO_MULTI_LOCAL_GUESS /usr/local/lib64 /usr/local/lib)
-    SET(PKG_CONFIG_MULTI_GUESS /usr/local/lib/x86_64-linux-gnu)
-    SET(PKG_CONFIG_MULTI_LOCAL_GUESS /usr/local/lib/x86_64-linux-gnu)
-  endif (ADDRESS_SIZE EQUAL 32)
-  
-  # Use DPKG architecture, if available.
-  IF (${DPKG_ARCH})
-    SET(PKG_CONFIG_MULTI_GUESS /usr/lib/${DPKG_ARCH})
-    SET(PKG_CONFIG_MULTI_LOCAL_GUESS /usrlocal/lib/${DPKG_ARCH})
-  ENDIF (${DPKG_ARCH})
-  
-  # Explicitly include anything listed in PKG_CONFIG_PATH
-  string(REPLACE ":" ";" PKG_CONFIG_PATH_LIST "$ENV{PKG_CONFIG_PATH}")
-  FOREACH(PKG_CONFIG_DIR ${PKG_CONFIG_PATH_LIST})
-    SET(VALID_PKG_LIBDIRS "${VALID_PKG_LIBDIRS}:${PKG_CONFIG_DIR}/pkgconfig")
-  ENDFOREACH(PKG_CONFIG_DIR)
-
-  # Look for valid pkgconfig directories.
-  FIND_PATH(PKG_CONFIG_ENV pkgconfig ENV LD_LIBRARY_PATH)
-  FIND_PATH(PKG_CONFIG_MULTI pkgconfig HINT ${PKG_CONFIG_MULTI_GUESS})
-  FIND_PATH(PKG_CONFIG_MULTI_LOCAL pkgconfig HINT ${PKG_CONFIG_MULTI_LOCAL_GUESS})
-  FIND_PATH(PKG_CONFIG_NO_MULTI pkgconfig HINT ${PKG_CONFIG_NO_MULTI_GUESS})
-  FIND_PATH(PKG_CONFIG_NO_MULTI_LOCAL pkgconfig HINT ${PKG_CONFIG_NO_MULTI_LOCAL_GUESS})
-
-  # Add anything we found to our list.
-  IF(NOT PKG_CONFIG_ENV STREQUAL PKG_CONFIG_ENV-NOTFOUND) 
-    SET(VALID_PKG_LIBDIRS "${VALID_PKG_LIBDIRS}:${PKG_CONFIG_ENV}/pkgconfig")
-  ENDIF(NOT PKG_CONFIG_ENV STREQUAL PKG_CONFIG_ENV-NOTFOUND) 
-
-  IF(NOT PKG_CONFIG_MULTI STREQUAL PKG_CONFIG_MULTI-NOTFOUND) 
-    SET(VALID_PKG_LIBDIRS "${VALID_PKG_LIBDIRS}:${PKG_CONFIG_MULTI}/pkgconfig")
-  ENDIF(NOT PKG_CONFIG_MULTI STREQUAL PKG_CONFIG_MULTI-NOTFOUND) 
-
-  IF(NOT PKG_CONFIG_MULTI_LOCAL STREQUAL PKG_CONFIG_MULTI_LOCAL-NOTFOUND) 
-    SET(VALID_PKG_LIBDIRS "${VALID_PKG_LIBDIRS}:${PKG_CONFIG_MULTI_LOCAL}/pkgconfig")
-  ENDIF(NOT PKG_CONFIG_MULTI_LOCAL STREQUAL PKG_CONFIG_MULTI_LOCAL-NOTFOUND) 
-
-  IF(NOT PKG_CONFIG_NO_MULTI STREQUAL PKG_CONFIG_NO_MULTI-NOTFOUND) 
-    SET(VALID_PKG_LIBDIRS "${VALID_PKG_LIBDIRS}:${PKG_CONFIG_NO_MULTI}/pkgconfig")
-  ENDIF(NOT PKG_CONFIG_NO_MULTI STREQUAL PKG_CONFIG_NO_MULTI-NOTFOUND) 
-
-  IF(NOT PKG_CONFIG_NO_MULTI_LOCAL STREQUAL PKG_CONFIG_NO_MULTI_LOCAL-NOTFOUND) 
-    SET(VALID_PKG_LIBDIRS "${VALID_PKG_LIBDIRS}:${PKG_CONFIG_NO_MULTI_LOCAL}/pkgconfig")
-  ENDIF(NOT PKG_CONFIG_NO_MULTI_LOCAL STREQUAL PKG_CONFIG_NO_MULTI_LOCAL-NOTFOUND) 
-
-  # Also add some non-architecture specific package locations.
-  SET(VALID_PKG_LIBDIRS "${VALID_PKG_LIBDIRS}:/usr/share/pkgconfig:/usr/local/share/pkgconfig")
-
-  # Remove first unwanted ':'
-  string(SUBSTRING ${VALID_PKG_LIBDIRS} 1 -1 VALID_PKG_LIBDIRS)
-
-  # Set PKG_CONFIG_LIBDIR environment.
-  SET(ENV{PKG_CONFIG_LIBDIR} ${VALID_PKG_LIBDIRS})
-ENDIF("$ENV{PKG_CONFIG_LIBDIR}" STREQUAL "")
-
-IF(DEBUG_PKG_CONFIG)
-  MESSAGE(STATUS "Using PKG_CONFIG_LIBDIR=$ENV{PKG_CONFIG_LIBDIR}")
-ENDIF(DEBUG_PKG_CONFIG)
-

indra/cmake/Copy3rdPartyLibs.cmake

@@ -5,7 +5,12 @@
 # VisualStudio.
 
 include(CMakeCopyIfDifferent)
-include(Linking)
+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
@@ -13,27 +18,27 @@ include(Linking)
 # 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_staging_dirs from_dir targets)
-  foreach(staging_dir
-          "${SHARED_LIB_STAGING_DIR_RELEASE}"
-          "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}")
-    copy_if_different("${from_dir}" "${staging_dir}" out_targets ${ARGN})
+macro(to_staging_dirs from_dir targets)
+    set( targetDir "${SHARED_LIB_STAGING_DIR}")
+    copy_if_different("${from_dir}" "${targetDir}" out_targets ${ARGN})
+
     list(APPEND "${targets}" "${out_targets}")
-  endforeach()
-ENDMACRO(to_staging_dirs from_dir to_dir targets)
+endmacro()
 
 ###################################################################
 # set up platform specific lists of files that need to be copied
 ###################################################################
 if(WINDOWS)
-    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")
-
     #*******************************
     # VIVOX - *NOTE: no debug version
     set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
-    set(slvoice_src_dir "${ARCH_PREBUILT_BIN_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
@@ -50,37 +55,37 @@ if(WINDOWS)
     #*******************************
     # Misc shared libs 
 
+    set(addrsfx "-x${ADDRESS_SIZE}")
+
+    set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
+    set(debug_files
+        openjp2.dll
+        )
+
     set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(release_files
-        openjpeg.dll
-        libapr-1.dll
-        libaprutil-1.dll
-        libapriconv-1.dll
-        ssleay32.dll
-        libeay32.dll
-        nghttp2.dll
-        glod.dll
-        libhunspell.dll
+        openjp2.dll
         )
 
     # Filenames are different for 32/64 bit BugSplat file and we don't
     # have any control over them so need to branch.
-    if (BUGSPLAT_DB)
-      if(ADDRESS_SIZE EQUAL 32)
-        set(release_files ${release_files} BugSplat.dll)
-        set(release_files ${release_files} BugSplatRc.dll)
-        set(release_files ${release_files} BsSndRpt.exe)
-      else(ADDRESS_SIZE EQUAL 32)
-        set(release_files ${release_files} BugSplat64.dll)
-        set(release_files ${release_files} BugSplatRc64.dll)
-        set(release_files ${release_files} BsSndRpt64.exe)
-      endif(ADDRESS_SIZE EQUAL 32)
-    endif (BUGSPLAT_DB)
-
-    if (FMODSTUDIO)
-        set(debug_files ${debug_files} fmodL.dll)
-        set(release_files ${release_files} fmod.dll)
-    endif (FMODSTUDIO)
+    if (TARGET al::sentry)
+      list(APPEND release_files sentry.dll)
+    endif ()
+
+    if (TARGET ll::fmodstudio)
+      list(APPEND debug_files fmodL.dll)
+      list(APPEND release_files fmod.dll)
+    endif ()
+
+    if (TARGET ll::openal)
+      list(APPEND debug_files OpenAL32.dll alut.dll)
+      list(APPEND release_files OpenAL32.dll alut.dll)
+    endif ()
+
+    if(TARGET al::discord-gamesdk)
+      list(APPEND release_files discord_game_sdk.dll)
+    endif()
 
     #*******************************
     # Copy MS C runtime dlls, required for packaging.
@@ -92,52 +97,46 @@ if(WINDOWS)
         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)
 
-    if(ADDRESS_SIZE EQUAL 32)
-        # this folder contains the 32bit DLLs.. (yes really!)
-        set(registry_find_path "[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/SysWOW64")
-    else(ADDRESS_SIZE EQUAL 32)
-        # this folder contains the 64bit DLLs.. (yes really!)
-        set(registry_find_path "[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32")
-    endif(ADDRESS_SIZE EQUAL 32)
-
-    # Having a string containing the system registry path is a start, but to
-    # get CMake to actually read the registry, we must engage some other
-    # operation.
-    get_filename_component(registry_path "${registry_find_path}" ABSOLUTE)
-
     # 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
-            msvcr${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 "${registry_path}/${release_msvc_file}")
-            to_staging_dirs(
-                ${registry_path}
-                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()
+    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}:")
+    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(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")
-
     set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(slvoice_files SLVoice)
     set(vivox_libs
@@ -149,32 +148,19 @@ elseif(DARWIN)
        )
     set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(release_files
-        libapr-1.0.dylib
-        libapr-1.dylib
-        libaprutil-1.0.dylib
-        libaprutil-1.dylib
-        libexception_handler.dylib
-        ${EXPAT_COPY}
-        libGLOD.dylib
-        libhunspell-1.3.0.dylib
         libndofdev.dylib
-        libnghttp2.dylib
-        libnghttp2.14.dylib
-        libnghttp2.14.19.0.dylib
        )
 
-    if (FMODSTUDIO)
-      set(debug_files ${debug_files} libfmodL.dylib)
-      set(release_files ${release_files} libfmod.dylib)
-    endif (FMODSTUDIO)
+    if (TARGET ll::fmodstudio)
+      list(APPEND debug_files libfmodL.dylib)
+      list(APPEND release_files libfmod.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}")
+    if(TARGET al::discord-gamesdk)
+      list(APPEND release_files discord_game_sdk.dylib)
+    endif()
 
+elseif(LINUX)
     set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_libs
         libsndfile.so.1
@@ -194,29 +180,17 @@ 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
-        libapr-1.so.0
-        libaprutil-1.so.0
-        libatk-1.0.so
-        libdb-5.1.so
-        ${EXPAT_COPY}
-        libfreetype.so.6.6.2
-        libfreetype.so.6
-        libGLOD.so
-        libgmodule-2.0.so
-        libgobject-2.0.so
-        libhunspell-1.3.so.0.0.0
-        libopenal.so
-        libopenjpeg.so
-        libuuid.so.16
-        libuuid.so.16.0.22
-        libfontconfig.so.1.8.0
-        libfontconfig.so.1
-       )
+            ${EXPAT_COPY}
+            )
 
-    if (FMODSTUDIO)
-      set(debug_files ${debug_files} "libfmodL.so")
-      set(release_files ${release_files} "libfmod.so")
-    endif (FMODSTUDIO)
+    if (TARGET ll::fmodstudio)
+      list(APPEND debug_files libfmodL.so)
+      list(APPEND release_files libfmod.so)
+    endif ()
+
+    if(TARGET al::discord-gamesdk)
+      list(APPEND release_files libdiscord_game_sdk.so)
+    endif()
 
 else(WINDOWS)
     message(STATUS "WARNING: unrecognized platform for staging 3rd party libs, skipping...")
@@ -246,13 +220,16 @@ endif(WINDOWS)
 # 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.
-copy_if_different(
-    ${slvoice_src_dir}
-    "${SHARED_LIB_STAGING_DIR_RELEASE}"
-    out_targets
-    ${slvoice_files}
+
+if( slvoice_src_dir )
+    copy_if_different(
+            ${slvoice_src_dir}
+            "${SHARED_LIB_STAGING_DIR}"
+            out_targets
+            ${slvoice_files}
     )
-list(APPEND third_party_targets ${out_targets})
+    list(APPEND third_party_targets ${out_targets})
+endif()
 
 to_staging_dirs(
     ${vivox_lib_dir}
@@ -266,9 +243,7 @@ to_staging_dirs(
     ${release_files}
     )
 
-if(NOT USESYSTEMLIBS)
-  add_custom_target(
-      stage_third_party_libs ALL
-      DEPENDS ${third_party_targets}
-      )
-endif(NOT USESYSTEMLIBS)
+add_custom_target(
+        stage_third_party_libs ALL
+        DEPENDS ${third_party_targets}
+)

indra/cmake/CubemapToEquirectangularJS.cmake

+# -*- cmake -*-
+use_prebuilt_binary(cubemaptoequirectangular)
+
+# Main JS file
+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(Prebuilt)
+
+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)
+    add_library( al::discord-gamesdk INTERFACE IMPORTED )
+
+    use_prebuilt_binary(discord-gamesdk)
+    if (WINDOWS)
+      target_link_libraries( al::discord-gamesdk INTERFACE
+          ${ARCH_PREBUILT_DIRS_RELEASE}/discordgamesdk.lib
+          ${ARCH_PREBUILT_DIRS_RELEASE}/discord_game_sdk.dll.lib)
+    elseif (DARWIN)
+      target_link_libraries( al::discord-gamesdk INTERFACE
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libdiscordgamesdk.a
+          ${ARCH_PREBUILT_DIRS_RELEASE}/discord_game_sdk.dylib)
+    elseif (LINUX)
+      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 libexpatMT)
-        set(EXPAT_COPY libexpatMT.dll)
-    else (WINDOWS)
-        set(EXPAT_LIBRARIES expat)
-        if (DARWIN)
-            set(EXPAT_COPY libexpat.1.dylib libexpat.dylib)
-        else ()
-            set(EXPAT_COPY libexpat.so.1 libexpat.so)
-        endif ()
-    endif (WINDOWS)
-    set(EXPAT_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-endif (USESYSTEMLIBS)
+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 ()
+    target_link_libraries( ll::expat  INTERFACE
+            debug ${ARCH_PREBUILT_DIRS_DEBUG}/libexpat.a
+            optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libexpat.a)
+endif ()
+target_include_directories( ll::expat SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include )

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 -*-
 
-# FMODSTUDIO can be set when launching the make using the argument -DFMODSTUDIO: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.
 if (INSTALL_PROPRIETARY)
-  set(FMODSTUDIO ON CACHE BOOL "Using FMODSTUDIO sound library.")
+  set(USE_FMODSTUDIO ON CACHE BOOL "Using FMODSTUDIO sound library.")
 endif (INSTALL_PROPRIETARY)
 
-if (FMODSTUDIO)
+# 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)
+  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
-    set(FMODSTUDIO_LIBRARIES ${FMODSTUDIO_LIBRARY})
+
+    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)
@@ -18,21 +32,19 @@ if (FMODSTUDIO)
     include(Prebuilt)
     use_prebuilt_binary(fmodstudio)
     if (WINDOWS)
-      set(FMODSTUDIO_LIBRARY
-          debug fmodL_vc
-          optimized fmod_vc)
+      target_link_libraries( ll::fmodstudio INTERFACE
+            debug ${ARCH_PREBUILT_DIRS_DEBUG}/fmodL_vc.lib
+            optimized ${ARCH_PREBUILT_DIRS_RELEASE}/fmod_vc.lib)
     elseif (DARWIN)
       #despite files being called libfmod.dylib, we are searching for fmod
-      set(FMODSTUDIO_LIBRARY
-          debug fmodL
-          optimized fmod)
+      target_link_libraries( ll::fmodstudio INTERFACE  fmod)
     elseif (LINUX)
-      set(FMODSTUDIO_LIBRARY
-          debug fmodL
-          optimized fmod)
+      target_link_libraries( ll::fmodstudio INTERFACE  fmod)
     endif (WINDOWS)
-    set(FMODSTUDIO_LIBRARIES ${FMODSTUDIO_LIBRARY})
-    set(FMODSTUDIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/fmodstudio)
+
+    target_include_directories( ll::fmodstudio SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/fmodstudio)
   endif (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
-endif (FMODSTUDIO)
+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/FindBerkeleyDB.cmake

-# -*- cmake -*-
-
-# - Find BerkeleyDB
-# Find the BerkeleyDB includes and library
-# This module defines
-#  DB_INCLUDE_DIR, where to find db.h, etc.
-#  DB_LIBRARIES, the libraries needed to use BerkeleyDB.
-#  DB_FOUND, If false, do not try to use BerkeleyDB.
-# also defined, but not for general use are
-#  DB_LIBRARY, where to find the BerkeleyDB library.
-
-FIND_PATH(DB_INCLUDE_DIR db.h
-/usr/local/include/db4
-/usr/local/include
-/usr/include/db4
-/usr/include
-)
-
-SET(DB_NAMES ${DB_NAMES} db)
-FIND_LIBRARY(DB_LIBRARY
-  NAMES ${DB_NAMES}
-  PATHS /usr/lib /usr/local/lib
-  )
-
-IF (DB_LIBRARY AND DB_INCLUDE_DIR)
-    SET(DB_LIBRARIES ${DB_LIBRARY})
-    SET(DB_FOUND "YES")
-ELSE (DB_LIBRARY AND DB_INCLUDE_DIR)
-  SET(DB_FOUND "NO")
-ENDIF (DB_LIBRARY AND DB_INCLUDE_DIR)
-
-
-IF (DB_FOUND)
-   IF (NOT DB_FIND_QUIETLY)
-      MESSAGE(STATUS "Found BerkeleyDB: ${DB_LIBRARIES}")
-   ENDIF (NOT DB_FIND_QUIETLY)
-ELSE (DB_FOUND)
-   IF (DB_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find BerkeleyDB library")
-   ENDIF (DB_FIND_REQUIRED)
-ENDIF (DB_FOUND)
-
-# Deprecated declarations.
-SET (NATIVE_DB_INCLUDE_PATH ${DB_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_DB_LIB_PATH ${DB_LIBRARY} PATH)
-
-MARK_AS_ADVANCED(
-  DB_LIBRARY
-  DB_INCLUDE_DIR
-  )

indra/cmake/FindGLH.cmake

-# -*- cmake -*-
-
-# - Find GLH
-# Find the Graphic Library Helper includes.
-# This module defines
-#  GLH_INCLUDE_DIR, where to find glh/glh_linear.h.
-#  GLH_FOUND, If false, do not try to use GLH.
-
-find_path(GLH_INCLUDE_DIR glh/glh_linear.h
-    NO_SYSTEM_ENVIRONMENT_PATH
-    )
-
-if (GLH_INCLUDE_DIR)
-  set(GLH_FOUND "YES")
-else (GLH_INCLUDE_DIR)
-  set(GLH_FOUND "NO")
-endif (GLH_INCLUDE_DIR)
-
-if (GLH_FOUND)
-  if (NOT GLH_FIND_QUIETLY)
-    message(STATUS "Found GLH: ${GLH_INCLUDE_DIR}")
-    set(GLH_FIND_QUIETLY TRUE) # Only alert us the first time
-  endif (NOT GLH_FIND_QUIETLY)
-else (GLH_FOUND)
-  if (GLH_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find GLH")
-  endif (GLH_FIND_REQUIRED)
-endif (GLH_FOUND)
-
-mark_as_advanced(GLH_INCLUDE_DIR)

indra/cmake/FindGoogleBreakpad.cmake

-# -*- cmake -*-
-
-# - Find Google BreakPad
-# Find the Google BreakPad includes and library
-# This module defines
-#  BREAKPAD_EXCEPTION_HANDLER_INCLUDE_DIR, where to find exception_handler.h, etc.
-#  BREAKPAD_EXCEPTION_HANDLER_LIBRARIES, the libraries needed to use Google BreakPad.
-#  BREAKPAD_EXCEPTION_HANDLER_FOUND, If false, do not try to use Google BreakPad.
-# also defined, but not for general use are
-#  BREAKPAD_EXCEPTION_HANDLER_LIBRARY, where to find the Google BreakPad library.
-
-FIND_PATH(BREAKPAD_EXCEPTION_HANDLER_INCLUDE_DIR google_breakpad/exception_handler.h)
-
-SET(BREAKPAD_EXCEPTION_HANDLER_NAMES ${BREAKPAD_EXCEPTION_HANDLER_NAMES} breakpad_client)
-FIND_LIBRARY(BREAKPAD_EXCEPTION_HANDLER_LIBRARY
-  NAMES ${BREAKPAD_EXCEPTION_HANDLER_NAMES}
-  )
-
-IF (BREAKPAD_EXCEPTION_HANDLER_LIBRARY AND BREAKPAD_EXCEPTION_HANDLER_INCLUDE_DIR)
-    SET(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES ${BREAKPAD_EXCEPTION_HANDLER_LIBRARY})
-    SET(BREAKPAD_EXCEPTION_HANDLER_FOUND "YES")
-ELSE (BREAKPAD_EXCEPTION_HANDLER_LIBRARY AND BREAKPAD_EXCEPTION_HANDLER_INCLUDE_DIR)
-    SET(BREAKPAD_EXCEPTION_HANDLER_FOUND "NO")
-ENDIF (BREAKPAD_EXCEPTION_HANDLER_LIBRARY AND BREAKPAD_EXCEPTION_HANDLER_INCLUDE_DIR)
-
-
-IF (BREAKPAD_EXCEPTION_HANDLER_FOUND)
-   IF (NOT BREAKPAD_EXCEPTION_HANDLER_FIND_QUIETLY)
-      MESSAGE(STATUS "Found Google BreakPad: ${BREAKPAD_EXCEPTION_HANDLER_LIBRARIES}")
-   ENDIF (NOT BREAKPAD_EXCEPTION_HANDLER_FIND_QUIETLY)
-ELSE (BREAKPAD_EXCEPTION_HANDLER_FOUND)
-   IF (BREAKPAD_EXCEPTION_HANDLER_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find Google BreakPad library")
-   ENDIF (BREAKPAD_EXCEPTION_HANDLER_FIND_REQUIRED)
-ENDIF (BREAKPAD_EXCEPTION_HANDLER_FOUND)
-
-MARK_AS_ADVANCED(
-  BREAKPAD_EXCEPTION_HANDLER_LIBRARY
-  BREAKPAD_EXCEPTION_HANDLER_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/FindJsonCpp.cmake

-# -*- cmake -*-
-
-# - Find JSONCpp
-# Find the JSONCpp includes and library
-# This module defines
-#  JSONCPP_INCLUDE_DIR, where to find json.h, etc.
-#  JSONCPP_LIBRARIES, the libraries needed to use jsoncpp.
-#  JSONCPP_FOUND, If false, do not try to use jsoncpp.
-#  also defined, but not for general use are
-#  JSONCPP_LIBRARY, where to find the jsoncpp library.
-
-FIND_PATH(JSONCPP_INCLUDE_DIR jsoncpp/json.h
-/usr/local/include
-/usr/include
-)
-
-# Get the GCC compiler version
-EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
-            ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
-            OUTPUT_VARIABLE _gcc_COMPILER_VERSION
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-            )
-
-# Try to find a library that was compiled with the same compiler version as we currently use.
-SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so)
-IF (USESYSTEMLIBS)
-    # On standalone, assume that the system installed library was compiled with the used compiler.
-    SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so)
-ENDIF (USESYSTEMLIBS)
-FIND_LIBRARY(JSONCPP_LIBRARY
-  NAMES ${JSONCPP_NAMES}
-  PATHS /usr/lib /usr/local/lib
-  )
-
-IF (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR)
-    SET(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
-    SET(JSONCPP_FOUND "YES")
-ELSE (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR)
-  SET(JSONCPP_FOUND "NO")
-ENDIF (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR)
-
-
-IF (JSONCPP_FOUND)
-   IF (NOT JSONCPP_FIND_QUIETLY)
-      MESSAGE(STATUS "Found JSONCpp: ${JSONCPP_LIBRARIES}")
-   ENDIF (NOT JSONCPP_FIND_QUIETLY)
-ELSE (JSONCPP_FOUND)
-   IF (JSONCPP_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find JSONCpp library")
-   ENDIF (JSONCPP_FIND_REQUIRED)
-ENDIF (JSONCPP_FOUND)
-
-# Deprecated declarations.
-SET (NATIVE_JSONCPP_INCLUDE_PATH ${JSONCPP_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_JSONCPP_LIB_PATH ${JSONCPP_LIBRARY} PATH)
-
-MARK_AS_ADVANCED(
-  JSONCPP_LIBRARY
-  JSONCPP_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
-  )

indra/cmake/FindOpenJPEG.cmake

-# -*- cmake -*-
-
-# - Find OpenJPEG
-# Find the OpenJPEG includes and library
-# This module defines
-#  OPENJPEG_INCLUDE_DIR, where to find openjpeg.h, etc.
-#  OPENJPEG_LIBRARIES, the libraries needed to use OpenJPEG.
-#  OPENJPEG_FOUND, If false, do not try to use OpenJPEG.
-# also defined, but not for general use are
-#  OPENJPEG_LIBRARY, where to find the OpenJPEG library.
-
-FIND_PATH(OPENJPEG_INCLUDE_DIR openjpeg.h
-/usr/local/include/openjpeg
-/usr/local/include
-/usr/include/openjpeg
-/usr/include
-)
-
-SET(OPENJPEG_NAMES ${OPENJPEG_NAMES} openjpeg)
-FIND_LIBRARY(OPENJPEG_LIBRARY
-  NAMES ${OPENJPEG_NAMES}
-  PATHS /usr/lib /usr/local/lib
-  )
-
-IF (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR)
-    SET(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY})
-    SET(OPENJPEG_FOUND "YES")
-ELSE (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR)
-  SET(OPENJPEG_FOUND "NO")
-ENDIF (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR)
-
-
-IF (OPENJPEG_FOUND)
-   IF (NOT OPENJPEG_FIND_QUIETLY)
-      MESSAGE(STATUS "Found OpenJPEG: ${OPENJPEG_LIBRARIES}")
-   ENDIF (NOT OPENJPEG_FIND_QUIETLY)
-ELSE (OPENJPEG_FOUND)
-   IF (OPENJPEG_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find OpenJPEG library")
-   ENDIF (OPENJPEG_FIND_REQUIRED)
-ENDIF (OPENJPEG_FOUND)
-
-# Deprecated declarations.
-SET (NATIVE_OPENJPEG_INCLUDE_PATH ${OPENJPEG_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_OPENJPEG_LIB_PATH ${OPENJPEG_LIBRARY} PATH)
-
-MARK_AS_ADVANCED(
-  OPENJPEG_LIBRARY
-  OPENJPEG_INCLUDE_DIR
-  )