From 4e22a20f9487051849c9207d1c6bc44d6df5458c Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 3 May 2011 09:58:31 +0000
Subject: [PATCH] From Michael Platings, "I've updated the FBX plugin to use
 the latest FBX SDK (2012.1). Please apply the attached .cmake which finds the
 correct SDK headers & libraries."

---
 CMakeModules/FindFBX.cmake | 58 ++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/CMakeModules/FindFBX.cmake b/CMakeModules/FindFBX.cmake
index e9e0b4c53..2a2adffc3 100644
--- a/CMakeModules/FindFBX.cmake
+++ b/CMakeModules/FindFBX.cmake
@@ -9,56 +9,52 @@
 # correspond to the ./configure --prefix=$FBX_DIR
 
 IF(APPLE)
-    SET(FBX_LIBNAME "fbxsdk_gcc4_ub")
+    SET(FBX_LIBDIR "gcc4/ub")
 ELSEIF(CMAKE_COMPILER_IS_GNUCXX)
-    SET(FBX_LIBNAME "fbxsdk_gcc4")
-    #TODO: libs are provided for GCC 3.4 & 4.0 in both 32 and 64 bit versions
-    # but I don't know how to confgure that here.
-ELSEIF(MSVC71)
-    SET(FBX_LIBNAME "fbxsdk_md2003")
+    SET(FBX_LIBDIR "gcc4")
 ELSEIF(MSVC80)
-    SET(FBX_LIBNAME "fbxsdk_md2005")
+    SET(FBX_LIBDIR "vs2005")
 ELSEIF(MSVC90)
-    SET(FBX_LIBNAME "fbxsdk_md2008")
+    SET(FBX_LIBDIR "vs2008")
 ELSEIF(MSVC100 OR MSVC_VER>1600)
-    SET(FBX_LIBNAME "fbxsdk_md2010")
-ENDIF()
-
-IF(CMAKE_CL_64)
-    SET(FBX_LIBNAME ${FBX_LIBNAME}_amd64)
+    SET(FBX_LIBDIR "vs2010")
 ENDIF()
 
 IF(APPLE)
-    SET(FBX_LIBNAME_DEBUG ${FBX_LIBNAME})
+    # do nothing
+ELSEIF(CMAKE_CL_64 OR (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SIZEOF_VOID_P EQUAL 8))
+    SET(FBX_LIBDIR ${FBX_LIBDIR}/x64)
 ELSE()
-    SET(FBX_LIBNAME_DEBUG ${FBX_LIBNAME}d)
+    SET(FBX_LIBDIR ${FBX_LIBDIR}/x86)
 ENDIF()
 
-# SET final path
-#osg_fbx code is compatible with 2011.2, 2011.3 and 2011.3.1 so find any directory
-SET( FBX_SEARCH_PATHS 
+IF(APPLE)
+    SET(FBX_LIBNAME "fbxsdk-2012.1-static")
+ELSEIF(CMAKE_COMPILER_IS_GNUCXX)
+    SET(FBX_LIBNAME "fbxsdk-2012.1-static")
+ELSE()
+    SET(FBX_LIBNAME "fbxsdk-2012.1-md")
+ENDIF()
+
+SET(FBX_LIBNAME_DEBUG ${FBX_LIBNAME}d)
+
+SET( FBX_SEARCH_PATHS
     $ENV{FBX_DIR}
-    $ENV{ProgramW6432}/Autodesk/FBX/FbxSdk/2011.3.1
-    $ENV{PROGRAMFILES}/Autodesk/FBX/FbxSdk/2011.3.1
-    /Applications/Autodesk/FBXSDK201131
-    $ENV{ProgramW6432}/Autodesk/FBX/FbxSdk/2011.3
-    $ENV{PROGRAMFILES}/Autodesk/FBX/FbxSdk/2011.3
-    /Applications/Autodesk/FBXSDK20113
-    $ENV{ProgramW6432}/Autodesk/FBX/FbxSdk/2011.2
-    $ENV{PROGRAMFILES}/Autodesk/FBX/FbxSdk/2011.2
-    /Applications/Autodesk/FBXSDK20112
+    $ENV{ProgramW6432}/Autodesk/FBX/FbxSdk/2012.1
+    $ENV{PROGRAMFILES}/Autodesk/FBX/FbxSdk/2012.1
+    /Applications/Autodesk/FBXSDK20121
 )
 
 # search for headers & debug/release libraries
-FIND_PATH(FBX_INCLUDE_DIR fbxsdk.h
+FIND_PATH(FBX_INCLUDE_DIR "fbxsdk.h"
     PATHS ${FBX_SEARCH_PATHS}
-    PATH_SUFFIXES include )
+    PATH_SUFFIXES "include")
 FIND_LIBRARY( FBX_LIBRARY ${FBX_LIBNAME}
     PATHS ${FBX_SEARCH_PATHS}
-    PATH_SUFFIXES lib)
+    PATH_SUFFIXES "lib/${FBX_LIBDIR}")
 FIND_LIBRARY( FBX_LIBRARY_DEBUG ${FBX_LIBNAME_DEBUG}
     PATHS ${FBX_SEARCH_PATHS}
-    PATH_SUFFIXES lib)
+    PATH_SUFFIXES "lib/${FBX_LIBDIR}")
 
 IF(FBX_LIBRARY AND FBX_LIBRARY_DEBUG AND FBX_INCLUDE_DIR)
     SET(FBX_FOUND "YES")