Remove ELFIO

indra/cmake/00-Common.cmake

@@ -317,7 +317,6 @@ if (STANDALONE)
   add_definitions(-DLL_STANDALONE=1)
 else (STANDALONE)
   set(${ARCH}_linux_INCLUDES
-      ELFIO
       atk-1.0
       glib-2.0
       gstreamer-0.10

indra/cmake/CMakeLists.txt

@@ -25,7 +25,6 @@ set(cmake_SOURCE_FILES
     Cwdebug.cmake
     DBusGlib.cmake
     DeploySharedLibs.cmake
-    ELFIO.cmake
     EXPAT.cmake
     ExamplePlugin.cmake
     FMODSTUDIO.cmake
@@ -34,7 +33,6 @@ set(cmake_SOURCE_FILES
     FindBerkeleyDB.cmake
     FindCARes.cmake
     FindColladadom.cmake
-    FindELFIO.cmake
     FindGLOD.cmake
     FindGoogleBreakpad.cmake
     FindGooglePerfTools.cmake

indra/cmake/ELFIO.cmake

@@ -1,22 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-
-set(ELFIO_FIND_QUIETLY ON)
-
-if (STANDALONE)
-  include(FindELFIO)
-elseif (LINUX)
-  use_prebuilt_binary(elfio)
-  set(ELFIO_LIBRARIES ELFIO)
-  set(ELFIO_INCLUDE_DIR
-    ${LIBS_PREBUILT_DIR}/include
-    ${LIBS_PREBUILT_LEGACY_DIR}/include
-    )
-  set(ELFIO_FOUND "YES")
-endif (STANDALONE)
-
-if (ELFIO_FOUND)
-  add_definitions(-DLL_ELFBIN=1)
-else (ELFIO_FOUND)
-  set(ELFIO_INCLUDE_DIR "")
-endif (ELFIO_FOUND)

indra/cmake/FindELFIO.cmake

@@ -1,48 +0,0 @@
-# -*- cmake -*-
-
-# - Find ELFIO
-# Find the ELFIO includes and library
-# This module defines
-#  ELFIO_INCLUDE_DIR, where to find elfio.h, etc.
-#  ELFIO_LIBRARIES, the libraries needed to use ELFIO.
-#  ELFIO_FOUND, If false, do not try to use ELFIO.
-# also defined, but not for general use are
-#  ELFIO_LIBRARY, where to find the ELFIO library.
-
-FIND_PATH(ELFIO_INCLUDE_DIR ELFIO/ELFIO.h
-/usr/local/include
-/usr/include
-)
-
-SET(ELFIO_NAMES ${ELFIO_NAMES} ELFIO)
-FIND_LIBRARY(ELFIO_LIBRARY
-  NAMES ${ELFIO_NAMES}
-  PATHS /usr/lib /usr/local/lib
-  )
-
-IF (ELFIO_LIBRARY AND ELFIO_INCLUDE_DIR)
-    SET(ELFIO_LIBRARIES ${ELFIO_LIBRARY})
-    SET(ELFIO_FOUND "YES")
-ELSE (ELFIO_LIBRARY AND ELFIO_INCLUDE_DIR)
-  SET(ELFIO_FOUND "NO")
-ENDIF (ELFIO_LIBRARY AND ELFIO_INCLUDE_DIR)
-
-
-IF (ELFIO_FOUND)
-   IF (NOT ELFIO_FIND_QUIETLY)
-      MESSAGE(STATUS "Found ELFIO: ${ELFIO_LIBRARIES}")
-   ENDIF (NOT ELFIO_FIND_QUIETLY)
-ELSE (ELFIO_FOUND)
-   IF (ELFIO_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find ELFIO library")
-   ENDIF (ELFIO_FIND_REQUIRED)
-ENDIF (ELFIO_FOUND)
-
-# Deprecated declarations.
-SET (NATIVE_ELFIO_INCLUDE_PATH ${ELFIO_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_ELFIO_LIB_PATH ${ELFIO_LIBRARY} PATH)
-
-MARK_AS_ADVANCED(
-  ELFIO_LIBRARY
-  ELFIO_INCLUDE_DIR
-  )

indra/newview/CMakeLists.txt

@@ -8,7 +8,6 @@ include(BuildPackagesInfo)
 include(BuildVersion)
 include(CMakeCopyIfDifferent)
 include(DBusGlib)
-include(ELFIO)
 include(FMODSTUDIO)
 include(GLOD)
 include(FindOpenGL)
@@ -53,7 +52,6 @@ include_directories(
     ${STATEMACHINE_INCLUDE_DIRS}
     ${DBUSGLIB_INCLUDE_DIRS}
     ${HUNSPELL_INCLUDE_DIR}
-    ${ELFIO_INCLUDE_DIR}
     ${JSONCPP_INCLUDE_DIR}
     ${GLOD_INCLUDE_DIRS}
     ${LLAUDIO_INCLUDE_DIRS}
@@ -1656,7 +1654,6 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${UI_LIBRARIES}
     ${WINDOWS_LIBRARIES}
     ${XMLRPCEPI_LIBRARIES}
-    ${ELFIO_LIBRARIES}
     ${HUNSPELL_LIBRARY}
     ${LLPHYSICSEXTENSIONS_LIBRARIES}
     ${LLAPPEARANCE_LIBRARIES}

indra/newview/viewer_manifest.py

@@ -1002,7 +1002,6 @@ class Linux_i686_Manifest(LinuxManifest):
 
             self.path("libcollada14dom.so.2.2", "libcollada14dom.so")
             self.path("libcrypto.so*")
-            self.path("libELFIO.so")
             self.path("libssl.so*")
             self.path("libtcmalloc_minimal.so.0")
             self.path("libtcmalloc_minimal.so.0.2.2")
@@ -1058,7 +1057,6 @@ class Linux_x86_64_Manifest(LinuxManifest):
 
             self.path("libcollada14dom.so.2.2", "libcollada14dom.so")
             self.path("libcrypto.so.*")
-            self.path("libELFIO.so")
             self.path("libjpeg.so*")
             self.path("libpng*.so*")
             self.path("libz.so*")