diff options
author | Joerg Mueller <nexyon@gmail.com> | 2011-06-23 21:30:56 +0400 |
---|---|---|
committer | Joerg Mueller <nexyon@gmail.com> | 2011-06-23 21:30:56 +0400 |
commit | 413bc87e4f18bb46eeb2f2f52b5278d182b51de8 (patch) | |
tree | 6d67ac820f672bd132ebb628381b0a793403ff7c /intern | |
parent | cc246eaca7bc385738658672e66a5bca8872d5a1 (diff) | |
parent | e7c6b535b0140876ef1b5650c7b259093f07c4b3 (diff) |
Merge with trunk r37757.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt index 33bf9bb476c..4c36cb43e7d 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() |