Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaia Clary <gaia.clary@machinimatrix.org>2018-12-06 00:05:19 +0300
committerGaia Clary <gaia.clary@machinimatrix.org>2018-12-06 00:05:19 +0300
commitd6454a15f709a3f0eea62ec96a9e8929d85a4811 (patch)
tree3a0f1a5ebf7d0636d88192f2fe48379471ecfc0e /source/blender/collada/CMakeLists.txt
parent5584cad5d90ec56febaca96e6ea1326c15523fa4 (diff)
parent3552731551ef1845b493ffebf78be5a42527e9f2 (diff)
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/collada/CMakeLists.txt')
-rw-r--r--source/blender/collada/CMakeLists.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt
index 95edcff0555..8c2339497bf 100644
--- a/source/blender/collada/CMakeLists.txt
+++ b/source/blender/collada/CMakeLists.txt
@@ -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