Fixed: DirectX SDK 64bits directory

This commit is contained in:
kervala 2010-09-25 17:10:32 +02:00
parent c5bf133d4f
commit aa930a40cd

View file

@ -5,27 +5,37 @@
# DXSDK_LIBRARIES - List of libraries when using 3DSMAX. # DXSDK_LIBRARIES - List of libraries when using 3DSMAX.
# DXSDK_FOUND - True if MAX SDK found. # DXSDK_FOUND - True if MAX SDK found.
if(DXSDK_INCLUDE_DIR) IF(DXSDK_DIR)
# Already in cache, be silent # Already in cache, be silent
set(DXSDK_FIND_QUIETLY TRUE) SET(DXSDK_FIND_QUIETLY TRUE)
endif(DXSDK_INCLUDE_DIR) ENDIF(DXSDK_DIR)
find_path(DXSDK_INCLUDE_DIR dxsdkver.h FIND_PATH(DXSDK_DIR
"Include/dxsdkver.h"
PATHS PATHS
"$ENV{DXSDK_DIR}" "$ENV{DXSDK_DIR}"
"$ENV{DXSDK_DIR}/Include"
) )
MACRO(FIND_DXSDK_LIBRARY MYLIBRARY MYLIBRARYNAME) MACRO(FIND_DXSDK_LIBRARY MYLIBRARY MYLIBRARYNAME)
FIND_LIBRARY(${MYLIBRARY} FIND_LIBRARY(${MYLIBRARY}
NAMES ${MYLIBRARYNAME} NAMES ${MYLIBRARYNAME}
PATHS PATHS
"${DXSDK_LIBRARY_DIR}"
"$ENV{DXSDK_DIR}" "$ENV{DXSDK_DIR}"
"$ENV{DXSDK_DIR}/Lib" "$ENV{DXSDK_DIR}/Lib"
"$ENV{DXSDK_DIR}/Lib/x86" "$ENV{DXSDK_DIR}/Lib/x86"
) )
ENDMACRO(FIND_DXSDK_LIBRARY MYLIBRARY MYLIBRARYNAME) ENDMACRO(FIND_DXSDK_LIBRARY MYLIBRARY MYLIBRARYNAME)
IF(DXSDK_DIR)
SET(DXSDK_INCLUDE_DIR "${DXSDK_DIR}/Include")
IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(DXSDK_LIBRARY_DIR "${DXSDK_DIR}/Lib/x64")
ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(DXSDK_LIBRARY_DIR "${DXSDK_DIR}/Lib/x86")
ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
FIND_DXSDK_LIBRARY(DXSDK_GUID_LIBRARY dxguid) FIND_DXSDK_LIBRARY(DXSDK_GUID_LIBRARY dxguid)
FIND_DXSDK_LIBRARY(DXSDK_DINPUT_LIBRARY dinput8) FIND_DXSDK_LIBRARY(DXSDK_DINPUT_LIBRARY dinput8)
FIND_DXSDK_LIBRARY(DXSDK_DSOUND_LIBRARY dsound) FIND_DXSDK_LIBRARY(DXSDK_DSOUND_LIBRARY dsound)
@ -38,24 +48,18 @@ FIND_DXSDK_LIBRARY(DXSDK_D3D9_LIBRARY d3d9)
#FIND_DXSDK_LIBRARY(DXSDK_MAXSCRIPT_LIBRARY maxscrpt) #FIND_DXSDK_LIBRARY(DXSDK_MAXSCRIPT_LIBRARY maxscrpt)
#FIND_DXSDK_LIBRARY(DXSDK_PARAMBLK2_LIBRARY paramblk2) #FIND_DXSDK_LIBRARY(DXSDK_PARAMBLK2_LIBRARY paramblk2)
#FIND_DXSDK_LIBRARY(DXSDK_BMM_LIBRARY bmm) #FIND_DXSDK_LIBRARY(DXSDK_BMM_LIBRARY bmm)
ENDIF(DXSDK_DIR)
# Handle the QUIETLY and REQUIRED arguments and set DXSDK_FOUND to TRUE if # Handle the QUIETLY and REQUIRED arguments and set DXSDK_FOUND to TRUE if
# all listed variables are TRUE. # all listed variables are TRUE.
include(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)
find_package_handle_standard_args(DirectXSDK DEFAULT_MSG
DXSDK_INCLUDE_DIR DXSDK_GUID_LIBRARY)
if(DirectXSDK_FOUND) FIND_PACKAGE_HANDLE_STANDARD_ARGS(DIRECTXSDK DEFAULT_MSG DXSDK_DIR DXSDK_GUID_LIBRARY DXSDK_DINPUT_LIBRARY)
message(status " directx found.")
SET(DXSDK_LIBRARIES
${DXSDK_GUID_LIBRARY}
${DXSDK_DINPUT_LIBRARY}
${DXSDK_DSOUND_LIBRARY}
${DXSDK_D3DX9_LIBRARY}
${DXSDK_D3D9_LIBRARY})
else(DirectXSDK_FOUND) MARK_AS_ADVANCED(DXSDK_INCLUDE_DIR
set(DXSDK_LIBRARIES) DXSDK_GUID_LIBRARY
endif(DirectXSDK_FOUND) DXSDK_DINPUT_LIBRARY
DXSDK_DSOUND_LIBRARY
mark_as_advanced(DXSDK_INCLUDE_DIR DXSDK_LIBRARIES) DXSDK_XAUDIO_LIBRARY
DXSDK_D3DX9_LIBRARY
DXSDK_D3D9_LIBRARY)