Remove DirectX.cmake. With recent SDKs (dating back to at least VS 2013

and the 8.1 SDK) DirectX is included in the SDK and does not need any
special detection logic.

4 files changed, 0 insertions, 39 deletions

diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 84e1c5d6fd..7864271c02 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -22,7 +22,6 @@ set(cmake_SOURCE_FILES
     Copy3rdPartyLibs.cmake
     DBusGlib.cmake
     DeploySharedLibs.cmake
-    DirectX.cmake
     DragDrop.cmake
     EXPAT.cmake
     FindAPR.cmake
diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake
deleted file mode 100644
index be9797b575..0000000000
--- a/indra/cmake/DirectX.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- cmake -*-
-
-if (WINDOWS)
-  find_path(DIRECTX_INCLUDE_DIR dxdiag.h)
-  if (DIRECTX_INCLUDE_DIR)
-    if (NOT DIRECTX_FIND_QUIETLY)
-      message(STATUS "Found DirectX include: ${DIRECTX_INCLUDE_DIR}")
-    endif (NOT DIRECTX_FIND_QUIETLY)
-  else (DIRECTX_INCLUDE_DIR)
-    message(FATAL_ERROR "Could not find DirectX SDK Include")
-  endif (DIRECTX_INCLUDE_DIR)
-
-  # dxhint isn't meant to be the hard-coded DIRECTX_LIBRARY_DIR, we're just
-  # suggesting it as a hint to find_library(). The Windows SDK version number
-  # is embedded in the DIRECTX_INCLUDE_DIR path string after Include and Lib,
-  # which is why we don't just append a relative path: if there are multiple
-  # versions installed on the host, we need to be sure we're using THE SAME
-  # version.
-  string(REPLACE "/Include/" "/Lib/" dxhint "${DIRECTX_INCLUDE_DIR}")
-  if (ADDRESS_SIZE EQUAL 32)
-    set(archdir x86)
-  else()
-    set(archdir x64)
-  endif()
-  string(APPEND dxhint "/${archdir}")
-  find_library(DXGUID_LIBRARY dxguid HINTS "${dxhint}")
-  get_filename_component(DIRECTX_LIBRARY_DIR "${DXGUID_LIBRARY}" DIRECTORY)
-  if (DIRECTX_LIBRARY_DIR)
-    if (NOT DIRECTX_FIND_QUIETLY)
-      message(STATUS "Found DirectX library: ${DIRECTX_LIBRARY_DIR}")
-    endif (NOT DIRECTX_FIND_QUIETLY)
-  else (DIRECTX_LIBRARY_DIR)
-    message(FATAL_ERROR "Could not find DirectX SDK Libraries")
-  endif (DIRECTX_LIBRARY_DIR)
-
-endif (WINDOWS)
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index 0743fd899f..5476dc324c 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -11,7 +11,6 @@
 project(llwindow)
 
 include(00-Common)
-include(DirectX)
 include(DragDrop)
 include(LLCommon)
 include(LLImage)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index a01e6ee4f6..6f21ec93cc 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -15,7 +15,6 @@ include(BuildPackagesInfo)
 include(BuildVersion)
 include(CMakeCopyIfDifferent)
 include(DBusGlib)
-include(DirectX)
 include(DragDrop)
 include(EXPAT)
 include(FMODEX)