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-06-28 19:00:42 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-06-28 19:00:42 +0400
commitd18d37d25f320f4dbe2ac1ef664c14ecd173719e (patch)
tree6460f76579536eb5096ab19c2b8f541bfa29591c /intern/CMakeLists.txt
parent6b2e35c8b7474eeae92551060b05036658cc1837 (diff)
parenta05b66defb14de86fa9845e16c0a8557a7a28723 (diff)
Cycles: svn merge -r37694:37904 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 f731b7be46c..fca5e7fdf7d 100644
--- a/intern/CMakeLists.txt
+++ b/intern/CMakeLists.txt
@@ -24,7 +24,6 @@
#
# ***** END GPL LICENSE BLOCK *****
-add_subdirectory(audaspace)
add_subdirectory(string)
add_subdirectory(ghost)
add_subdirectory(guardedalloc)
@@ -35,6 +34,10 @@ add_subdirectory(opennl)
add_subdirectory(smoke)
add_subdirectory(mikktspace)
+if(WITH_AUDASPACE)
+ add_subdirectory(audaspace)
+endif()
+
if(WITH_MOD_FLUID)
add_subdirectory(elbeem)
endif()