diff options
author | Benoit Bolsee <benoit.bolsee@online.be> | 2009-05-17 16:25:06 +0400 |
---|---|---|
committer | Benoit Bolsee <benoit.bolsee@online.be> | 2009-05-17 16:25:06 +0400 |
commit | 96aa60cee36dfb8a98501b6b9d4c88222b909c35 (patch) | |
tree | 1534bf9b38f77fe51938334afb0a69b44da03631 /source | |
parent | d4116adf11678726a5af5f544a12b194ef2fbcb9 (diff) |
cmake: apply ADD_SUBDIR patch.
Diffstat (limited to 'source')
-rw-r--r-- | source/CMakeLists.txt | 7 | ||||
-rw-r--r-- | source/blender/CMakeLists.txt | 25 | ||||
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/makesdna/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/gameengine/CMakeLists.txt | 36 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/CMakeLists.txt | 5 |
6 files changed, 46 insertions, 31 deletions
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 04566ec3b0b..4764caddf6a 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -24,12 +24,13 @@ # # ***** END GPL LICENSE BLOCK ***** -SUBDIRS(blender kernel) +ADD_SUBDIRECTORY(blender) +ADD_SUBDIRECTORY(kernel) IF(WITH_GAMEENGINE) - SUBDIRS(gameengine) + ADD_SUBDIRECTORY(gameengine) ENDIF(WITH_GAMEENGINE) IF(WINDOWS) - SUBDIRS(icons) + ADD_SUBDIRECTORY(icons) ENDIF(WINDOWS) diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index 007ee34e4e7..f65163ce26c 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -24,20 +24,35 @@ # # ***** END GPL LICENSE BLOCK ***** -SUBDIRS(avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon gpu makesdna python radiosity readblenfile render src yafray) +ADD_SUBDIRECTORY(avi) +ADD_SUBDIRECTORY(nodes) +ADD_SUBDIRECTORY(blenkernel) +ADD_SUBDIRECTORY(blenlib) +ADD_SUBDIRECTORY(blenloader) +ADD_SUBDIRECTORY(blenpluginapi) +ADD_SUBDIRECTORY(imbuf) +ADD_SUBDIRECTORY(imbuf/intern/cineon) +ADD_SUBDIRECTORY(gpu) +ADD_SUBDIRECTORY(makesdna) +ADD_SUBDIRECTORY(python) +ADD_SUBDIRECTORY(radiosity) +ADD_SUBDIRECTORY(readblenfile) +ADD_SUBDIRECTORY(render) +ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(yafray) IF(WITH_INTERNATIONAL) - SUBDIRS(ftfont) + ADD_SUBDIRECTORY(ftfont) ENDIF(WITH_INTERNATIONAL) IF(WITH_OPENEXR) - SUBDIRS(imbuf/intern/openexr) + ADD_SUBDIRECTORY(imbuf/intern/openexr) ENDIF(WITH_OPENEXR) IF(WITH_DDS) - SUBDIRS(imbuf/intern/dds) + ADD_SUBDIRECTORY(imbuf/intern/dds) ENDIF(WITH_DDS) IF(WITH_QUICKTIME) - SUBDIRS(quicktime) + ADD_SUBDIRECTORY(quicktime) ENDIF(WITH_QUICKTIME) diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 27be1b45779..3a8058b2b21 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -66,7 +66,7 @@ IF(WITH_FFMPEG) ENDIF(WITH_FFMPEG) IF(WITH_PLAYER) - SUBDIRS(bad_level_call_stubs) + ADD_SUBDIRECTORY(bad_level_call_stubs) ENDIF(WITH_PLAYER) BLENDERLIB(bf_blenkernel "${SRC}" "${INC}") diff --git a/source/blender/makesdna/CMakeLists.txt b/source/blender/makesdna/CMakeLists.txt index a1afa37e5e6..1f8ab831ba6 100644 --- a/source/blender/makesdna/CMakeLists.txt +++ b/source/blender/makesdna/CMakeLists.txt @@ -24,4 +24,4 @@ # # ***** END GPL LICENSE BLOCK ***** -SUBDIRS(intern) +ADD_SUBDIRECTORY(intern) diff --git a/source/gameengine/CMakeLists.txt b/source/gameengine/CMakeLists.txt index 3ea788791e2..fd05858710d 100644 --- a/source/gameengine/CMakeLists.txt +++ b/source/gameengine/CMakeLists.txt @@ -24,25 +24,23 @@ # # ***** END GPL LICENSE BLOCK ***** -SUBDIRS( - BlenderRoutines - Converter - Expressions - GameLogic - Ketsji - Ketsji/KXNetwork - Network - Network/LoopBackNetwork - Physics/common - Physics/Dummy - Rasterizer - Rasterizer/RAS_OpenGLRasterizer - SceneGraph - Physics/Bullet - Physics/Sumo - VideoTexture -) +ADD_SUBDIRECTORY(BlenderRoutines) +ADD_SUBDIRECTORY(Converter) +ADD_SUBDIRECTORY(Expressions) +ADD_SUBDIRECTORY(GameLogic) +ADD_SUBDIRECTORY(Ketsji) +ADD_SUBDIRECTORY(Ketsji/KXNetwork) +ADD_SUBDIRECTORY(Network) +ADD_SUBDIRECTORY(Network/LoopBackNetwork) +ADD_SUBDIRECTORY(Physics/common) +ADD_SUBDIRECTORY(Physics/Dummy) +ADD_SUBDIRECTORY(Rasterizer) +ADD_SUBDIRECTORY(Rasterizer/RAS_OpenGLRasterizer) +ADD_SUBDIRECTORY(SceneGraph) +ADD_SUBDIRECTORY(Physics/Bullet) +ADD_SUBDIRECTORY(Physics/Sumo) +ADD_SUBDIRECTORY(VideoTexture) IF(WITH_PLAYER) - SUBDIRS(GamePlayer) + ADD_SUBDIRECTORY(GamePlayer) ENDIF(WITH_PLAYER) diff --git a/source/gameengine/GamePlayer/CMakeLists.txt b/source/gameengine/GamePlayer/CMakeLists.txt index fc5912155cf..134f8fce3b2 100644 --- a/source/gameengine/GamePlayer/CMakeLists.txt +++ b/source/gameengine/GamePlayer/CMakeLists.txt @@ -24,8 +24,9 @@ # # ***** END GPL LICENSE BLOCK ***** -SUBDIRS(common ghost) +ADD_SUBDIRECTORY(common) +ADD_SUBDIRECTORY(ghost) IF(WITH_WEBPLUGIN) - SUBDIRS(xembed) + ADD_SUBDIRECTORY(xembed) ENDIF(WITH_WEBPLUGIN) |