From 0f7e30a74ec4c4a086fac39e032ff98ec97a86f1 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 1 Jun 2016 11:25:31 +0100
Subject: [PATCH] Added in extra search paths for FBX

---
 CMakeModules/FindFBX.cmake           | 14 ++++++++------
 src/osgPlugins/fbx/ReaderWriterFBX.h |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CMakeModules/FindFBX.cmake b/CMakeModules/FindFBX.cmake
index de3b5a644..fbe87e820 100644
--- a/CMakeModules/FindFBX.cmake
+++ b/CMakeModules/FindFBX.cmake
@@ -50,13 +50,13 @@ 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/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/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"
@@ -96,8 +96,9 @@ IF(NOT FBX_FOUND)
 
     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/2014.1"
+        "$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2014.1"
+        "/Applications/Autodesk/FBX/FBX SDK/2014.1"
         /Applications/Autodesk/FBXSDK20141
     )
 
@@ -134,8 +135,9 @@ IF(NOT FBX_FOUND)
 
     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/2013.3
+        "$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2013.3
+        "/Applications/Autodesk/FBX/FBX SDK/2013.3"
         /Applications/Autodesk/FBXSDK20133
     )
 
diff --git a/src/osgPlugins/fbx/ReaderWriterFBX.h b/src/osgPlugins/fbx/ReaderWriterFBX.h
index c5dbf5fc2..99853470c 100644
--- a/src/osgPlugins/fbx/ReaderWriterFBX.h
+++ b/src/osgPlugins/fbx/ReaderWriterFBX.h
@@ -8,7 +8,7 @@
 ///////////////////////////////////////////////////////////////////////////
 // OSG reader plugin for the ".fbx" format.
 // See http://www.autodesk.com/fbx
-// This plugin requires the FBX SDK version 2013.3 or 2014.1
+// This plugin requires the FBX SDK version 2013.3 or 2014.1 or later
 
 #if FBXSDK_VERSION_MAJOR < 2013 || (FBXSDK_VERSION_MAJOR == 2013 && FBXSDK_VERSION_MINOR < 3)
 #error Wrong FBX SDK version