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:
authorCampbell Barton <ideasman42@gmail.com>2011-07-26 07:55:23 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-07-26 07:55:23 +0400
commitfc95382a977163a1d499c732960e7501cc065833 (patch)
tree3bbbe419ba513f030f95715c04a8adb39c6e6579 /source/blender/modifiers/CMakeLists.txt
parentac2dd4099167d9ab6306f3fcb83610a5d01ffae1 (diff)
parentce0ad0b40b93fc6074daaba6ead0e0e82867d4d2 (diff)
svn merge -r38400:38500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/modifiers/CMakeLists.txt')
-rw-r--r--source/blender/modifiers/CMakeLists.txt13
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index f71fd11877f..1097b238cae 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -25,16 +25,17 @@
# ***** END GPL LICENSE BLOCK *****
set(INC
- . ./intern
+ .
+ intern
+ ../blenkernel
+ ../blenkernel/intern
../blenlib
../blenloader
../makesdna
- ../blenkernel
- ../blenkernel/intern
../bmesh
../render/extern/include
- ../../../intern/guardedalloc
../../../intern/elbeem/extern
+ ../../../intern/guardedalloc
)
set(INC_SYS
@@ -100,7 +101,9 @@ endif()
if(WITH_MOD_DECIMATE)
add_definitions(-DWITH_MOD_DECIMATE)
- list(APPEND INC ../../../intern/decimation/extern)
+ list(APPEND INC
+ ../../../intern/decimation/extern
+ )
endif()
if(NOT WITH_MOD_FLUID)