svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers

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/FindMySQL.cmake

+# -*- cmake -*-
+
+# - Find MySQL
+# Find the MySQL includes and library
+# This module defines
+#  MYSQL_INCLUDE_DIR, where to find mysql.h, etc.
+#  MYSQL_LIBRARIES, the libraries needed to use Mysql.
+#  MYSQL_FOUND, If false, do not try to use Mysql.
+# also defined, but not for general use are
+#  MYSQL_LIBRARY, where to find the Mysql library.
+
+FIND_PATH(MYSQL_INCLUDE_DIR mysql/mysql.h
+/usr/local/include
+/usr/include
+)
+
+SET(MYSQL_NAMES ${MYSQL_NAMES} mysqlclient)
+FIND_LIBRARY(MYSQL_LIBRARY
+  NAMES ${MYSQL_NAMES}
+  PATHS /usr/lib/mysql /usr/lib /usr/local/lib/mysql /usr/local/lib
+  )
+
+IF (MYSQL_LIBRARY AND MYSQL_INCLUDE_DIR)
+    SET(MYSQL_LIBRARIES ${MYSQL_LIBRARY})
+    SET(MYSQL_FOUND "YES")
+ELSE (MYSQL_LIBRARY AND MYSQL_INCLUDE_DIR)
+  SET(MYSQL_FOUND "NO")
+ENDIF (MYSQL_LIBRARY AND MYSQL_INCLUDE_DIR)
+
+
+IF (MYSQL_FOUND)
+   IF (NOT MYSQL_FIND_QUIETLY)
+      MESSAGE(STATUS "Found MySQL: ${MYSQL_LIBRARIES}")
+   ENDIF (NOT MYSQL_FIND_QUIETLY)
+ELSE (MYSQL_FOUND)
+   IF (MYSQL_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find MySQL library")
+   ENDIF (MYSQL_FIND_REQUIRED)
+ENDIF (MYSQL_FOUND)
+
+# Deprecated declarations.
+SET (NATIVE_MYSQL_INCLUDE_PATH ${MYSQL_INCLUDE_DIR} )
+GET_FILENAME_COMPONENT (NATIVE_MYSQL_LIB_PATH ${MYSQL_LIBRARY} PATH)
+
+MARK_AS_ADVANCED(
+  MYSQL_LIBRARY
+  MYSQL_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
+  )

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/FreeType.cmake

+# -*- cmake -*-
+
+if (STANDALONE)
+  include(FindPkgConfig)
+
+  pkg_check_modules(FREETYPE REQUIRED freetype2)
+else (STANDALONE)
+  if (LINUX)
+    set(FREETYPE_INCLUDE_DIRS
+        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  else (LINUX)
+    set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+  endif (LINUX)
+
+  set(FREETYPE_LIBRARIES freetype)
+endif (STANDALONE)
+
+link_directories(${FREETYPE_LIBRARY_DIRS})

indra/cmake/GooglePerfTools.cmake

+# -*- cmake -*-
+
+if (STANDALONE)
+  include(FindGooglePerfTools)
+else (STANDALONE)
+  if (LINUX)
+    set(TCMALLOC_LIBRARIES tcmalloc)
+    set(STACKTRACE_LIBRARIES stacktrace)
+    set(PROFILER_LIBRARIES profiler)
+    set(GOOGLE_PERFTOOLS_INCLUDE_DIR
+        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+    set(GOOGLE_PERFTOOLS_FOUND "YES")
+  endif (LINUX)
+endif (STANDALONE)
+
+if (GOOGLE_PERFTOOLS_FOUND)
+  set(USE_GOOGLE_PERFTOOLS ON CACHE BOOL "Build with Google PerfTools support.")
+endif (GOOGLE_PERFTOOLS_FOUND)
+
+if (USE_GOOGLE_PERFTOOLS)
+  set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1)
+  include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR})
+  set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES} ${STACKTRACE_LIBRARIES})
+else (USE_GOOGLE_PERFTOOLS)
+  set(TCMALLOC_FLAG -ULL_USE_TCMALLOC)
+endif (USE_GOOGLE_PERFTOOLS)

indra/cmake/JPEG.cmake

+# -*- cmake -*-
+
+include(Linking)
+set(JPEG_FIND_QUIETLY ON)
+set(JPEG_FIND_REQUIRED ON)
+
+if (STANDALONE)
+  include(FindJPEG)
+else (STANDALONE)
+  if (LINUX)
+    set(JPEG_LIBRARIES jpeg)
+  elseif (DARWIN)
+    set(JPEG_LIBRARIES
+      lljpeg
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/lljpeg
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/lljpeg
+      )
+  elseif (WINDOWS)
+    set(JPEG_LIBRARIES jpeglib_6b)
+  endif (LINUX)
+  set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+endif (STANDALONE)

