From b950c428a6caa098a675db83e5f408e7286e7a5d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 21 Dec 2016 15:13:49 +0000 Subject: [PATCH] From Vladimir Chebaev, "Dynamic linking of fbx plugin and fbx SDK" --- CMakeModules/FindFBX.cmake | 7 ++++++- src/osgPlugins/fbx/CMakeLists.txt | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeModules/FindFBX.cmake b/CMakeModules/FindFBX.cmake index c70ed70ed..a5f4135bc 100644 --- a/CMakeModules/FindFBX.cmake +++ b/CMakeModules/FindFBX.cmake @@ -43,7 +43,12 @@ IF(APPLE) ELSEIF(CMAKE_COMPILER_IS_GNUCXX) SET(FBX_LIBNAME "fbxsdk") ELSE() - SET(FBX_LIBNAME "libfbxsdk-md") + OPTION(FBX_SHARED OFF) + IF(FBX_SHARED) + SET(FBX_LIBNAME "libfbxsdk") + ELSE() + SET(FBX_LIBNAME "libfbxsdk-md") + ENDIF() ENDIF() SET(FBX_LIBNAME_DEBUG ${FBX_LIBNAME}d) diff --git a/src/osgPlugins/fbx/CMakeLists.txt b/src/osgPlugins/fbx/CMakeLists.txt index e6569fbfe..8741dfb01 100644 --- a/src/osgPlugins/fbx/CMakeLists.txt +++ b/src/osgPlugins/fbx/CMakeLists.txt @@ -28,6 +28,11 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") ENDIF() IF(WIN32) + OPTION(FBX_SHARED OFF) + IF(FBX_SHARED) + ADD_DEFINITIONS(-DFBXSDK_SHARED) + ENDIF(FBX_SHARED) + SET(TARGET_EXTERNAL_LIBRARIES wininet) ENDIF(WIN32)