Attachment 128492 Details for Bug 79344 – Patch

[patch] Patch

bug-79344-20120223191400.patch (text/plain), 2.19 KB, created by Patrick R. Gansterer on 2012-02-23 10:13:55 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Patrick R. Gansterer

Created: 2012-02-23 10:13:55 PST

Size: 2.19 KB

patch

obsolete

>Subversion Revision: 108636
>diff --git a/Source/cmake/FindDirectX.cmake b/Source/cmake/FindDirectX.cmake
>new file mode 100644
>index 0000000000000000000000000000000000000000..4eef8eb704068525b5156c63efb1d6b12d54b71c
>--- /dev/null
>+++ b/Source/cmake/FindDirectX.cmake
>@@ -0,0 +1,30 @@
>+# - Find DirectX SDK installation
>+# Find the DirectX includes and library
>+# This module defines
>+#  DirectX_INCLUDE_DIRS, where to find d3d9.h, etc.
>+#  DirectX_LIBRARIES, libraries to link against to use DirectX.
>+#  DirectX_FOUND, If false, do not try to use DirectX.
>+#  DirectX_ROOT_DIR, directory where DirectX was installed.
>+
>+FIND_PATH(DirectX_INCLUDE_DIRS d3d9.h PATHS
>+    "$ENV{DXSDK_DIR}/Include"
>+    "C:/Program Files (x86)/Microsoft DirectX SDK*/Include"
>+    "C:/Program Files/Microsoft DirectX SDK*/Include"
>+)
>+
>+GET_FILENAME_COMPONENT(DirectX_ROOT_DIR "${DirectX_INCLUDE_DIRS}/.." ABSOLUTE)
>+
>+IF (CMAKE_CL_64)
>+    SET(DirectX_LIBRARY_PATHS "${DirectX_ROOT_DIR}/Lib/x64")
>+ELSE ()
>+    SET(DirectX_LIBRARY_PATHS "${DirectX_ROOT_DIR}/Lib/x86" "${DirectX_ROOT_DIR}/Lib")
>+ENDIF ()
>+
>+FIND_LIBRARY(DirectX_D3D9_LIBRARY d3d9 ${DirectX_LIBRARY_PATHS} NO_DEFAULT_PATH)
>+FIND_LIBRARY(DirectX_D3DX9_LIBRARY d3dx9 ${DirectX_LIBRARY_PATHS} NO_DEFAULT_PATH)
>+SET(DirectX_LIBRARIES ${DirectX_D3D9_LIBRARY} ${DirectX_D3DX9_LIBRARY})
>+
>+# handle the QUIETLY and REQUIRED arguments and set DirectX_FOUND to TRUE if all listed variables are TRUE
>+INCLUDE(FindPackageHandleStandardArgs)
>+FIND_PACKAGE_HANDLE_STANDARD_ARGS(DirectX DEFAULT_MSG DirectX_ROOT_DIR DirectX_LIBRARIES DirectX_INCLUDE_DIRS)
>+MARK_AS_ADVANCED(DirectX_INCLUDE_DIRS DirectX_D3D9_LIBRARY DirectX_D3DX9_LIBRARY)
>diff --git a/ChangeLog b/ChangeLog
>index 6ff63d57d3e7e4dfc45efcd0ca2b09631f07d7d1..e01e6356ea611e2f6349e857ef714ab9fb1d0982 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,12 @@
>+2012-02-23  Patrick Gansterer  <paroga@webkit.org>
>+
>+        [CMake] Add FindDirectX
>+        https://bugs.webkit.org/show_bug.cgi?id=79344
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/cmake/FindDirectX.cmake: Added.
>+
> 2012-02-22  Raphael Kubo da Costa  <kubo@profusion.mobi>
> 
>         [CMake] Remove FindGDK.cmake and FindGDK-PixBuf.cmake

Flags:

aroben: review+
aroben: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 79344: 128427 | 128492