From adf1833a3b655bba5e42e91f738e4a758532493f Mon Sep 17 00:00:00 2001 From: Jason Maskell Date: Mon, 25 Jul 2016 15:11:04 +0700 Subject: Modified finders to take Visual Studio platform into account when finding libs. Will need to be modified further for use with PackMan --- cmake/FindDirectXTK.cmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'cmake/FindDirectXTK.cmake') 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 -- cgit v1.2.3