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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-08-07 17:21:04 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-08-07 17:21:04 +0400
commitec26abd2db934099bb2cc28510cf255775ae4ab1 (patch)
treeba77db5750dcefde5add1493605535b665fa9c0c /intern/CMakeLists.txt
parent8318acd1299a44e0b8fd80522993e5367ef2cf07 (diff)
parenta02d7c1ba76adbf3ff432111af4c3c81a0812c3a (diff)
Cycles: svn merge -r37957:39132 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'intern/CMakeLists.txt')
-rw-r--r--intern/CMakeLists.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt
index fca5e7fdf7d..de2c0ab9459 100644
--- a/intern/CMakeLists.txt
+++ b/intern/CMakeLists.txt
@@ -31,7 +31,6 @@ add_subdirectory(moto)
add_subdirectory(memutil)
add_subdirectory(iksolver)
add_subdirectory(opennl)
-add_subdirectory(smoke)
add_subdirectory(mikktspace)
if(WITH_AUDASPACE)
@@ -42,6 +41,10 @@ if(WITH_MOD_FLUID)
add_subdirectory(elbeem)
endif()
+if(WITH_MOD_SMOKE)
+ add_subdirectory(smoke)
+endif()
+
if(WITH_MOD_DECIMATE)
add_subdirectory(container)
add_subdirectory(decimation)