Fix (devtalk 4053): Collada build with older cmake versions broken
authorGaia Clary <gaia.clary@machinimatrix.org>
Wed, 5 Dec 2018 21:04:10 +0000 (22:04 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Wed, 5 Dec 2018 21:04:10 +0000 (22:04 +0100)
source/blender/collada/CMakeLists.txt
source/blender/collada/DocumentImporter.cpp
source/blender/collada/DocumentImporter.h

index c250384b989fe2815c1f51dcffcd19cbf6225415..fd38998c98cebfd649cf6fa76b0a813ce16ae619 100644 (file)
@@ -24,8 +24,7 @@
 # ***** END GPL LICENSE BLOCK *****
 
 remove_strict_flags()
-
-FIND_FILE(_opencollada_with_animation_clip
+FIND_FILE(OPENCOLLADA_ANIMATION_CLIP
       NAMES
         COLLADAFWAnimationClip.h
       PATHS
@@ -33,8 +32,11 @@ FIND_FILE(_opencollada_with_animation_clip
       NO_DEFAULT_PATH
     )
 
-IF(_opencollada_with_animation_clip)
-   add_compile_definitions(OPENCOLLADA_WITH_ANIMATION_CLIP)
+IF(OPENCOLLADA_ANIMATION_CLIP)
+   message(STATUS "Found opencollada: ${OPENCOLLADA_ANIMATION_CLIP} ")
+   add_definitions(-DWITH_OPENCOLLADA_ANIMATION_CLIP)
+ELSE()
+   message(STATUS "opencollada: Build without animation clip support")
 ENDIF()
 
 set(INC
index 7f93dd4823f5b622bdf361bdfd1020df6765a3fc..c3b2108c35be64aad97bad871983bc70a194485e 100644 (file)
@@ -1349,7 +1349,7 @@ bool DocumentImporter::writeAnimationList(const COLLADAFW::AnimationList *animat
        return anim_importer.write_animation_list(animationList);
 }
 
-#if OPENCOLLADA_WITH_ANIMATION_CLIP
+#if WITH_OPENCOLLADA_ANIMATION_CLIP
 // Since opencollada 1.6.68
 // called on post-process stage after writeVisualScenes
 bool DocumentImporter::writeAnimationClip(const COLLADAFW::AnimationClip *animationClip)
index 084a7ca984ddb45a3b4392719a62944398b79006..68a67005ff06eba237219e72cdd39277b1b57dc8 100644 (file)
@@ -106,7 +106,7 @@ public:
 
        bool writeAnimationList(const COLLADAFW::AnimationList*);
 
-#if OPENCOLLADA_WITH_ANIMATION_CLIP
+#if WITH_OPENCOLLADA_ANIMATION_CLIP
        // Please enable this when building with Collada 1.6.65 or newer (also in DocumentImporter.cpp)
        bool writeAnimationClip(const COLLADAFW::AnimationClip *animationClip);
 #endif