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
-include/openjpeg
-)
-
-SET(OPENJPEG_NAMES ${OPENJPEG_NAMES} openjp2)
-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
-  )

indra/cmake/FindURIPARSER.cmake

-# -*- cmake -*-
-
-# - Find uriparser
-# Find the URIPARSER includes and library
-# This module defines
-#  URIPARSER_INCLUDE_DIRS, where to find uriparser.h, etc.
-#  URIPARSER_LIBRARIES, the libraries needed to use uriparser.
-#  URIPARSER_FOUND, If false, do not try to use uriparser.
-#
-# This FindURIPARSER is about 43 times as fast the one provided with cmake (2.8.x),
-# because it doesn't look up the version of uriparser, resulting in a dramatic
-# speed up for configure (from 4 minutes 22 seconds to 6 seconds).
-#
-# Note: Since this file is only used for standalone, the windows
-# specific parts were left out.
-
-FIND_PATH(URIPARSER_INCLUDE_DIR uriparser/uri.h
-  NO_SYSTEM_ENVIRONMENT_PATH
-  )
-
-FIND_LIBRARY(URIPARSER_LIBRARY uriparser)
-
-if (URIPARSER_LIBRARY AND URIPARSER_INCLUDE_DIR)
-  SET(URIPARSER_INCLUDE_DIRS ${URIPARSER_INCLUDE_DIR})
-  SET(URIPARSER_LIBRARIES ${URIPARSER_LIBRARY})
-  SET(URIPARSER_FOUND "YES")
-else (URIPARSER_LIBRARY AND URIPARSER_INCLUDE_DIR)
-  SET(URIPARSER_FOUND "NO")
-endif (URIPARSER_LIBRARY AND URIPARSER_INCLUDE_DIR)
-
-if (URIPARSER_FOUND)
-  if (NOT URIPARSER_FIND_QUIETLY)
-    message(STATUS "Found URIPARSER: ${URIPARSER_LIBRARIES}")
-    SET(URIPARSER_FIND_QUIETLY TRUE)
-  endif (NOT URIPARSER_FIND_QUIETLY)
-else (URIPARSER_FOUND)
-  if (URIPARSER_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find URIPARSER library")
-  endif (URIPARSER_FIND_REQUIRED)
-endif (URIPARSER_FOUND)
-
-mark_as_advanced(
-  URIPARSER_LIBRARY
-  URIPARSER_INCLUDE_DIR
-  )
-

indra/cmake/FindXmlRpcEpi.cmake

-# -*- cmake -*-
-
-# - Find XMLRPC-EPI
-# Find the XMLRPC-EPI includes and library
-# This module defines
-#  XMLRPCEPI_INCLUDE_DIR, where to find jpeglib.h, etc.
-#  XMLRPCEPI_LIBRARIES, the libraries needed to use XMLRPC-EPI.
-#  XMLRPCEPI_FOUND, If false, do not try to use XMLRPC-EPI.
-# also defined, but not for general use are
-#  XMLRPCEPI_LIBRARY, where to find the XMLRPC-EPI library.
-
-FIND_PATH(XMLRPCEPI_INCLUDE_DIR xmlrpc-epi/xmlrpc.h
-/usr/local/include
-/usr/include
-)
-
-SET(XMLRPCEPI_NAMES ${XMLRPCEPI_NAMES} xmlrpc-epi)
-FIND_LIBRARY(XMLRPCEPI_LIBRARY
-  NAMES ${XMLRPCEPI_NAMES}
-  PATHS /usr/lib /usr/local/lib
-  )
-
-IF (XMLRPCEPI_LIBRARY AND XMLRPCEPI_INCLUDE_DIR)
-    SET(XMLRPCEPI_LIBRARIES ${XMLRPCEPI_LIBRARY})
-    SET(XMLRPCEPI_FOUND "YES")
-ELSE (XMLRPCEPI_LIBRARY AND XMLRPCEPI_INCLUDE_DIR)
-  SET(XMLRPCEPI_FOUND "NO")
-ENDIF (XMLRPCEPI_LIBRARY AND XMLRPCEPI_INCLUDE_DIR)
-
-
-IF (XMLRPCEPI_FOUND)
-   IF (NOT XMLRPCEPI_FIND_QUIETLY)
-      MESSAGE(STATUS "Found XMLRPC-EPI: ${XMLRPCEPI_LIBRARIES}")
-   ENDIF (NOT XMLRPCEPI_FIND_QUIETLY)
-ELSE (XMLRPCEPI_FOUND)
-   IF (XMLRPCEPI_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find XMLRPC-EPI library")
-   ENDIF (XMLRPCEPI_FIND_REQUIRED)
-ENDIF (XMLRPCEPI_FOUND)
-
-# Deprecated declarations.
-SET (NATIVE_XMLRPCEPI_INCLUDE_PATH ${XMLRPCEPI_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_XMLRPCEPI_LIB_PATH ${XMLRPCEPI_LIBRARY} PATH)
-
-MARK_AS_ADVANCED(
-  XMLRPCEPI_LIBRARY
-  XMLRPCEPI_INCLUDE_DIR
-  )

indra/cmake/FindZLIBNG.cmake

-# -*- cmake -*-
-
-# - Find zlib-ng
-# Find the ZLIB includes and library
-# This module defines
-#  ZLIBNG_INCLUDE_DIRS, where to find zlib.h, etc.
-#  ZLIBNG_LIBRARIES, the libraries needed to use zlib.
-#  ZLIBNG_FOUND, If false, do not try to use zlib.
-#
-# This FindZLIBNG is about 43 times as fast the one provided with cmake (2.8.x),
-# because it doesn't look up the version of zlib, resulting in a dramatic
-# speed up for configure (from 4 minutes 22 seconds to 6 seconds).
-#
-# Note: Since this file is only used for standalone, the windows
-# specific parts were left out.
-
-FIND_PATH(ZLIBNG_INCLUDE_DIR zlib.h
-  NO_SYSTEM_ENVIRONMENT_PATH
-  )
-
-FIND_LIBRARY(ZLIBNG_LIBRARY z)
-
-if (ZLIBNG_LIBRARY AND ZLIBNG_INCLUDE_DIR)
-  SET(ZLIBNG_INCLUDE_DIRS ${ZLIBNG_INCLUDE_DIR})
-  SET(ZLIBNG_LIBRARIES ${ZLIBNG_LIBRARY})
-  SET(ZLIBNG_FOUND "YES")
-else (ZLIBNG_LIBRARY AND ZLIBNG_INCLUDE_DIR)
-  SET(ZLIBNG_FOUND "NO")
-endif (ZLINGB_LIBRARY AND ZLIBNG_INCLUDE_DIR)
-
-if (ZLIBNG_FOUND)
-  if (NOT ZLIBNG_FIND_QUIETLY)
-    message(STATUS "Found ZLIBNG: ${ZLIBNG_LIBRARIES}")
-    SET(ZLIBNG_FIND_QUIETLY TRUE)
-  endif (NOT ZLIBNG_FIND_QUIETLY)
-else (ZLIBNG_FOUND)
-  if (ZLIBNG_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find ZLIBNG library")
-  endif (ZLIBNG_FIND_REQUIRED)
-endif (ZLIBNG_FOUND)
-
-mark_as_advanced(
-  ZLIBNG_LIBRARY
-  ZLIBNG_INCLUDE_DIR
-  )
-

indra/cmake/Fonts.cmake

-# -*- cmake -*-
-include(Prebuilt)
-
-use_prebuilt_binary(fonts)

indra/cmake/FreeType.cmake

 # -*- cmake -*-
 include(Prebuilt)
 
-if (LINUX OR USESYSTEMLIBS)
-  include(FindPkgConfig)
+include_guard()
 
-  pkg_check_modules(FREETYPE REQUIRED freetype2)
-  pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
-else ()
-  use_prebuilt_binary(freetype)
-  set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/freetype2)
-  if (WINDOWS)
-    set(FREETYPE_LIBRARIES
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/freetyped.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/freetype.lib)
-  else()
-    set(FREETYPE_LIBRARIES freetype)
-  endif()
-endif ()
+option(USE_SYSTEM_FREETYPE "Enable usage of the AVX2 instruction set" OFF)
+
+add_library( ll::freetype INTERFACE IMPORTED )
+
+if(NOT USE_SYSTEM_FREETYPE)
+    use_system_binary(freetype)
+    use_prebuilt_binary(freetype)
+    target_include_directories( ll::freetype SYSTEM INTERFACE  ${LIBS_PREBUILT_DIR}/include/freetype2/)
+    if (WINDOWS)
+        target_link_libraries( ll::freetype INTERFACE
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/freetyped.lib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/freetype.lib
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/harfbuzz.lib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/harfbuzz.lib)
+    elseif (LINUX)
+        target_link_libraries( ll::freetype INTERFACE
+        ${ARCH_PREBUILT_DIRS}/libfreetype.a
+        ${ARCH_PREBUILT_DIRS}/libharfbuzz.a)
+    else()
+        target_link_libraries( ll::freetype INTERFACE
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libfreetyped.a
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libfreetype.a
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libharfbuzz.a
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libharfbuzz.a)
+    endif()
+endif()
+
+if(LINUX)
+    include(FindPkgConfig)
+
+    if (USE_SYSTEM_FREETYPE)
+        pkg_check_modules(freetype2 REQUIRED IMPORTED_TARGET freetype2)
+        target_link_libraries( ll::freetype INTERFACE PkgConfig::freetype2)
+    endif()
+
+    pkg_check_modules(fontconfig REQUIRED IMPORTED_TARGET fontconfig)
+    target_link_libraries( ll::freetype INTERFACE PkgConfig::fontconfig)
+endif()

indra/cmake/GLEXT.cmake

 # -*- cmake -*-
 include(Prebuilt)
+include(GLH)
+include(GLM)
 include(SDL2)
 
-if (NOT USESYSTEMLIBS AND NOT SDL_FOUND)
-  if (WINDOWS OR LINUX)
-    use_prebuilt_binary(glext)
-  endif (WINDOWS OR LINUX)
-  use_prebuilt_binary(glh_linear)
-  set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
-endif ()
+add_library( ll::glext INTERFACE IMPORTED )
+if(NOT SDL_FOUND)
+  use_system_binary(glext)
+  use_prebuilt_binary(glext)
+endif()
+

indra/cmake/GLH.cmake

+# -*- cmake -*-
+include(Prebuilt)
+
+add_library( ll::glh_linear INTERFACE IMPORTED )
+
+use_system_binary( glh_linear )
+use_prebuilt_binary(glh_linear)

indra/cmake/GLM.cmake

+# -*- cmake -*-
+include(Prebuilt)
+
+add_library( ll::glm INTERFACE IMPORTED )
+
+use_system_binary(glm)
+use_prebuilt_binary(glm)

indra/cmake/GStreamer010Plugin.cmake

 # -*- cmake -*-
 include(Prebuilt)
-include(LibXML2)
+if (NOT LINUX)
+  return()
+endif()
 
-if (USESYSTEMLIBS)
-  include(FindPkgConfig)
+add_library( ll::gstreamer INTERFACE IMPORTED )
+target_compile_definitions( ll::gstreamer INTERFACE LL_GSTREAMER010_ENABLED=1)
+use_system_binary(gstreamer)
 
-  pkg_check_modules(GSTREAMER010 REQUIRED gstreamer-0.10)
-  pkg_check_modules(GSTREAMER010_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10)
-elseif (LINUX)
-  use_prebuilt_binary(gstreamer)
-
-  set(GSTREAMER010_FOUND ON FORCE BOOL)
-  set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL)
-  set(GSTREAMER010_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/include/gstreamer-0.10
-      ${LIBS_PREBUILT_DIR}/include/glib-2.0
-      ${LIBXML2_INCLUDE_DIRS}
-      )
-  # We don't need to explicitly link against gstreamer itself, because
-  # LLMediaImplGStreamer probes for the system's copy at runtime.
-  set(GSTREAMER010_LIBRARIES
-      gobject-2.0
-      gmodule-2.0
-      dl
-      gthread-2.0
-      glib-2.0
-      )
-endif ()
-
-if (GSTREAMER010_FOUND AND GSTREAMER010_PLUGINS_BASE_FOUND)
-  set(GSTREAMER010 ON CACHE BOOL "Build with GStreamer-0.10 streaming media support.")
-endif (GSTREAMER010_FOUND AND GSTREAMER010_PLUGINS_BASE_FOUND)
-
-if (GSTREAMER010)
-  add_definitions(-DLL_GSTREAMER010_ENABLED=1)
-endif (GSTREAMER010)
+use_prebuilt_binary(gstreamer)
 

indra/cmake/Hunspell.cmake

@@ -2,31 +2,27 @@
 include(Linking)
 include(Prebuilt)
 
-set(HUNSPELL_FIND_QUIETLY ON)
-set(HUNSPELL_FIND_REQUIRED ON)
+include_guard()
+use_prebuilt_binary(dictionaries)
 
-if (USESYSTEMLIBS)
-  include(FindHUNSPELL)
-else (USESYSTEMLIBS)
-  use_prebuilt_binary(libhunspell)
-  if (WINDOWS)
-    set(HUNSPELL_LIBRARY 
+add_library( ll::hunspell INTERFACE IMPORTED )
+use_system_binary(hunspell)
+use_prebuilt_binary(libhunspell)
+if (WINDOWS)
+    target_compile_definitions( ll::hunspell INTERFACE HUNSPELL_STATIC=1)
+    target_link_libraries( ll::hunspell INTERFACE
         debug ${ARCH_PREBUILT_DIRS_DEBUG}/libhunspell.lib
         optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libhunspell.lib
         )
-  elseif(DARWIN)
-    set(HUNSPELL_LIBRARY 
+elseif(DARWIN)
+    target_link_libraries( ll::hunspell INTERFACE
         debug ${ARCH_PREBUILT_DIRS_DEBUG}/libhunspell-1.7.a
         optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libhunspell-1.7.a
         )
-  elseif(LINUX)
-    set(HUNSPELL_LIBRARY 
+elseif(LINUX)
+    target_link_libraries( ll::hunspell INTERFACE
         debug ${ARCH_PREBUILT_DIRS_DEBUG}/libhunspell-1.7.a
         optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libhunspell-1.7.a
         )
-  else()
-    message(FATAL_ERROR "Invalid platform")
-  endif()
-  set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell)
-  use_prebuilt_binary(dictionaries)
-endif (USESYSTEMLIBS)
+endif()
+target_include_directories( ll::hunspell SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/hunspell)

indra/cmake/JPEG.cmake

@@ -2,21 +2,19 @@
 include(Prebuilt)
 
 include(Linking)
-set(JPEG_FIND_QUIETLY ON)
-set(JPEG_FIND_REQUIRED ON)
 
-if (USESYSTEMLIBS)
-  include(FindJPEG)
-else (USESYSTEMLIBS)
-  use_prebuilt_binary(libjpeg-turbo)
-  if (LINUX)
-    set(JPEG_LIBRARIES jpeg)
-  elseif (DARWIN)
-    set(JPEG_LIBRARIES jpeg)
-  elseif (WINDOWS)
-    set(JPEG_LIBRARIES
+include_guard()
+add_library( ll::libjpeg INTERFACE IMPORTED )
+
+use_system_binary(libjpeg)
+use_prebuilt_binary(libjpeg-turbo)
+if (LINUX)
+  target_link_libraries( ll::libjpeg INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a)
+elseif (DARWIN)
+  target_link_libraries( ll::libjpeg INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a)
+elseif (WINDOWS)
+    target_link_libraries( ll::libjpeg INTERFACE
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/jpeg.lib
       optimized ${ARCH_PREBUILT_DIRS_RELEASE}/jpeg.lib)
-  endif (LINUX)
-  set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-endif (USESYSTEMLIBS)
+endif (LINUX)
+target_include_directories( ll::libjpeg SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)

indra/cmake/JPEGEncoderBasic.cmake

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

indra/cmake/LLAppearance.cmake

@@ -2,26 +2,9 @@
 
 include(Variables)
 include(Boost)
-include(LLMessage)
 include(LLCoreHttp)
 
-set(LLAPPEARANCE_INCLUDE_DIRS
-    ${LIBS_OPEN_DIR}/llappearance
-    )
 
-if (BUILD_HEADLESS)
-  set(LLAPPEARANCE_HEADLESS_LIBRARIES
-    llappearanceheadless
-    )
-endif (BUILD_HEADLESS)
-
-set(LLAPPEARANCE_LIBRARIES llappearance
-    llmessage
-    llcorehttp
-    ${BOOST_FIBER_LIBRARY}
-    ${BOOST_CONTEXT_LIBRARY}
-    ${BOOST_SYSTEM_LIBRARY}
-    )
 
 
 

indra/cmake/LLAudio.cmake

 # -*- cmake -*-
 
 include(Audio)
-
-set(LLAUDIO_INCLUDE_DIRS
-    ${LIBS_OPEN_DIR}/llaudio
-    )
-
-# be exhaustive here
-set(LLAUDIO_LIBRARIES llaudio ${VORBISENC_LIBRARIES} ${VORBISFILE_LIBRARIES} ${VORBIS_LIBRARIES} ${OGG_LIBRARIES} ${OPENAL_LIBRARIES})