Skip to content
Permalink
Browse files

Fix for older versions of fbxsdk without xml or zlib libraries, fix c…

…make multiconfig generators (msvc) with irrelevant CMAKE_BUILD_TYPE.
  • Loading branch information
LaurensVoerman authored and robertosfield committed Jan 30, 2020
1 parent 2586895 commit 274938e3c5d1a2c63afcf884ba4475c9654bc1a0
Showing with 8 additions and 9 deletions.
  1. +8 −9 src/osgPlugins/fbx/CMakeLists.txt
@@ -33,13 +33,11 @@ ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

ENDIF()

SET(TARGET_LIBRARIES_VARS FBX_LIBRARY)
IF(WIN32)
OPTION(FBX_SHARED OFF)
IF(FBX_SHARED)
ADD_DEFINITIONS(-DFBXSDK_SHARED)
ELSE()
SET(TARGET_EXTERNAL_LIBRARIES ${FBX_XML2_LIBRARY})
SET(TARGET_EXTERNAL_LIBRARIES ${FBX_ZLIB_LIBNAME})
ENDIF(FBX_SHARED)

SET(TARGET_EXTERNAL_LIBRARIES wininet)
@@ -51,12 +49,13 @@ IF(APPLE)
SET(TARGET_EXTERNAL_LIBRARIES iconv ${SYS_CONFIG_LIBRARY})
ENDIF(APPLE)

SET(TARGET_LIBRARIES_VARS FBX_LIBRARY)
IF (CMAKE_BUILD_TYPE MATCHES "debug" OR CMAKE_BUILD_TYPE MATCHES "DEBUG")
SET(TARGET_ADDED_LIBRARIES osgAnimation ${FBX_XML2_LIBRARY_DEBUG})
ELSE()
SET(TARGET_ADDED_LIBRARIES osgAnimation ${FBX_XML2_LIBRARY})
ENDIF()
IF(FBX_XML2_LIBRARY)
SET(TARGET_LIBRARIES_VARS ${TARGET_LIBRARIES_VARS} FBX_XML2_LIBRARY)
ENDIF(FBX_XML2_LIBRARY)
IF(FBX_ZLIB_LIBRARY)
SET(TARGET_LIBRARIES_VARS ${TARGET_LIBRARIES_VARS} FBX_ZLIB_LIBRARY)
ENDIF(FBX_ZLIB_LIBRARY)

SET(TARGET_ADDED_LIBRARIES osgAnimation)
#### end var setup ###
SETUP_PLUGIN(fbx)

0 comments on commit 274938e

Please sign in to comment.
You can’t perform that action at this time.