diff --git a/CMakeModules/FindFBX.cmake b/CMakeModules/FindFBX.cmake index 8911badbe..de3b5a644 100644 --- a/CMakeModules/FindFBX.cmake +++ b/CMakeModules/FindFBX.cmake @@ -18,8 +18,10 @@ ELSEIF(MSVC90) SET(FBX_LIBDIR "vs2008") ELSEIF(MSVC10) SET(FBX_LIBDIR "vs2010") -ELSEIF(MSVC11 OR MSVC_VERSION>1700) +ELSEIF(MSVC11) SET(FBX_LIBDIR "vs2012") +ELSEIF(MSVC12 OR MSVC_VERSION>1800) + SET(FBX_LIBDIR "vs2013") ENDIF() IF(APPLE) @@ -32,6 +34,8 @@ ELSE() SET(FBX_LIBDIR ${FBX_LIBDIR}/x86) ENDIF() +#try to use 2015.1 or 2014.2 version + IF(APPLE) SET(FBX_LIBNAME "libfbxsdk") ELSEIF(CMAKE_COMPILER_IS_GNUCXX) @@ -44,10 +48,15 @@ SET(FBX_LIBNAME_DEBUG ${FBX_LIBNAME}d) SET( FBX_SEARCH_PATHS $ENV{FBX_DIR} - "$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2014.1" - "$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2014.1" + "$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2015.1" + "$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2015.1" + /Applications/Autodesk/FBXSDK20151 + "$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2014.2" + "$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2014.2" + /Applications/Autodesk/FBXSDK20142 /Applications/Autodesk/FBXSDK20141 ) +#I think the last line in the search path is an old typo, but let's search for 2014.1 anyway - LV # search for headers & debug/release libraries FIND_PATH(FBX_INCLUDE_DIR "fbxsdk.h" @@ -74,21 +83,21 @@ ELSE() ENDIF() IF(NOT FBX_FOUND) -#try to use 2013.3 version +#try to use 2014.1 version IF(APPLE) - SET(FBX_LIBNAME "fbxsdk-2013.3-static") + SET(FBX_LIBNAME "fbxsdk-2014.1") ELSEIF(CMAKE_COMPILER_IS_GNUCXX) - SET(FBX_LIBNAME "fbxsdk-2013.3-static") + SET(FBX_LIBNAME "fbxsdk-2014.1") ELSE() - SET(FBX_LIBNAME "fbxsdk-2013.3-md") + SET(FBX_LIBNAME "fbxsdk-2014.1") ENDIF() SET(FBX_LIBNAME_DEBUG ${FBX_LIBNAME}d) SET( FBX_SEARCH_PATHS $ENV{FBX_DIR} - $ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2013.3 - $ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2013.3 + $ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2014.1 + $ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2014.1 /Applications/Autodesk/FBXSDK20141 ) @@ -110,3 +119,41 @@ IF(NOT FBX_FOUND) ENDIF() ENDIF() + +IF(NOT FBX_FOUND) +#try to use 2013.3 version + IF(APPLE) + SET(FBX_LIBNAME "fbxsdk-2013.3-static") + ELSEIF(CMAKE_COMPILER_IS_GNUCXX) + SET(FBX_LIBNAME "fbxsdk-2013.3-static") + ELSE() + SET(FBX_LIBNAME "fbxsdk-2013.3-md") + ENDIF() + + SET(FBX_LIBNAME_DEBUG ${FBX_LIBNAME}d) + + SET( FBX_SEARCH_PATHS + $ENV{FBX_DIR} + $ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2013.3 + $ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2013.3 + /Applications/Autodesk/FBXSDK20133 + ) + + # search for headers & debug/release libraries + FIND_PATH(FBX_INCLUDE_DIR "fbxsdk.h" + PATHS ${FBX_SEARCH_PATHS} + PATH_SUFFIXES "include") + FIND_LIBRARY( FBX_LIBRARY ${FBX_LIBNAME} + PATHS ${FBX_SEARCH_PATHS} + PATH_SUFFIXES "lib/${FBX_LIBDIR}") + + FIND_LIBRARY( FBX_LIBRARY_DEBUG ${FBX_LIBNAME_DEBUG} + PATHS ${FBX_SEARCH_PATHS} + PATH_SUFFIXES "lib/${FBX_LIBDIR}") + IF(FBX_LIBRARY AND FBX_LIBRARY_DEBUG AND FBX_INCLUDE_DIR) + SET(FBX_FOUND "YES") + ELSE() + SET(FBX_FOUND "NO") + ENDIF() + +ENDIF()