From f697988586e91070ad693728a4ac53ee5a3b1c4b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 10 Jul 2010 09:56:06 +0000 Subject: [PATCH] From Michael Platings, "Autodesk have re-released 2011.3 of the FBX SDK with Visual Studio 2010 support ( http://images.autodesk.com/adsk/files/fbx20113_fbxsdk_win_static.exe ). I've attached an updated FindFBX.cmake that supports this latest version but also retains support for FBX 2011.2 for those who don't want to update." --- CMakeModules/FindFBX.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeModules/FindFBX.cmake b/CMakeModules/FindFBX.cmake index da86ce523..46a985e93 100644 --- a/CMakeModules/FindFBX.cmake +++ b/CMakeModules/FindFBX.cmake @@ -18,8 +18,10 @@ ELSEIF(MSVC71) SET(FBX_LIBNAME "fbxsdk_md2003") ELSEIF(MSVC80) SET(FBX_LIBNAME "fbxsdk_md2005") -ELSEIF(MSVC90 OR MSVC_VER>1500) +ELSEIF(MSVC90) SET(FBX_LIBNAME "fbxsdk_md2008") +ELSEIF(MSVC100 OR MSVC_VER>1600) + SET(FBX_LIBNAME "fbxsdk_md2010") ENDIF() IF(CMAKE_CL_64) @@ -33,8 +35,11 @@ ELSE() ENDIF() # SET final path +#osg_fbx code is compatible with 2011.2 and 2011.3 so find either directory SET( FBX_SEARCH_PATHS $ENV{FBX_DIR} + $ENV{PROGRAMFILES}/Autodesk/FBX/FbxSdk/2011.3 + /Applications/Autodesk/FBXSDK20113 $ENV{PROGRAMFILES}/Autodesk/FBX/FbxSdk/2011.2 /Applications/Autodesk/FBXSDK20112 )