indra/cmake/LLAudio.cmake

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

indra/cmake/LLCharacter.cmake

+# -*- cmake -*-
+
+set(LLCHARACTER_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llcharacter
+    )
+
+set(LLCHARACTER_LIBRARIES
+    llcharacter
+    )

indra/cmake/LLCommon.cmake

+# -*- cmake -*-
+
+include(APR)
+include(Boost)
+include(EXPAT)
+include(ZLIB)
+
+set(LLCOMMON_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llcommon
+    ${APRUTIL_INCLUDE_DIR}
+    ${APR_INCLUDE_DIR}
+    ${Boost_INCLUDE_DIRS}
+    )
+
+set(LLCOMMON_LIBRARIES
+    llcommon
+    ${APRUTIL_LIBRARIES}
+    ${APR_LIBRARIES}
+    ${EXPAT_LIBRARIES}
+    ${ZLIB_LIBRARIES}
+    )

indra/cmake/LLCrashLogger.cmake

+# -*- cmake -*-
+
+set(LLCRASHLOGGER_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llcrashlogger
+    )
+
+set(LLCRASHLOGGER_LIBRARIES
+    llcrashlogger
+    )

indra/cmake/LLDatabase.cmake

+# -*- cmake -*-
+
+include(MySQL)
+
+set(LLDATABASE_INCLUDE_DIRS
+    ${LIBS_SERVER_DIR}/lldatabase
+    ${MYSQL_INCLUDE_DIR}
+    )
+
+set(LLDATABASE_LIBRARIES
+    lldatabase
+    ${MYSQL_LIBRARIES}
+    )

indra/cmake/LLImage.cmake

+# -*- cmake -*-
+
+include(JPEG)
+include(PNG)
+
+set(LLIMAGE_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llimage
+    ${JPEG_INCLUDE_DIRS}
+    )
+
+set(LLIMAGE_LIBRARIES
+    llimage
+    ${JPEG_LIBRARIES}
+    ${PNG_LIBRARIES}
+    )

indra/cmake/LLImageJ2COJ.cmake

+# -*- cmake -*-
+
+include(OpenJPEG)
+
+set(LLIMAGEJ2COJ_LIBRARIES
+    llimagej2coj
+    ${OPENJPEG_LIBRARIES}
+    )

indra/cmake/LLInventory.cmake

+# -*- cmake -*-
+
+set(LLINVENTORY_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llinventory
+    )
+
+set(LLINVENTORY_LIBRARIES
+    llinventory
+    )

indra/cmake/LLKDU.cmake

+# -*- cmake -*-
+
+if (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)
+  if (WINDOWS)
+    set(KDU_LIBRARY debug kdu_cored optimized kdu_core)
+  elseif (LINUX)
+    set(KDU_LIBRARY kdu_v42R)
+  else (WINDOWS)
+    set(KDU_LIBRARY kdu)
+  endif (WINDOWS)
+
+  set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
+
+  set(LLKDU_LIBRARY llkdu)
+  set(LLKDU_STATIC_LIBRARY llkdu_static)
+  set(LLKDU_LIBRARIES ${LLKDU_LIBRARY})
+  set(LLKDU_STATIC_LIBRARIES ${LLKDU_STATIC_LIBRARY})
+endif (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)

indra/cmake/LLMath.cmake

+# -*- cmake -*-
+
+set(LLMATH_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llmath
+    )
+
+set(LLMATH_LIBRARIES
+    llmath
+    )

indra/cmake/LLMessage.cmake

+# -*- cmake -*-
+
+include(CARes)
+include(CURL)
+include(OpenSSL)
+include(XmlRpcEpi)
+
+set(LLMESSAGE_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llmessage
+    ${CARES_INCLUDE_DIRS}
+    ${CURL_INCLUDE_DIRS}
+    ${OPENSSL_INCLUDE_DIRS}
+    )
+
+set(LLMESSAGE_LIBRARIES
+    llmessage
+    ${CURL_LIBRARIES}
+    ${CARES_LIBRARIES}
+    ${OPENSSL_LIBRARIES}
+    ${CRYPTO_LIBRARIES}
+    ${XMLRPCEPI_LIBRARIES}
+    )

indra/cmake/LLPrimitive.cmake

+# -*- cmake -*-
+
+set(LLPRIMITIVE_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llprimitive
+    )
+
+set(LLPRIMITIVE_LIBRARIES
+    llprimitive
+    )

indra/cmake/LLRender.cmake

+# -*- cmake -*-
+
+include(FreeType)
+
+set(LLRENDER_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llrender
+    )
+
+set(LLRENDER_LIBRARIES
+    llrender
+    )