FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #911 from LaurensVoerman/FbxSdkFix

Browse Source 
Fix for older versions of fbxsdk without xml or zlib libraries,
This commit is contained in:
OpenSceneGraph git repository 2020-01-30 16:30:41 +00:00 committed by GitHub
commit 994ea4d203
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/osgPlugins/fbx/CMakeLists.txt
View File

@ -33,13 +33,11 @@ ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
ENDIF() ENDIF()
SET(TARGET_LIBRARIES_VARS FBX_LIBRARY)
IF(WIN32) IF(WIN32)
OPTION(FBX_SHARED OFF) OPTION(FBX_SHARED OFF)
IF(FBX_SHARED) IF(FBX_SHARED)
ADD_DEFINITIONS(-DFBXSDK_SHARED) ADD_DEFINITIONS(-DFBXSDK_SHARED)
ELSE()
SET(TARGET_EXTERNAL_LIBRARIES ${FBX_XML2_LIBRARY})
SET(TARGET_EXTERNAL_LIBRARIES ${FBX_ZLIB_LIBNAME})
ENDIF(FBX_SHARED) ENDIF(FBX_SHARED)
SET(TARGET_EXTERNAL_LIBRARIES wininet) SET(TARGET_EXTERNAL_LIBRARIES wininet)
@ -51,12 +49,13 @@ IF(APPLE)
SET(TARGET_EXTERNAL_LIBRARIES iconv ${SYS_CONFIG_LIBRARY}) SET(TARGET_EXTERNAL_LIBRARIES iconv ${SYS_CONFIG_LIBRARY})
ENDIF(APPLE) ENDIF(APPLE)
SET(TARGET_LIBRARIES_VARS FBX_LIBRARY) IF(FBX_XML2_LIBRARY)
IF (CMAKE_BUILD_TYPE MATCHES "debug" OR CMAKE_BUILD_TYPE MATCHES "DEBUG") SET(TARGET_LIBRARIES_VARS ${TARGET_LIBRARIES_VARS} FBX_XML2_LIBRARY)
SET(TARGET_ADDED_LIBRARIES osgAnimation ${FBX_XML2_LIBRARY_DEBUG}) ENDIF(FBX_XML2_LIBRARY)
ELSE() IF(FBX_ZLIB_LIBRARY)
SET(TARGET_ADDED_LIBRARIES osgAnimation ${FBX_XML2_LIBRARY}) SET(TARGET_LIBRARIES_VARS ${TARGET_LIBRARIES_VARS} FBX_ZLIB_LIBRARY)
ENDIF() ENDIF(FBX_ZLIB_LIBRARY)
SET(TARGET_ADDED_LIBRARIES osgAnimation)
#### end var setup ### #### end var setup ###
SETUP_PLUGIN(fbx) SETUP_PLUGIN(fbx)