Merge pull request #344 from Hoikas/cmake

FindDirectX Improvements

cmake/FindDirectX.cmake

@@ -9,46 +9,46 @@ if(DirectX_INCLUDE_DIR)
     set(DirectX_FIND_QUIETLY TRUE)
 endif()
 
+# Figure out the arch for the path suffixes
+if(CMAKE_SIZEOF_VOID_P MATCHES "8")
+    set(_dxarch "x64")
+else()
+    set(_dxarch "x86")
+endif()
+
 
 find_path(DirectX_INCLUDE_DIR d3dx9.h
-          $ENV{DXSDK_DIR}/Include
+          PATHS "$ENV{DXSDK_DIR}/Include"
 )
 
 find_library(DirectX_d3d9 NAMES d3d9
-             PATHS $ENV{DXSDK_DIR}/Lib/x86
+             PATHS "$ENV{DXSDK_DIR}/Lib/${_dxarch}"
-             PATHS $ENV{DXSDK_DIR}/Lib/x64
 )
 
 find_library(DirectX_d3dx9 NAMES d3dx9
-             PATHS $ENV{DXSDK_DIR}/Lib/x86
+             PATHS "$ENV{DXSDK_DIR}/Lib/${_dxarch}"
-             PATHS $ENV{DXSDK_DIR}/Lib/x64
 )
 
 find_library(DirectX_dinput8 NAMES dinput8
-             PATHS $ENV{DXSDK_DIR}/Lib/x86
+             PATHS "$ENV{DXSDK_DIR}/Lib/${_dxarch}"
-             PATHS $ENV{DXSDK_DIR}/Lib/x64
 )
 
 find_library(DirectX_dsound NAMES dsound
-             PATHS $ENV{DXSDK_DIR}/Lib/x86
+             PATHS "$ENV{DXSDK_DIR}/Lib/${_dxarch}"
-             PATHS $ENV{DXSDK_DIR}/Lib/x64
 )
 
 find_library(DirectX_dxguid NAMES dxguid
-             PATHS $ENV{DXSDK_DIR}/Lib/x86
+             PATHS "$ENV{DXSDK_DIR}/Lib/${_dxarch}"
-             PATHS $ENV{DXSDK_DIR}/Lib/x64
 )
 
 if (DirectX_OLD_SDK)
     find_library(DirectX_dxerr NAMES dxerr9
-                 PATHS $ENV{DXSDK_DIR}/Lib/x86
+                 PATHS "$ENV{DXSDK_DIR}/Lib/${_dxarch}"
-                 PATHS $ENV{DXSDK_DIR}/Lib/x64
     )
 else()
-find_library(DirectX_dxerr NAMES DxErr
+    find_library(DirectX_dxerr NAMES DxErr
-             PATHS $ENV{DXSDK_DIR}/Lib/x86
+                 PATHS "$ENV{DXSDK_DIR}/Lib/${_dxarch}"
-             PATHS $ENV{DXSDK_DIR}/Lib/x64
+    )
-)
 endif(DirectX_OLD_SDK)
 
 set(DirectX_LIBRARIES