From 6559295768162de4fff698f48d007f55b8eb2224 Mon Sep 17 00:00:00 2001 From: Laurens Voerman Date: Thu, 30 Jan 2020 16:32:42 +0100 Subject: [PATCH] Fix for older versions of fbxsdk without xml or zlib libraries, fix cmake multiconfig generators (msvc) with irrelevant CMAKE_BUILD_TYPE. --- src/osgPlugins/fbx/CMakeLists.txt | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/osgPlugins/fbx/CMakeLists.txt b/src/osgPlugins/fbx/CMakeLists.txt index 066baae92..2dc67b135 100644 --- a/src/osgPlugins/fbx/CMakeLists.txt +++ b/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)