From afacd184982e58a9c830a3d5366e25983939a7ba Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 8 Dec 2010 08:43:06 +0000 Subject: use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed. --- source/blender/editors/CMakeLists.txt | 72 +++++++++++----------- source/blender/editors/animation/CMakeLists.txt | 6 +- source/blender/editors/armature/CMakeLists.txt | 6 +- source/blender/editors/curve/CMakeLists.txt | 6 +- source/blender/editors/datafiles/CMakeLists.txt | 6 +- source/blender/editors/gpencil/CMakeLists.txt | 6 +- source/blender/editors/interface/CMakeLists.txt | 18 +++--- source/blender/editors/mesh/CMakeLists.txt | 6 +- source/blender/editors/metaball/CMakeLists.txt | 6 +- source/blender/editors/object/CMakeLists.txt | 12 ++-- source/blender/editors/physics/CMakeLists.txt | 18 +++--- source/blender/editors/render/CMakeLists.txt | 20 +++--- source/blender/editors/screen/CMakeLists.txt | 6 +- source/blender/editors/sculpt_paint/CMakeLists.txt | 6 +- source/blender/editors/sound/CMakeLists.txt | 6 +- source/blender/editors/space_action/CMakeLists.txt | 6 +- source/blender/editors/space_api/CMakeLists.txt | 6 +- .../blender/editors/space_buttons/CMakeLists.txt | 6 +- .../blender/editors/space_console/CMakeLists.txt | 12 ++-- source/blender/editors/space_file/CMakeLists.txt | 42 ++++++------- source/blender/editors/space_graph/CMakeLists.txt | 6 +- source/blender/editors/space_image/CMakeLists.txt | 38 ++++++------ source/blender/editors/space_info/CMakeLists.txt | 6 +- source/blender/editors/space_logic/CMakeLists.txt | 12 ++-- source/blender/editors/space_nla/CMakeLists.txt | 6 +- source/blender/editors/space_node/CMakeLists.txt | 6 +- .../blender/editors/space_outliner/CMakeLists.txt | 6 +- source/blender/editors/space_script/CMakeLists.txt | 14 ++--- .../blender/editors/space_sequencer/CMakeLists.txt | 6 +- source/blender/editors/space_sound/CMakeLists.txt | 6 +- source/blender/editors/space_text/CMakeLists.txt | 14 ++--- source/blender/editors/space_time/CMakeLists.txt | 6 +- .../blender/editors/space_userpref/CMakeLists.txt | 6 +- source/blender/editors/space_view3d/CMakeLists.txt | 16 ++--- source/blender/editors/transform/CMakeLists.txt | 6 +- source/blender/editors/util/CMakeLists.txt | 6 +- source/blender/editors/uvedit/CMakeLists.txt | 6 +- 37 files changed, 219 insertions(+), 219 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt index 5d3cee9a7a5..651cb66833d 100644 --- a/source/blender/editors/CMakeLists.txt +++ b/source/blender/editors/CMakeLists.txt @@ -19,39 +19,39 @@ # # ***** END GPL LICENSE BLOCK ***** -ADD_SUBDIRECTORY(animation) -ADD_SUBDIRECTORY(armature) -ADD_SUBDIRECTORY(curve) -ADD_SUBDIRECTORY(datafiles) -ADD_SUBDIRECTORY(gpencil) -ADD_SUBDIRECTORY(interface) -ADD_SUBDIRECTORY(mesh) -ADD_SUBDIRECTORY(metaball) -ADD_SUBDIRECTORY(object) -ADD_SUBDIRECTORY(physics) -ADD_SUBDIRECTORY(render) -ADD_SUBDIRECTORY(screen) -ADD_SUBDIRECTORY(sculpt_paint) -ADD_SUBDIRECTORY(sound) -ADD_SUBDIRECTORY(space_action) -ADD_SUBDIRECTORY(space_api) -ADD_SUBDIRECTORY(space_buttons) -ADD_SUBDIRECTORY(space_console) -ADD_SUBDIRECTORY(space_file) -ADD_SUBDIRECTORY(space_graph) -ADD_SUBDIRECTORY(space_image) -ADD_SUBDIRECTORY(space_info) -ADD_SUBDIRECTORY(space_logic) -ADD_SUBDIRECTORY(space_nla) -ADD_SUBDIRECTORY(space_node) -ADD_SUBDIRECTORY(space_outliner) -ADD_SUBDIRECTORY(space_script) -ADD_SUBDIRECTORY(space_sequencer) -ADD_SUBDIRECTORY(space_sound) -ADD_SUBDIRECTORY(space_text) -ADD_SUBDIRECTORY(space_time) -ADD_SUBDIRECTORY(space_userpref) -ADD_SUBDIRECTORY(space_view3d) -ADD_SUBDIRECTORY(transform) -ADD_SUBDIRECTORY(util) -ADD_SUBDIRECTORY(uvedit) +add_subdirectory(animation) +add_subdirectory(armature) +add_subdirectory(curve) +add_subdirectory(datafiles) +add_subdirectory(gpencil) +add_subdirectory(interface) +add_subdirectory(mesh) +add_subdirectory(metaball) +add_subdirectory(object) +add_subdirectory(physics) +add_subdirectory(render) +add_subdirectory(screen) +add_subdirectory(sculpt_paint) +add_subdirectory(sound) +add_subdirectory(space_action) +add_subdirectory(space_api) +add_subdirectory(space_buttons) +add_subdirectory(space_console) +add_subdirectory(space_file) +add_subdirectory(space_graph) +add_subdirectory(space_image) +add_subdirectory(space_info) +add_subdirectory(space_logic) +add_subdirectory(space_nla) +add_subdirectory(space_node) +add_subdirectory(space_outliner) +add_subdirectory(space_script) +add_subdirectory(space_sequencer) +add_subdirectory(space_sound) +add_subdirectory(space_text) +add_subdirectory(space_time) +add_subdirectory(space_userpref) +add_subdirectory(space_view3d) +add_subdirectory(transform) +add_subdirectory(util) +add_subdirectory(uvedit) diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt index 1e0a42fcd4e..64677282bf5 100644 --- a/source/blender/editors/animation/CMakeLists.txt +++ b/source/blender/editors/animation/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -29,7 +29,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC anim_channels_defines.c anim_channels_edit.c anim_deps.c @@ -49,4 +49,4 @@ SET(SRC anim_intern.h ) -BLENDERLIB(bf_editor_animation "${SRC}" "${INC}") +blenderlib(bf_editor_animation "${SRC}" "${INC}") diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt index e4243f77074..8db4d3b2d73 100644 --- a/source/blender/editors/armature/CMakeLists.txt +++ b/source/blender/editors/armature/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -30,7 +30,7 @@ SET(INC ../../../../intern/opennl/extern ) -SET(SRC +set(SRC armature_ops.c editarmature.c editarmature_generate.c @@ -50,4 +50,4 @@ SET(SRC reeb.h ) -BLENDERLIB(bf_editor_armature "${SRC}" "${INC}") +blenderlib(bf_editor_armature "${SRC}" "${INC}") diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt index 577a144805f..c828ed87497 100644 --- a/source/blender/editors/curve/CMakeLists.txt +++ b/source/blender/editors/curve/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -29,7 +29,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC curve_ops.c editcurve.c editfont.c @@ -38,4 +38,4 @@ SET(SRC curve_intern.h ) -BLENDERLIB(bf_editor_curve "${SRC}" "${INC}") +blenderlib(bf_editor_curve "${SRC}" "${INC}") diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 7683db8ab7a..df0c4331195 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -19,9 +19,9 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC "") +set(INC "") -SET(SRC +set(SRC Bfont.c add.png.c bfont.ttf.c @@ -60,4 +60,4 @@ SET(SRC vertexdraw.png.c ) -BLENDERLIB(bf_editor_datafiles "${SRC}" "${INC}") +blenderlib(bf_editor_datafiles "${SRC}" "${INC}") diff --git a/source/blender/editors/gpencil/CMakeLists.txt b/source/blender/editors/gpencil/CMakeLists.txt index 8e884149bb8..544ee83b83d 100644 --- a/source/blender/editors/gpencil/CMakeLists.txt +++ b/source/blender/editors/gpencil/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -30,7 +30,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC drawgpencil.c editaction_gpencil.c gpencil_buttons.c @@ -41,4 +41,4 @@ SET(SRC gpencil_intern.h ) -BLENDERLIB(bf_editor_gpencil "${SRC}" "${INC}") +blenderlib(bf_editor_gpencil "${SRC}" "${INC}") diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt index 80eddcfc08d..79fd3cc3b8e 100644 --- a/source/blender/editors/interface/CMakeLists.txt +++ b/source/blender/editors/interface/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenfont ../../blenkernel @@ -33,7 +33,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC interface.c interface_anim.c interface_draw.c @@ -54,12 +54,12 @@ SET(SRC interface_intern.h ) -IF(WITH_INTERNATIONAL) - ADD_DEFINITIONS(-DINTERNATIONAL) -ENDIF(WITH_INTERNATIONAL) +if(WITH_INTERNATIONAL) + add_definitions(-DINTERNATIONAL) +endif() -IF(WITH_PYTHON) - ADD_DEFINITIONS(-DWITH_PYTHON) -ENDIF(WITH_PYTHON) +if(WITH_PYTHON) + add_definitions(-DWITH_PYTHON) +endif() -BLENDERLIB(bf_editor_interface "${SRC}" "${INC}") +blenderlib(bf_editor_interface "${SRC}" "${INC}") diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt index 977cbb79b7f..7a15d3a9edb 100644 --- a/source/blender/editors/mesh/CMakeLists.txt +++ b/source/blender/editors/mesh/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -31,7 +31,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC editface.c editmesh.c editmesh_add.c @@ -47,4 +47,4 @@ SET(SRC mesh_intern.h ) -BLENDERLIB(bf_editor_mesh "${SRC}" "${INC}") +blenderlib(bf_editor_mesh "${SRC}" "${INC}") diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt index 82e287c3e69..f6a58f7812e 100644 --- a/source/blender/editors/metaball/CMakeLists.txt +++ b/source/blender/editors/metaball/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -30,11 +30,11 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC mball_edit.c mball_ops.c mball_intern.h ) -BLENDERLIB(bf_editor_metaball "${SRC}" "${INC}") +blenderlib(bf_editor_metaball "${SRC}" "${INC}") diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index 6fc06ab20c6..8aad3a1f6db 100644 --- a/source/blender/editors/object/CMakeLists.txt +++ b/source/blender/editors/object/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -34,7 +34,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC object_add.c object_bake.c object_constraint.c @@ -53,8 +53,8 @@ SET(SRC object_intern.h ) -IF(WITH_PYTHON) - ADD_DEFINITIONS(-DWITH_PYTHON) -ENDIF(WITH_PYTHON) +if(WITH_PYTHON) + add_definitions(-DWITH_PYTHON) +endif() -BLENDERLIB(bf_editor_object "${SRC}" "${INC}") +blenderlib(bf_editor_object "${SRC}" "${INC}") diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt index da7247e264a..911d1e90458 100644 --- a/source/blender/editors/physics/CMakeLists.txt +++ b/source/blender/editors/physics/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -30,7 +30,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC particle_boids.c particle_edit.c particle_object.c @@ -41,12 +41,12 @@ SET(SRC physics_intern.h ) -IF(NOT WITH_MOD_FLUID) - ADD_DEFINITIONS(-DDISABLE_ELBEEM) -ENDIF(NOT WITH_MOD_FLUID) +if(NOT WITH_MOD_FLUID) + add_definitions(-DDISABLE_ELBEEM) +endif() -IF(WITH_OPENMP) - ADD_DEFINITIONS(-DPARALLEL=1) -ENDIF(WITH_OPENMP) +if(WITH_OPENMP) + add_definitions(-DPARALLEL=1) +endif() -BLENDERLIB(bf_editor_physics "${SRC}" "${INC}") +blenderlib(bf_editor_physics "${SRC}" "${INC}") diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index 670fa55d998..2c3f4a78c8f 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenfont ../../blenkernel @@ -35,7 +35,7 @@ SET(INC ../../../../extern/glew/include ) -SET(SRC +set(SRC render_internal.c render_opengl.c render_ops.c @@ -45,13 +45,13 @@ SET(SRC render_intern.h ) -IF(WITH_CODEC_QUICKTIME) - LIST(APPEND INC ../../quicktime ${QUICKTIME_INC}) - ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_CODEC_QUICKTIME) +if(WITH_CODEC_QUICKTIME) + list(APPEND INC ../../quicktime ${QUICKTIME_INC}) + add_definitions(-DWITH_QUICKTIME) +endif() -IF(WITH_OPENMP) - ADD_DEFINITIONS(-DPARALLEL=1) -ENDIF(WITH_OPENMP) +if(WITH_OPENMP) + add_definitions(-DPARALLEL=1) +endif() -BLENDERLIB(bf_editor_render "${SRC}" "${INC}") +blenderlib(bf_editor_render "${SRC}" "${INC}") diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index a7483c60c85..0f81d4fb382 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenfont ../../blenkernel @@ -31,7 +31,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC area.c glutil.c screen_context.c @@ -42,4 +42,4 @@ SET(SRC screen_intern.h ) -BLENDERLIB(bf_editor_screen "${SRC}" "${INC}") +blenderlib(bf_editor_screen "${SRC}" "${INC}") diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index 5f5211368f2..bb6901288ff 100644 --- a/source/blender/editors/sculpt_paint/CMakeLists.txt +++ b/source/blender/editors/sculpt_paint/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../imbuf @@ -32,7 +32,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC paint_image.c paint_ops.c paint_stroke.c @@ -46,4 +46,4 @@ SET(SRC sculpt_intern.h ) -BLENDERLIB(bf_editor_sculpt_paint "${SRC}" "${INC}") +blenderlib(bf_editor_sculpt_paint "${SRC}" "${INC}") diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt index d1314f649ee..927632f5a98 100644 --- a/source/blender/editors/sound/CMakeLists.txt +++ b/source/blender/editors/sound/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -30,10 +30,10 @@ SET(INC ../../../../intern/audaspace/intern ) -SET(SRC +set(SRC sound_ops.c sound_intern.h ) -BLENDERLIB(bf_editor_sound "${SRC}" "${INC}") +blenderlib(bf_editor_sound "${SRC}" "${INC}") diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt index 44981a3177b..5bfd01d461c 100644 --- a/source/blender/editors/space_action/CMakeLists.txt +++ b/source/blender/editors/space_action/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -29,7 +29,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC action_draw.c action_edit.c action_ops.c @@ -39,4 +39,4 @@ SET(SRC action_intern.h ) -BLENDERLIB(bf_editor_space_action "${SRC}" "${INC}") +blenderlib(bf_editor_space_action "${SRC}" "${INC}") diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt index 5436d8207c5..fc20f8f9895 100644 --- a/source/blender/editors/space_api/CMakeLists.txt +++ b/source/blender/editors/space_api/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -29,9 +29,9 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC space.c spacetypes.c ) -BLENDERLIB(bf_editor_space_api "${SRC}" "${INC}") +blenderlib(bf_editor_space_api "${SRC}" "${INC}") diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt index 47152bea9f0..767536e3814 100644 --- a/source/blender/editors/space_buttons/CMakeLists.txt +++ b/source/blender/editors/space_buttons/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -29,7 +29,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC buttons_context.c buttons_header.c buttons_ops.c @@ -38,4 +38,4 @@ SET(SRC buttons_intern.h ) -BLENDERLIB(bf_editor_space_buttons "${SRC}" "${INC}") +blenderlib(bf_editor_space_buttons "${SRC}" "${INC}") diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt index 75eb20dfdc1..fe475b88092 100644 --- a/source/blender/editors/space_console/CMakeLists.txt +++ b/source/blender/editors/space_console/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenfont ../../blenkernel @@ -31,7 +31,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC console_draw.c console_ops.c space_console.c @@ -39,8 +39,8 @@ SET(SRC console_intern.h ) -IF(WITH_PYTHON) - ADD_DEFINITIONS(-DWITH_PYTHON) -ENDIF(WITH_PYTHON) +if(WITH_PYTHON) + add_definitions(-DWITH_PYTHON) +endif() -BLENDERLIB(bf_editor_space_console "${SRC}" "${INC}") +blenderlib(bf_editor_space_console "${SRC}" "${INC}") diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index d4e5d599c52..b4a70917ca8 100644 --- a/source/blender/editors/space_file/CMakeLists.txt +++ b/source/blender/editors/space_file/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenfont ../../blenkernel @@ -33,7 +33,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC file_draw.c file_ops.c file_panels.c @@ -47,28 +47,28 @@ SET(SRC fsmenu.h ) -IF(WITH_IMAGE_OPENEXR) - ADD_DEFINITIONS(-DWITH_OPENEXR) -ENDIF(WITH_IMAGE_OPENEXR) +if(WITH_IMAGE_OPENEXR) + add_definitions(-DWITH_OPENEXR) +endif() -IF(WITH_IMAGE_TIFF) - ADD_DEFINITIONS(-DWITH_TIFF) -ENDIF(WITH_IMAGE_TIFF) +if(WITH_IMAGE_TIFF) + add_definitions(-DWITH_TIFF) +endif() -IF(WITH_IMAGE_OPENJPEG) - ADD_DEFINITIONS(-DWITH_OPENJPEG) -ENDIF(WITH_IMAGE_OPENJPEG) +if(WITH_IMAGE_OPENJPEG) + add_definitions(-DWITH_OPENJPEG) +endif() -IF(WITH_IMAGE_DDS) - ADD_DEFINITIONS(-DWITH_DDS) -ENDIF(WITH_IMAGE_DDS) +if(WITH_IMAGE_DDS) + add_definitions(-DWITH_DDS) +endif() -IF(WITH_IMAGE_CINEON) - ADD_DEFINITIONS(-DWITH_CINEON) -ENDIF(WITH_IMAGE_CINEON) +if(WITH_IMAGE_CINEON) + add_definitions(-DWITH_CINEON) +endif() -IF(WITH_IMAGE_HDR) - ADD_DEFINITIONS(-DWITH_HDR) -ENDIF(WITH_IMAGE_HDR) +if(WITH_IMAGE_HDR) + add_definitions(-DWITH_HDR) +endif() -BLENDERLIB(bf_editor_space_file "${SRC}" "${INC}") +blenderlib(bf_editor_space_file "${SRC}" "${INC}") diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index 2c1bdbed210..248bc9c76c5 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -30,7 +30,7 @@ SET(INC ../../../../intern/audaspace/intern ) -SET(SRC +set(SRC graph_buttons.c graph_draw.c graph_edit.c @@ -42,4 +42,4 @@ SET(SRC graph_intern.h ) -BLENDERLIB(bf_editor_space_graph "${SRC}" "${INC}") +blenderlib(bf_editor_space_graph "${SRC}" "${INC}") diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index 67639539c40..31c2e9568ae 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenfont ../../blenkernel @@ -32,7 +32,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC image_buttons.c image_draw.c image_header.c @@ -43,25 +43,25 @@ SET(SRC image_intern.h ) -IF(WITH_IMAGE_OPENJPEG) - ADD_DEFINITIONS(-DWITH_OPENJPEG) -ENDIF(WITH_IMAGE_OPENJPEG) +if(WITH_IMAGE_OPENJPEG) + add_definitions(-DWITH_OPENJPEG) +endif() -IF(WITH_IMAGE_OPENEXR) - ADD_DEFINITIONS(-DWITH_OPENEXR) -ENDIF(WITH_IMAGE_OPENEXR) +if(WITH_IMAGE_OPENEXR) + add_definitions(-DWITH_OPENEXR) +endif() -IF(WITH_IMAGE_TIFF) - ADD_DEFINITIONS(-DWITH_TIFF) -ENDIF(WITH_IMAGE_TIFF) +if(WITH_IMAGE_TIFF) + add_definitions(-DWITH_TIFF) +endif() -IF(WITH_IMAGE_CINEON) - ADD_DEFINITIONS(-DWITH_CINEON) -ENDIF(WITH_IMAGE_CINEON) +if(WITH_IMAGE_CINEON) + add_definitions(-DWITH_CINEON) +endif() -IF(WITH_LCMS) - SET(INC ${INC} ${LCMS_INCLUDE_DIR}) - ADD_DEFINITIONS(-DWITH_LCMS) -ENDIF(WITH_LCMS) +if(WITH_LCMS) + set(INC ${INC} ${LCMS_INCLUDE_DIR}) + add_definitions(-DWITH_LCMS) +endif() -BLENDERLIB(bf_editor_space_image "${SRC}" "${INC}") +blenderlib(bf_editor_space_image "${SRC}" "${INC}") diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt index 4592a07ed85..69748041996 100644 --- a/source/blender/editors/space_info/CMakeLists.txt +++ b/source/blender/editors/space_info/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenfont ../../blenkernel @@ -31,7 +31,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC info_ops.c info_stats.c info_draw.c @@ -43,4 +43,4 @@ SET(SRC textview.h ) -BLENDERLIB(bf_editor_space_info "${SRC}" "${INC}") +blenderlib(bf_editor_space_info "${SRC}" "${INC}") diff --git a/source/blender/editors/space_logic/CMakeLists.txt b/source/blender/editors/space_logic/CMakeLists.txt index 7fcacb393af..18e546a61f5 100644 --- a/source/blender/editors/space_logic/CMakeLists.txt +++ b/source/blender/editors/space_logic/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -30,7 +30,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC logic_buttons.c logic_ops.c logic_window.c @@ -39,8 +39,8 @@ SET(SRC logic_intern.h ) -IF(WITH_GAMEENGINE) - ADD_DEFINITIONS(-DWITH_GAMEENGINE) -ENDIF(WITH_GAMEENGINE) +if(WITH_GAMEENGINE) + add_definitions(-DWITH_GAMEENGINE) +endif() -BLENDERLIB(bf_editor_space_logic "${SRC}" "${INC}") +blenderlib(bf_editor_space_logic "${SRC}" "${INC}") diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt index 82d32d80442..dcb09a1a654 100644 --- a/source/blender/editors/space_nla/CMakeLists.txt +++ b/source/blender/editors/space_nla/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -29,7 +29,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC nla_buttons.c nla_channels.c nla_draw.c @@ -41,4 +41,4 @@ SET(SRC nla_intern.h ) -BLENDERLIB(bf_editor_space_nla "${SRC}" "${INC}") +blenderlib(bf_editor_space_nla "${SRC}" "${INC}") diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt index 1513f688e2c..45b4341c99d 100644 --- a/source/blender/editors/space_node/CMakeLists.txt +++ b/source/blender/editors/space_node/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -33,7 +33,7 @@ SET(INC ../../../../intern/opennl/extern ) -SET(SRC +set(SRC drawnode.c node_buttons.c node_draw.c @@ -47,4 +47,4 @@ SET(SRC node_intern.h ) -BLENDERLIB(bf_editor_space_node "${SRC}" "${INC}") +blenderlib(bf_editor_space_node "${SRC}" "${INC}") diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt index b9383ef6388..dc8e944dbca 100644 --- a/source/blender/editors/space_outliner/CMakeLists.txt +++ b/source/blender/editors/space_outliner/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -31,7 +31,7 @@ SET(INC ../../../../intern/opennl/extern ) -SET(SRC +set(SRC outliner.c outliner_ops.c space_outliner.c @@ -39,4 +39,4 @@ SET(SRC outliner_intern.h ) -BLENDERLIB(bf_editor_space_outliner "${SRC}" "${INC}") +blenderlib(bf_editor_space_outliner "${SRC}" "${INC}") diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt index da4f90a103f..849c4ee4dcd 100644 --- a/source/blender/editors/space_script/CMakeLists.txt +++ b/source/blender/editors/space_script/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -29,7 +29,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC script_edit.c script_header.c script_ops.c @@ -38,9 +38,9 @@ SET(SRC script_intern.h ) -IF(WITH_PYTHON) - LIST(APPEND INC ${PYTHON_INC} ../../python) - ADD_DEFINITIONS(-DWITH_PYTHON) -ENDIF(WITH_PYTHON) +if(WITH_PYTHON) + list(APPEND INC ${PYTHON_INC} ../../python) + add_definitions(-DWITH_PYTHON) +endif() -BLENDERLIB(bf_editor_space_script "${SRC}" "${INC}") +blenderlib(bf_editor_space_script "${SRC}" "${INC}") diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index 0fe9cc3580b..721d19a37cf 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -31,7 +31,7 @@ SET(INC ../../../../intern/audaspace/intern ) -SET(SRC +set(SRC sequencer_add.c sequencer_buttons.c sequencer_draw.c @@ -44,4 +44,4 @@ SET(SRC sequencer_intern.h ) -BLENDERLIB(bf_editor_space_sequencer "${SRC}" "${INC}") +blenderlib(bf_editor_space_sequencer "${SRC}" "${INC}") diff --git a/source/blender/editors/space_sound/CMakeLists.txt b/source/blender/editors/space_sound/CMakeLists.txt index 90a522b8f3f..bd60c0feb01 100644 --- a/source/blender/editors/space_sound/CMakeLists.txt +++ b/source/blender/editors/space_sound/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -29,11 +29,11 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC sound_header.c space_sound.c sound_intern.h ) -BLENDERLIB(bf_editor_space_sound "${SRC}" "${INC}") +blenderlib(bf_editor_space_sound "${SRC}" "${INC}") diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt index acfb2f315f8..86e2f3f3ac5 100644 --- a/source/blender/editors/space_text/CMakeLists.txt +++ b/source/blender/editors/space_text/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenfont ../../blenkernel @@ -30,7 +30,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC space_text.c text_draw.c text_header.c @@ -40,9 +40,9 @@ SET(SRC text_intern.h ) -IF(WITH_PYTHON) - LIST(APPEND INC ${PYTHON_INC} ../../python) - ADD_DEFINITIONS(-DWITH_PYTHON) -ENDIF(WITH_PYTHON) +if(WITH_PYTHON) + list(APPEND INC ${PYTHON_INC} ../../python) + add_definitions(-DWITH_PYTHON) +endif() -BLENDERLIB(bf_editor_text "${SRC}" "${INC}") +blenderlib(bf_editor_text "${SRC}" "${INC}") diff --git a/source/blender/editors/space_time/CMakeLists.txt b/source/blender/editors/space_time/CMakeLists.txt index ad1df116081..cbfce4c5cc2 100644 --- a/source/blender/editors/space_time/CMakeLists.txt +++ b/source/blender/editors/space_time/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -29,11 +29,11 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC space_time.c time_ops.c time_intern.h ) -BLENDERLIB(bf_editor_space_time "${SRC}" "${INC}") +blenderlib(bf_editor_space_time "${SRC}" "${INC}") diff --git a/source/blender/editors/space_userpref/CMakeLists.txt b/source/blender/editors/space_userpref/CMakeLists.txt index d90092f75d0..15ae90056b1 100644 --- a/source/blender/editors/space_userpref/CMakeLists.txt +++ b/source/blender/editors/space_userpref/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -29,11 +29,11 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC space_userpref.c userpref_ops.c userpref_intern.h ) -BLENDERLIB(bf_editor_space_userpref "${SRC}" "${INC}") +blenderlib(bf_editor_space_userpref "${SRC}" "${INC}") diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index 36bc9c037a8..0e4c9ca6aa3 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenfont ../../blenkernel @@ -34,7 +34,7 @@ SET(INC ../../../../intern/smoke/extern ) -SET(SRC +set(SRC drawanimviz.c drawarmature.c drawmesh.c @@ -55,11 +55,11 @@ SET(SRC view3d_intern.h ) -IF(WITH_GAMEENGINE) - LIST(APPEND INC ../../../kernel/gen_system) - ADD_DEFINITIONS(-DWITH_GAMEENGINE) -ENDIF(WITH_GAMEENGINE) +if(WITH_GAMEENGINE) + list(APPEND INC ../../../kernel/gen_system) + add_definitions(-DWITH_GAMEENGINE) +endif() -ADD_DEFINITIONS(-DGLEW_STATIC) +add_definitions(-DGLEW_STATIC) -BLENDERLIB(bf_editor_space_view3d "${SRC}" "${INC}") +blenderlib(bf_editor_space_view3d "${SRC}" "${INC}") diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt index 6f4d1ff3aaa..5e759bf1ee0 100644 --- a/source/blender/editors/transform/CMakeLists.txt +++ b/source/blender/editors/transform/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -29,7 +29,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC transform.c transform_constraints.c transform_conversions.c @@ -44,4 +44,4 @@ SET(SRC transform.h ) -BLENDERLIB(bf_editor_transform "${SRC}" "${INC}") +blenderlib(bf_editor_transform "${SRC}" "${INC}") diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index 65b52b876fa..61ba1bb6c74 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -29,7 +29,7 @@ SET(INC ../../../../intern/guardedalloc ) -SET(SRC +set(SRC ed_util.c editmode_undo.c numinput.c @@ -82,4 +82,4 @@ SET(SRC ../include/UI_view2d.h ) -BLENDERLIB(bf_editor_util "${SRC}" "${INC}") +blenderlib(bf_editor_util "${SRC}" "${INC}") diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt index 1cec055eb7f..92ee3bea8d5 100644 --- a/source/blender/editors/uvedit/CMakeLists.txt +++ b/source/blender/editors/uvedit/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../include ../../blenkernel ../../blenlib @@ -30,7 +30,7 @@ SET(INC ../../../../intern/opennl/extern ) -SET(SRC +set(SRC uvedit_draw.c uvedit_ops.c uvedit_parametrizer.c @@ -40,4 +40,4 @@ SET(SRC uvedit_parametrizer.h ) -BLENDERLIB(bf_editor_uvedit "${SRC}" "${INC}") +blenderlib(bf_editor_uvedit "${SRC}" "${INC}") -- cgit v1.2.3