diff options
| -rw-r--r-- | cmake/FindDXUT.cmake | 20 | ||||
| -rw-r--r-- | cmake/FindDirectXTK.cmake | 12 | ||||
| -rw-r--r-- | cmake/FindFX11.cmake | 12 |
3 files changed, 35 insertions, 9 deletions
diff --git a/cmake/FindDXUT.cmake b/cmake/FindDXUT.cmake index 00cc663..5825c07 100644 --- a/cmake/FindDXUT.cmake +++ b/cmake/FindDXUT.cmake @@ -11,22 +11,32 @@ endif() find_path(DXUT_SDK_PATH Core/DXUT.h HINTS ${GW_DEPS_ROOT}/DXUT ) - + +# Need to be smart and get the proper VS library here + +if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 18.0.0.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.0.0) + SET(VS_STR "Desktop_2013") +elseif(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.0.0.0) + SET(VS_STR "Desktop_2015") +else() + MESSAGE(FATAL_ERROR "Failed to find compatible DXUT - Only supporting VS2013 and VS2015") +endif() + find_library(DXUT_LIBRARY_RELEASE NAMES DXUT - PATHS ${DXUT_SDK_PATH}/Core/Bin/*/${DXUTARCH}/Release) + PATHS ${DXUT_SDK_PATH}/Core/Bin/${VS_STR}/${DXUTARCH}/Release) find_library(DXUT_LIBRARY_DEBUG NAMES DXUT - PATHS ${DXUT_SDK_PATH}/Core/Bin/*/${DXUTARCH}/Debug) + PATHS ${DXUT_SDK_PATH}/Core/Bin/${VS_STR}/${DXUTARCH}/Debug) find_library(DXUT_Opt_LIBRARY_RELEASE NAMES DXUTOpt - PATHS ${DXUT_SDK_PATH}/Optional/Bin/*/${DXUTARCH}/Release) + PATHS ${DXUT_SDK_PATH}/Optional/Bin/${VS_STR}/${DXUTARCH}/Release) find_library(DXUT_Opt_LIBRARY_DEBUG NAMES DXUTOpt - PATHS ${DXUT_SDK_PATH}/Optional/Bin/*/${DXUTARCH}/Debug) + PATHS ${DXUT_SDK_PATH}/Optional/Bin/${VS_STR}/${DXUTARCH}/Debug) FIND_PACKAGE_HANDLE_STANDARD_ARGS(DXUT DEFAULT_MSG diff --git a/cmake/FindDirectXTK.cmake b/cmake/FindDirectXTK.cmake index e6466b4..910cc11 100644 --- a/cmake/FindDirectXTK.cmake +++ b/cmake/FindDirectXTK.cmake @@ -13,14 +13,22 @@ find_path(DXTK_SDK_PATH Inc/DirectXHelpers.h ) MESSAGE("DXTK SDK ${DXTK_SDK_PATH}") + +if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 18.0.0.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.0.0) + SET(VS_STR "Desktop_2013") +elseif(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.0.0.0) + SET(VS_STR "Desktop_2015") +else() + MESSAGE(FATAL_ERROR "Failed to find compatible FX11 - Only supporting VS2013 and VS2015") +endif() find_library(DXTK_LIBRARY_RELEASE NAMES DirectXTK - PATHS ${DXTK_SDK_PATH}/Bin/*/${DXTKARCH}/Release) + PATHS ${DXTK_SDK_PATH}/Bin/${VS_STR}/${DXTKARCH}/Release) find_library(DXTK_LIBRARY_DEBUG NAMES DirectXTK - PATHS ${DXTK_SDK_PATH}/Bin/*/${DXTKARCH}/Debug) + PATHS ${DXTK_SDK_PATH}/Bin/${VS_STR}/${DXTKARCH}/Debug) FIND_PACKAGE_HANDLE_STANDARD_ARGS(DXTK diff --git a/cmake/FindFX11.cmake b/cmake/FindFX11.cmake index 0620b29..b6e8cb0 100644 --- a/cmake/FindFX11.cmake +++ b/cmake/FindFX11.cmake @@ -12,13 +12,21 @@ find_path(FX11_SDK_PATH Effect.h HINTS ${GW_DEPS_ROOT}/FX11 ) +if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 18.0.0.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.0.0) + SET(VS_STR "Desktop_2013") +elseif(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.0.0.0) + SET(VS_STR "Desktop_2015") +else() + MESSAGE(FATAL_ERROR "Failed to find compatible FX11 - Only supporting VS2013 and VS2015") +endif() + find_library(FX11_LIBRARY_RELEASE NAMES Effects11 - PATHS ${FX11_SDK_PATH}/Bin/*/${FX11ARCH}/Release) + PATHS ${FX11_SDK_PATH}/Bin/${VS_STR}/${FX11ARCH}/Release) find_library(FX11_LIBRARY_DEBUG NAMES Effects11 - PATHS ${FX11_SDK_PATH}/Bin/*/${FX11ARCH}/Debug) + PATHS ${FX11_SDK_PATH}/Bin/${VS_STR}/${FX11ARCH}/Debug) FIND_PACKAGE_HANDLE_STANDARD_ARGS(FX11 |