[Bf-blender-cvs] [5a014df] alembic_pointcache: Set the WITH_ALEMBIC define in subfolders that actually use it, follows the pattern in other libs.

Lukas Tönne noreply at git.blender.org
Thu Oct 16 16:52:28 CEST 2014


Commit: 5a014df0fceee8d6d3e9b91e507f30697d164c69
Author: Lukas Tönne
Date:   Wed Oct 2 10:07:36 2013 +0200
Branches: alembic_pointcache
https://developer.blender.org/rB5a014df0fceee8d6d3e9b91e507f30697d164c69

Set the WITH_ALEMBIC define in subfolders that actually use it, follows the pattern in other libs.

===================================================================

M	CMakeLists.txt
M	source/blender/makesrna/intern/CMakeLists.txt
M	source/blender/pointcache/CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e588ba3..e4af19c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -887,8 +887,6 @@ if(UNIX AND NOT APPLE)
 
 		set(ALEMBIC_LIBRARIES ${ALEMBIC_LIBRARIES} ${BOOST_LIBRARIES})
 		set(ALEMBIC_DEFINITIONS "")
-
-		add_definitions(-DWITH_ALEMBIC)
 	endif()
 
 	# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 9b2fc2c..3ae4c3d 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -255,6 +255,10 @@ if(WITH_BULLET)
 	add_definitions(-DWITH_BULLET)
 endif()
 
+if(WITH_ALEMBIC)
+	add_definitions(-DWITH_ALEMBIC)
+endif()
+
 # Build makesrna executable
 blender_include_dirs(
 	.
diff --git a/source/blender/pointcache/CMakeLists.txt b/source/blender/pointcache/CMakeLists.txt
index ec24141..1d05fb5 100644
--- a/source/blender/pointcache/CMakeLists.txt
+++ b/source/blender/pointcache/CMakeLists.txt
@@ -45,6 +45,8 @@ if(WITH_ALEMBIC)
 	list(APPEND INC_SYS ${ALEMBIC_INCLUDE_DIRS} ${OPENEXR_INCLUDE_DIR}/OpenEXR)
 
 #	add_subdirectory(alembic)
+
+	add_definitions(-DWITH_ALEMBIC)
 endif()
 
 blender_add_lib(bf_pointcache "${SRC}" "${INC}" "${INC_SYS}")




More information about the Bf-blender-cvs mailing list