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/FindFX11.cmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'cmake/FindFX11.cmake') 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 -- cgit v1.2.3