diff options
| author | Jason Maskell <Jason Maskell> | 2016-07-25 15:11:04 +0700 |
|---|---|---|
| committer | Jason Maskell <Jason Maskell> | 2016-07-25 15:11:04 +0700 |
| commit | adf1833a3b655bba5e42e91f738e4a758532493f (patch) | |
| tree | 30cc09e2ba97bb3df7488fe6970a6f78aab739eb /cmake/FindDirectXTK.cmake | |
| parent | Had some compilation issues without previously generated code, fixed now. (diff) | |
| download | waveworks_archive-adf1833a3b655bba5e42e91f738e4a758532493f.tar.xz waveworks_archive-adf1833a3b655bba5e42e91f738e4a758532493f.zip | |
Modified finders to take Visual Studio platform into account when finding libs. Will need to be modified further for use with PackMan
Diffstat (limited to 'cmake/FindDirectXTK.cmake')
| -rw-r--r-- | cmake/FindDirectXTK.cmake | 12 |
1 files changed, 10 insertions, 2 deletions
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 |