From dd2de7f1324195730e3818e823de03e267d89759 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 12 Mar 2015 15:12:29 +0000 Subject: [PATCH] From Laurens Voerman, "attached is a zip with a modified version of: OpenSceneGraph\CMakeModules\FindFBX.cmake This version can find fbx sdk 2015.1 and will prefer it over older versions. Tested with Visual Studio Express 2013 on 64bit windows 7" git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14782 16af8721-9629-0410-8352-f15c8da7e697 --- CMakeModules/FindFBX.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CMakeModules/FindFBX.cmake b/CMakeModules/FindFBX.cmake index ebeeb1d5e..de3b5a644 100644 --- a/CMakeModules/FindFBX.cmake +++ b/CMakeModules/FindFBX.cmake @@ -34,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) @@ -46,10 +48,15 @@ SET(FBX_LIBNAME_DEBUG ${FBX_LIBNAME}d) SET( FBX_SEARCH_PATHS $ENV{FBX_DIR} + "$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"