diff options
Diffstat (limited to 'source/blender')
65 files changed, 598 insertions, 598 deletions
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index 470f395353c..c1696b14232 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -24,45 +24,45 @@ # # ***** END GPL LICENSE BLOCK ***** -ADD_SUBDIRECTORY(editors) -ADD_SUBDIRECTORY(windowmanager) -ADD_SUBDIRECTORY(blenkernel) -ADD_SUBDIRECTORY(blenlib) -ADD_SUBDIRECTORY(render) -ADD_SUBDIRECTORY(blenfont) -ADD_SUBDIRECTORY(blenloader) -ADD_SUBDIRECTORY(readblenfile) -ADD_SUBDIRECTORY(blenpluginapi) -ADD_SUBDIRECTORY(ikplugin) -ADD_SUBDIRECTORY(gpu) -ADD_SUBDIRECTORY(imbuf) -ADD_SUBDIRECTORY(avi) -ADD_SUBDIRECTORY(nodes) -ADD_SUBDIRECTORY(modifiers) -ADD_SUBDIRECTORY(makesdna) -ADD_SUBDIRECTORY(makesrna) +add_subdirectory(editors) +add_subdirectory(windowmanager) +add_subdirectory(blenkernel) +add_subdirectory(blenlib) +add_subdirectory(render) +add_subdirectory(blenfont) +add_subdirectory(blenloader) +add_subdirectory(readblenfile) +add_subdirectory(blenpluginapi) +add_subdirectory(ikplugin) +add_subdirectory(gpu) +add_subdirectory(imbuf) +add_subdirectory(avi) +add_subdirectory(nodes) +add_subdirectory(modifiers) +add_subdirectory(makesdna) +add_subdirectory(makesrna) -IF(WITH_IMAGE_OPENEXR) - ADD_SUBDIRECTORY(imbuf/intern/openexr) -ENDIF(WITH_IMAGE_OPENEXR) +if(WITH_IMAGE_OPENEXR) + add_subdirectory(imbuf/intern/openexr) +endif() -IF(WITH_IMAGE_DDS) - ADD_SUBDIRECTORY(imbuf/intern/dds) -ENDIF(WITH_IMAGE_DDS) +if(WITH_IMAGE_DDS) + add_subdirectory(imbuf/intern/dds) +endif() -IF(WITH_IMAGE_CINEON) - ADD_SUBDIRECTORY(imbuf/intern/cineon) -ENDIF(WITH_IMAGE_CINEON) +if(WITH_IMAGE_CINEON) + add_subdirectory(imbuf/intern/cineon) +endif() -IF(WITH_CODEC_QUICKTIME) - ADD_SUBDIRECTORY(quicktime) -ENDIF(WITH_CODEC_QUICKTIME) +if(WITH_CODEC_QUICKTIME) + add_subdirectory(quicktime) +endif() -IF(WITH_PYTHON) - ADD_SUBDIRECTORY(python) -ENDIF(WITH_PYTHON) +if(WITH_PYTHON) + add_subdirectory(python) +endif() -IF(WITH_OPENCOLLADA) - ADD_SUBDIRECTORY(collada) -ENDIF(WITH_OPENCOLLADA) +if(WITH_OPENCOLLADA) + add_subdirectory(collada) +endif() diff --git a/source/blender/avi/CMakeLists.txt b/source/blender/avi/CMakeLists.txt index 917b2a8e3b0..376c1147a71 100644 --- a/source/blender/avi/CMakeLists.txt +++ b/source/blender/avi/CMakeLists.txt @@ -24,13 +24,13 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../../../intern/guardedalloc ${JPEG_INC} ) -SET(SRC +set(SRC intern/avi.c intern/avirgb.c intern/codecs.c @@ -47,4 +47,4 @@ SET(SRC intern/rgb32.h ) -BLENDERLIB(bf_avi "${SRC}" "${INC}") +blenderlib(bf_avi "${SRC}" "${INC}") diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index 202a8de687f..1dc546bd6d5 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -22,7 +22,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../blenlib ../makesdna @@ -33,7 +33,7 @@ SET(INC ${FREETYPE_INCLUDE_DIRS} ) -SET(SRC +set(SRC intern/blf.c intern/blf_dir.c intern/blf_font.c @@ -47,14 +47,14 @@ SET(SRC intern/blf_internal_types.h ) -IF(WITH_INTERNATIONAL) - LIST(APPEND INC ${GETTEXT_INC}) - ADD_DEFINITIONS(-DINTERNATIONAL) -ENDIF(WITH_INTERNATIONAL) +if(WITH_INTERNATIONAL) + list(APPEND INC ${GETTEXT_INC}) + add_definitions(-DINTERNATIONAL) +endif() -IF(WIN32 AND NOT UNIX) - ADD_DEFINITIONS(-DUSE_GETTEXT_DLL) -ENDIF(WIN32 AND NOT UNIX) +if(WIN32 AND NOT UNIX) + add_definitions(-DUSE_GETTEXT_DLL) +endif() -BLENDERLIB(bf_blenfont "${SRC}" "${INC}") +blenderlib(bf_blenfont "${SRC}" "${INC}") diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 583f0327e07..feeda03773b 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../avi ../blenlib @@ -52,7 +52,7 @@ SET(INC ${ZLIB_INC} ) -SET(SRC +set(SRC intern/BME_Customdata.c intern/BME_conversions.c intern/BME_eulers.c @@ -225,81 +225,81 @@ SET(SRC nla_private.h ) -ADD_DEFINITIONS(-DGLEW_STATIC) +add_definitions(-DGLEW_STATIC) -IF(WITH_BULLET) - LIST(APPEND INC ../../../extern/bullet2/src) - ADD_DEFINITIONS(-DUSE_BULLET) -ENDIF(WITH_BULLET) +if(WITH_BULLET) + list(APPEND INC ../../../extern/bullet2/src) + add_definitions(-DUSE_BULLET) +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_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() -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_CODEC_FFMPEG) - LIST(APPEND INC ${FFMPEG_INC}) - ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_CODEC_FFMPEG) +if(WITH_CODEC_FFMPEG) + list(APPEND INC ${FFMPEG_INC}) + add_definitions(-DWITH_FFMPEG) +endif() -IF(WITH_LCMS) - LIST(APPEND INC ${LCMS_INCLUDE_DIR}) - ADD_DEFINITIONS(-DWITH_LCMS) -ENDIF(WITH_LCMS) +if(WITH_LCMS) + list(APPEND INC ${LCMS_INCLUDE_DIR}) + add_definitions(-DWITH_LCMS) +endif() -IF(WITH_PYTHON) - LIST(APPEND INC ../python ${PYTHON_INC}) - ADD_DEFINITIONS(-DWITH_PYTHON) -ENDIF(WITH_PYTHON) +if(WITH_PYTHON) + list(APPEND INC ../python ${PYTHON_INC}) + add_definitions(-DWITH_PYTHON) +endif() -IF(WITH_OPENMP) - ADD_DEFINITIONS(-DPARALLEL=1) -ENDIF(WITH_OPENMP) +if(WITH_OPENMP) + add_definitions(-DPARALLEL=1) +endif() -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_JACK) - ADD_DEFINITIONS(-DWITH_JACK) -ENDIF(WITH_JACK) +if(WITH_JACK) + add_definitions(-DWITH_JACK) +endif() -IF(WITH_LZO) - LIST(APPEND INC ../../../extern/lzo/minilzo) - ADD_DEFINITIONS(-DWITH_LZO) -ENDIF(WITH_LZO) +if(WITH_LZO) + list(APPEND INC ../../../extern/lzo/minilzo) + add_definitions(-DWITH_LZO) +endif() -IF(WITH_LZMA) - LIST(APPEND INC ../../../extern/lzma) - ADD_DEFINITIONS(-DWITH_LZMA) -ENDIF(WITH_LZMA) +if(WITH_LZMA) + list(APPEND INC ../../../extern/lzma) + add_definitions(-DWITH_LZMA) +endif() -IF(MSVC) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") -ENDIF(MSVC) +if(MSVC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") +endif() -BLENDERLIB(bf_blenkernel "${SRC}" "${INC}") +blenderlib(bf_blenkernel "${SRC}" "${INC}") diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index a30cbebb539..a827c7879e1 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../makesdna ../blenkernel @@ -35,7 +35,7 @@ SET(INC ${FREETYPE_INCLUDE_DIRS} ) -SET(SRC +set(SRC intern/BLI_args.c intern/BLI_dynstr.c intern/BLI_ghash.c @@ -131,12 +131,12 @@ SET(SRC intern/dynamiclist.h ) -IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - LIST(APPEND INC "${BINRELOC_INC}") -ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") +if(CMAKE_SYSTEM_NAME MATCHES "Linux") + list(APPEND INC "${BINRELOC_INC}") +endif() -IF(WITH_OPENMP) - ADD_DEFINITIONS(-DPARALLEL=1) -ENDIF(WITH_OPENMP) +if(WITH_OPENMP) + add_definitions(-DPARALLEL=1) +endif() -BLENDERLIB(bf_blenlib "${SRC}" "${INC}") +blenderlib(bf_blenlib "${SRC}" "${INC}") diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index b84ee1df08d..2d80d565af1 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../blenlib ../blenkernel @@ -36,7 +36,7 @@ SET(INC ${ZLIB_INC} ) -SET(SRC +set(SRC intern/readblenentry.c intern/readfile.c intern/undofile.c @@ -50,4 +50,4 @@ SET(SRC intern/readfile.h ) -BLENDERLIB(bf_blenloader "${SRC}" "${INC}") +blenderlib(bf_blenloader "${SRC}" "${INC}") diff --git a/source/blender/blenpluginapi/CMakeLists.txt b/source/blender/blenpluginapi/CMakeLists.txt index 0e2e8526747..8005afc5615 100644 --- a/source/blender/blenpluginapi/CMakeLists.txt +++ b/source/blender/blenpluginapi/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . .. ../blenlib @@ -33,7 +33,7 @@ SET(INC ../../../intern/guardedalloc ) -SET(SRC +set(SRC intern/pluginapi.c documentation.h @@ -44,9 +44,9 @@ SET(SRC util.h ) -IF(WITH_CODEC_QUICKTIME) - LIST(APPEND INC ${QUICKTIME_INC}) - ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_CODEC_QUICKTIME) +if(WITH_CODEC_QUICKTIME) + list(APPEND INC ${QUICKTIME_INC}) + add_definitions(-DWITH_QUICKTIME) +endif() -BLENDERLIB(bf_blenpluginapi "${SRC}" "${INC}") +blenderlib(bf_blenpluginapi "${SRC}" "${INC}") diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt index 9d33885eb59..e0d53d2c2e4 100644 --- a/source/blender/collada/CMakeLists.txt +++ b/source/blender/collada/CMakeLists.txt @@ -24,9 +24,9 @@ # # ***** END GPL LICENSE BLOCK ***** -REMOVE_STRICT_FLAGS() +remove_strict_flags() -SET(INC +set(INC . ../blenlib ../blenkernel @@ -37,23 +37,23 @@ SET(INC ../../../intern/guardedalloc ) -IF(APPLE) - LIST(APPEND INC +if(APPLE) + list(APPEND INC ${OPENCOLLADA_INC}/COLLADAStreamWriter ${OPENCOLLADA_INC}/COLLADABaseUtils ${OPENCOLLADA_INC}/COLLADAFramework ${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader ) -ELSE(APPLE) - LIST(APPEND INC +else() + list(APPEND INC ${OPENCOLLADA_INC}/COLLADAStreamWriter/include ${OPENCOLLADA_INC}/COLLADABaseUtils/include ${OPENCOLLADA_INC}/COLLADAFramework/include ${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader/include ) -ENDIF(APPLE) +endif() -SET(SRC +set(SRC AnimationImporter.cpp ArmatureExporter.cpp ArmatureImporter.cpp @@ -95,8 +95,8 @@ SET(SRC collada_utils.h ) -IF(WITH_BUILDINFO) - ADD_DEFINITIONS(-DNAN_BUILDINFO) -ENDIF(WITH_BUILDINFO) +if(WITH_BUILDINFO) + add_definitions(-DNAN_BUILDINFO) +endif() -BLENDERLIB(bf_collada "${SRC}" "${INC}") +blenderlib(bf_collada "${SRC}" "${INC}") 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}") diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 63dedc75226..54257af6ea9 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../blenlib ../blenkernel @@ -36,7 +36,7 @@ SET(INC ../../../intern/smoke/extern ) -SET(SRC +set(SRC intern/gpu_buffers.c intern/gpu_codegen.c intern/gpu_draw.c @@ -52,7 +52,7 @@ SET(SRC intern/gpu_codegen.h ) -ADD_DEFINITIONS(-DGLEW_STATIC) +add_definitions(-DGLEW_STATIC) -BLENDERLIB(bf_gpu "${SRC}" "${INC}") +blenderlib(bf_gpu "${SRC}" "${INC}") diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt index 17e09b460af..78f362be117 100644 --- a/source/blender/ikplugin/CMakeLists.txt +++ b/source/blender/ikplugin/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../blenlib ../makesdna ../blenkernel @@ -33,7 +33,7 @@ SET(INC ../../../intern/iksolver/extern ) -SET(SRC +set(SRC intern/ikplugin_api.c intern/iksolver_plugin.c @@ -43,13 +43,13 @@ SET(SRC intern/itasc_plugin.h ) -IF(WITH_IK_ITASC) - ADD_DEFINITIONS(-DWITH_IK_ITASC) - LIST(APPEND INC ../../../extern/Eigen2) - LIST(APPEND INC ../../../intern/itasc) - LIST(APPEND SRC +if(WITH_IK_ITASC) + add_definitions(-DWITH_IK_ITASC) + list(APPEND INC ../../../extern/Eigen2) + list(APPEND INC ../../../intern/itasc) + list(APPEND SRC ./intern/itasc_plugin.cpp ) -ENDIF(WITH_IK_ITASC) +endif() -BLENDERLIB(bf_ikplugin "${SRC}" "${INC}") +blenderlib(bf_ikplugin "${SRC}" "${INC}") diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index e68b2d20fa3..866a702e43f 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../avi ../blenlib @@ -37,7 +37,7 @@ SET(INC ${ZLIB_INC} ) -SET(SRC +set(SRC intern/allocimbuf.c intern/anim_movie.c intern/bmp.c @@ -96,48 +96,48 @@ SET(SRC intern/openexr/openexr_multi.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) - LIST(APPEND INC ${TIFF_INCLUDE_DIR}) - ADD_DEFINITIONS(-DWITH_TIFF) -ENDIF(WITH_IMAGE_TIFF) +if(WITH_IMAGE_TIFF) + list(APPEND INC ${TIFF_INCLUDE_DIR}) + add_definitions(-DWITH_TIFF) +endif() -IF(WITH_IMAGE_OPENJPEG) - LIST(APPEND INC ${OPENJPEG_INC}) - ADD_DEFINITIONS(-DWITH_OPENJPEG) -ENDIF(WITH_IMAGE_OPENJPEG) +if(WITH_IMAGE_OPENJPEG) + list(APPEND INC ${OPENJPEG_INC}) + add_definitions(-DWITH_OPENJPEG) +endif() -IF(WITH_IMAGE_REDCODE) - LIST(APPEND INC ${REDCODE_INC}) - ADD_DEFINITIONS(-DWITH_REDCODE) -ENDIF(WITH_IMAGE_REDCODE) +if(WITH_IMAGE_REDCODE) + list(APPEND INC ${REDCODE_INC}) + add_definitions(-DWITH_REDCODE) +endif() -IF(WITH_CODEC_QUICKTIME) - LIST(APPEND INC +if(WITH_CODEC_QUICKTIME) + list(APPEND INC ../quicktime ${QUICKTIME_INC} ) - ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_CODEC_QUICKTIME) + add_definitions(-DWITH_QUICKTIME) +endif() -IF(WITH_CODEC_FFMPEG) - LIST(APPEND INC ${FFMPEG_INC}) - ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_CODEC_FFMPEG) +if(WITH_CODEC_FFMPEG) + list(APPEND INC ${FFMPEG_INC}) + add_definitions(-DWITH_FFMPEG) +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_imbuf "${SRC}" "${INC}") +blenderlib(bf_imbuf "${SRC}" "${INC}") diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt index f4754719761..d9cfc04cf8d 100644 --- a/source/blender/imbuf/intern/cineon/CMakeLists.txt +++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . .. ../../ @@ -34,7 +34,7 @@ SET(INC ../../../../../intern/guardedalloc ) -SET(SRC +set(SRC cineon_dpx.c cineonlib.c dpxlib.c @@ -43,4 +43,4 @@ SET(SRC logmemfile.c ) -BLENDERLIB(bf_imbuf_cineon "${SRC}" "${INC}") +blenderlib(bf_imbuf_cineon "${SRC}" "${INC}") diff --git a/source/blender/imbuf/intern/dds/CMakeLists.txt b/source/blender/imbuf/intern/dds/CMakeLists.txt index 5634368383d..44341c7e861 100644 --- a/source/blender/imbuf/intern/dds/CMakeLists.txt +++ b/source/blender/imbuf/intern/dds/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . .. ./intern/include @@ -35,7 +35,7 @@ SET(INC ../../../../../intern/guardedalloc ) -SET(SRC +set(SRC BlockDXT.cpp ColorBlock.cpp DirectDrawSurface.cpp @@ -45,7 +45,7 @@ SET(SRC ) if(WITH_IMAGE_DDS) - ADD_DEFINITIONS(-DWITH_DDS) -ENDIF(WITH_IMAGE_DDS) + add_definitions(-DWITH_DDS) +endif() -BLENDERLIB(bf_imbuf_dds "${SRC}" "${INC}") +blenderlib(bf_imbuf_dds "${SRC}" "${INC}") diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt index edea033bb3a..958abc4d1f6 100644 --- a/source/blender/imbuf/intern/openexr/CMakeLists.txt +++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../../../blenkernel ../../ @@ -36,12 +36,12 @@ SET(INC ${OPENEXR_INC} ) -SET(SRC +set(SRC openexr_api.cpp ) -IF(WITH_IMAGE_OPENEXR) - ADD_DEFINITIONS(-DWITH_OPENEXR) -ENDIF(WITH_IMAGE_OPENEXR) +if(WITH_IMAGE_OPENEXR) + add_definitions(-DWITH_OPENEXR) +endif() -BLENDERLIB(bf_imbuf_openexr "${SRC}" "${INC}") +blenderlib(bf_imbuf_openexr "${SRC}" "${INC}") diff --git a/source/blender/makesdna/CMakeLists.txt b/source/blender/makesdna/CMakeLists.txt index cb61082000d..e02b33b92c1 100644 --- a/source/blender/makesdna/CMakeLists.txt +++ b/source/blender/makesdna/CMakeLists.txt @@ -24,4 +24,4 @@ # # ***** END GPL LICENSE BLOCK ***** -ADD_SUBDIRECTORY(intern) +add_subdirectory(intern) diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index ca01b231982..8329c28d42e 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -24,21 +24,21 @@ # # ***** END GPL LICENSE BLOCK ***** -INCLUDE_DIRECTORIES(../../../../intern/guardedalloc ..) +include_directories(../../../../intern/guardedalloc ..) # Build makesdna executable -SET(SRC +set(SRC makesdna.c ../../../../intern/guardedalloc/intern/mallocn.c ) -IF(WIN32 AND NOT UNIX) - LIST(APPEND SRC +if(WIN32 AND NOT UNIX) + list(APPEND SRC ../../../../intern/guardedalloc/intern/mmap_win.c ) -ENDIF(WIN32 AND NOT UNIX) +endif() -SET(SRC_DNA_INC +set(SRC_DNA_INC ../DNA_ID.h ../DNA_action_types.h ../DNA_actuator_types.h @@ -98,22 +98,22 @@ SET(SRC_DNA_INC ../DNA_world_types.h ) -ADD_EXECUTABLE(makesdna ${SRC} ${SRC_DNA_INC}) +add_executable(makesdna ${SRC} ${SRC_DNA_INC}) # Output dna.c -ADD_CUSTOM_COMMAND( +add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_SOURCE_DIR}/source/blender/makesdna/ DEPENDS makesdna ) # Build bf_dna library -SET(SRC +set(SRC dna_genfile.c dna.c ${SRC_DNA_INC} ) -BLENDERLIB(bf_dna "${SRC}" "${INC}") +blenderlib(bf_dna "${SRC}" "${INC}") -MESSAGE(STATUS "Configuring makesdna") +message(STATUS "Configuring makesdna") diff --git a/source/blender/makesrna/CMakeLists.txt b/source/blender/makesrna/CMakeLists.txt index ec48240bfc5..540597da578 100644 --- a/source/blender/makesrna/CMakeLists.txt +++ b/source/blender/makesrna/CMakeLists.txt @@ -24,4 +24,4 @@ # # ***** END GPL LICENSE BLOCK ***** -ADD_SUBDIRECTORY(intern) +add_subdirectory(intern) diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index bf9ba2dcc70..3d189edb2f2 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -25,20 +25,20 @@ # ***** END GPL LICENSE BLOCK ***** # Generated code has some unused vars we can ignore. -REMOVE_STRICT_FLAGS() +remove_strict_flags() -MESSAGE(STATUS "Configuring makesrna") +message(STATUS "Configuring makesrna") -FILE(GLOB DEFSRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.c") -FILE(GLOB APISRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*_api.c") -LIST(REMOVE_ITEM DEFSRC rna_access.c rna_define.c makesrna.c) -LIST(REMOVE_ITEM DEFSRC ${APISRC}) +file(GLOB DEFSRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.c") +file(GLOB APISRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*_api.c") +list(REMOVE_ITEM DEFSRC rna_access.c rna_define.c makesrna.c) +list(REMOVE_ITEM DEFSRC ${APISRC}) -STRING(REGEX REPLACE "rna_([a-zA-Z0-9_-]*).c" "${CMAKE_CURRENT_BINARY_DIR}/rna_\\1_gen.c" GENSRC "${DEFSRC}") -SET_SOURCE_FILES_PROPERTIES(GENSRC PROPERTIES GENERATED true) +string(REGEX REPLACE "rna_([a-zA-Z0-9_-]*).c" "${CMAKE_CURRENT_BINARY_DIR}/rna_\\1_gen.c" GENSRC "${DEFSRC}") +set_source_files_properties(GENSRC PROPERTIES GENERATED true) -SET(SRC +set(SRC makesrna.c rna_define.c ${DEFSRC} @@ -47,7 +47,7 @@ SET(SRC ../../../../intern/guardedalloc/intern/mmap_win.c ) -INCLUDE_DIRECTORIES( +include_directories( ../../../../intern/audaspace/intern ../../../../intern/guardedalloc ../../../../intern/memutil @@ -66,93 +66,93 @@ INCLUDE_DIRECTORIES( . ) -FILE(GLOB INC_FILES ../*.h ../../makesdna/*.h) +file(GLOB INC_FILES ../*.h ../../makesdna/*.h) -IF(WITH_PYTHON) - ADD_DEFINITIONS(-DWITH_PYTHON) -ENDIF(WITH_PYTHON) +if(WITH_PYTHON) + add_definitions(-DWITH_PYTHON) +endif() -IF(WITH_GAMEENGINE) - ADD_DEFINITIONS(-DWITH_GAMEENGINE) -ENDIF(WITH_GAMEENGINE) +if(WITH_GAMEENGINE) + add_definitions(-DWITH_GAMEENGINE) +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_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() -IF(WITH_CODEC_QUICKTIME) - LIST(APPEND INC ../../quicktime) - ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_CODEC_QUICKTIME) +if(WITH_CODEC_QUICKTIME) + list(APPEND INC ../../quicktime) + add_definitions(-DWITH_QUICKTIME) +endif() -IF(WITH_CODEC_FFMPEG) - LIST(APPEND INC ${FFMPEG_INC}) - ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_CODEC_FFMPEG) +if(WITH_CODEC_FFMPEG) + list(APPEND INC ${FFMPEG_INC}) + add_definitions(-DWITH_FFMPEG) +endif() -IF(WITH_LCMS) - LIST(APPEND INC ${LCMS_INCLUDE_DIR}) - ADD_DEFINITIONS(-DWITH_LCMS) -ENDIF(WITH_LCMS) +if(WITH_LCMS) + list(APPEND INC ${LCMS_INCLUDE_DIR}) + add_definitions(-DWITH_LCMS) +endif() -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_FFTW3) - ADD_DEFINITIONS(-DFFTW3=1) -ENDIF(WITH_FFTW3) +if(WITH_FFTW3) + add_definitions(-DFFTW3=1) +endif() -IF(WITH_SDL) - ADD_DEFINITIONS(-DWITH_SDL) -ENDIF(WITH_SDL) +if(WITH_SDL) + add_definitions(-DWITH_SDL) +endif() -IF(WITH_OPENAL) - ADD_DEFINITIONS(-DWITH_OPENAL) -ENDIF(WITH_OPENAL) +if(WITH_OPENAL) + add_definitions(-DWITH_OPENAL) +endif() -IF(WITH_JACK) - ADD_DEFINITIONS(-DWITH_JACK) -ENDIF(WITH_JACK) +if(WITH_JACK) + add_definitions(-DWITH_JACK) +endif() -IF(WITH_OPENCOLLADA) - ADD_DEFINITIONS(-DWITH_COLLADA) -ENDIF(WITH_OPENCOLLADA) +if(WITH_OPENCOLLADA) + add_definitions(-DWITH_COLLADA) +endif() # Build makesrna executable -ADD_EXECUTABLE(makesrna ${SRC} ${INC_FILES}) -TARGET_LINK_LIBRARIES(makesrna bf_dna) +add_executable(makesrna ${SRC} ${INC_FILES}) +target_link_libraries(makesrna bf_dna) # Output rna_*_gen.c # note (linux only): with crashes try add this after COMMAND: valgrind --leak-check=full --track-origins=yes -ADD_CUSTOM_COMMAND( +add_custom_command( OUTPUT ${GENSRC} COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesrna ${CMAKE_CURRENT_BINARY_DIR}/ DEPENDS makesrna ) # Build bf_rna -SET(SRC +set(SRC rna_access.c ${GENSRC} @@ -166,4 +166,4 @@ SET(SRC rna_nodetree_types.h ) -BLENDERLIB(bf_rna "${SRC}" "${INC}") +blenderlib(bf_rna "${SRC}" "${INC}") diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 6bdb3fbc738..9748fadf1d2 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -473,7 +473,7 @@ static void rna_def_mtex(BlenderRNA *brna) prop= RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "r"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Color", "The default color for textures that don't return RGB"); + RNA_def_property_ui_text(prop, "Color", "The default color for textures that don't return RGB or when RGB to intensity is enabled"); RNA_def_property_update(prop, 0, "rna_TextureSlot_update"); prop= RNA_def_property(srna, "blend_type", PROP_ENUM, PROP_NONE); diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index c14787aeae7..5948c0cca91 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ./intern ../blenlib ../makesdna @@ -36,7 +36,7 @@ SET(INC ${ZLIB_INC} ) -SET(SRC +set(SRC intern/MOD_armature.c intern/MOD_array.c intern/MOD_bevel.c @@ -81,21 +81,21 @@ SET(SRC intern/MOD_util.h ) -IF(WITH_MOD_BOOLEAN) - ADD_DEFINITIONS(-DWITH_MOD_BOOLEAN) - LIST(APPEND SRC +if(WITH_MOD_BOOLEAN) + add_definitions(-DWITH_MOD_BOOLEAN) + list(APPEND SRC intern/MOD_boolean_util.c ) - LIST(APPEND INC ../../../intern/bsp/extern) -ENDIF(WITH_MOD_BOOLEAN) + list(APPEND INC ../../../intern/bsp/extern) +endif() -IF(WITH_MOD_DECIMATE) - ADD_DEFINITIONS(-DWITH_MOD_DECIMATE) - LIST(APPEND INC ../../../intern/decimation/extern) -ENDIF(WITH_MOD_DECIMATE) +if(WITH_MOD_DECIMATE) + add_definitions(-DWITH_MOD_DECIMATE) + list(APPEND INC ../../../intern/decimation/extern) +endif() -IF(NOT WITH_MOD_FLUID) - ADD_DEFINITIONS(-DDISABLE_ELBEEM) -ENDIF(NOT WITH_MOD_FLUID) +if(NOT WITH_MOD_FLUID) + add_definitions(-DDISABLE_ELBEEM) +endif() -BLENDERLIB(bf_modifiers "${SRC}" "${INC}") +blenderlib(bf_modifiers "${SRC}" "${INC}") diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 3628cb4f748..57c8f7bcad4 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -23,7 +23,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../blenkernel ../blenlib @@ -37,7 +37,7 @@ SET(INC ../../../extern/glew/include ) -SET(SRC +set(SRC intern/CMP_nodes/CMP_alphaOver.c intern/CMP_nodes/CMP_bilateralblur.c intern/CMP_nodes/CMP_blur.c @@ -148,10 +148,10 @@ SET(SRC intern/node_util.h ) -IF(WITH_PYTHON) - SET(INC ${INC} ../python ${PYTHON_INC}) - ADD_DEFINITIONS(-DWITH_PYTHON) -ENDIF(WITH_PYTHON) +if(WITH_PYTHON) + set(INC ${INC} ../python ${PYTHON_INC}) + add_definitions(-DWITH_PYTHON) +endif() -BLENDERLIB(bf_nodes "${SRC}" "${INC}") +blenderlib(bf_nodes "${SRC}" "${INC}") diff --git a/source/blender/python/CMakeLists.txt b/source/blender/python/CMakeLists.txt index b006e7b0be6..fe9e0307703 100644 --- a/source/blender/python/CMakeLists.txt +++ b/source/blender/python/CMakeLists.txt @@ -16,5 +16,5 @@ # # ***** END GPL LICENSE BLOCK ***** -ADD_SUBDIRECTORY(intern) -ADD_SUBDIRECTORY(generic) +add_subdirectory(intern) +add_subdirectory(generic) diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt index 5f5575f206b..5569dda2ce6 100644 --- a/source/blender/python/generic/CMakeLists.txt +++ b/source/blender/python/generic/CMakeLists.txt @@ -18,7 +18,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../../blenlib ../../makesdna @@ -28,7 +28,7 @@ SET(INC ${PYTHON_INC} ) -SET(SRC +set(SRC IDProp.c bgl.c blf_api.c @@ -57,4 +57,4 @@ SET(SRC py_capi_utils.h ) -BLENDERLIB(bf_python_ext "${SRC}" "${INC}") +blenderlib(bf_python_ext "${SRC}" "${INC}") diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index b0ef6efb7d4..86b2e0deb04 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -23,7 +23,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../ ../../blenlib ../../makesdna @@ -36,7 +36,7 @@ SET(INC ${PYTHON_INC} ) -SET(SRC +set(SRC bpy.c bpy_app.c bpy_driver.c @@ -62,8 +62,8 @@ SET(SRC ) # only to check if buildinfo is available -IF(WITH_BUILDINFO) - ADD_DEFINITIONS(-DBUILD_DATE) -ENDIF(WITH_BUILDINFO) +if(WITH_BUILDINFO) + add_definitions(-DBUILD_DATE) +endif() -BLENDERLIB(bf_python "${SRC}" "${INC}") +blenderlib(bf_python "${SRC}" "${INC}") diff --git a/source/blender/quicktime/CMakeLists.txt b/source/blender/quicktime/CMakeLists.txt index ebb6949e2ce..f5565153a01 100644 --- a/source/blender/quicktime/CMakeLists.txt +++ b/source/blender/quicktime/CMakeLists.txt @@ -24,25 +24,25 @@ # # ***** END GPL LICENSE BLOCK ***** -IF(USE_QTKIT) - SET(SRC +if(USE_QTKIT) + set(SRC apple/qtkit_import.m apple/qtkit_export.m quicktime_export.h quicktime_import.h ) -ELSE(USE_QTKIT) - SET(SRC +else() + set(SRC apple/quicktime_import.c apple/quicktime_export.c quicktime_export.h quicktime_import.h ) -ENDIF(USE_QTKIT) +endif() -SET(INC +set(INC . ../quicktime ../makesdna @@ -61,6 +61,6 @@ SET(INC ${QUICKTIME_INC} ) -ADD_DEFINITIONS(-DWITH_QUICKTIME) +add_definitions(-DWITH_QUICKTIME) -BLENDERLIB(bf_quicktime "${SRC}" "${INC}") +blenderlib(bf_quicktime "${SRC}" "${INC}") diff --git a/source/blender/readblenfile/CMakeLists.txt b/source/blender/readblenfile/CMakeLists.txt index 11128274e20..b6549338fbb 100644 --- a/source/blender/readblenfile/CMakeLists.txt +++ b/source/blender/readblenfile/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../blenloader ../blenloader/intern @@ -34,10 +34,10 @@ SET(INC ../../kernel/gen_messaging ) -SET(SRC +set(SRC intern/BLO_readblenfile.c BLO_readblenfile.h ) -BLENDERLIB(bf_readblenfile "${SRC}" "${INC}") +blenderlib(bf_readblenfile "${SRC}" "${INC}") diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index fd3621a4cf8..779d8982926 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -25,9 +25,9 @@ # ***** END GPL LICENSE BLOCK ***** # remove warning until render branch merged. -REMOVE_STRICT_FLAGS() +remove_strict_flags() -SET(INC +set(INC intern/include extern/include ../blenlib @@ -41,7 +41,7 @@ SET(INC ../../../intern/guardedalloc ) -SET(SRC +set(SRC intern/raytrace/rayobject.cpp intern/raytrace/rayobject_qbvh.cpp intern/raytrace/rayobject_rtbuild.cpp @@ -111,20 +111,20 @@ SET(SRC intern/raytrace/vbvh.h ) -IF(WITH_IMAGE_OPENEXR) - ADD_DEFINITIONS(-DWITH_OPENEXR) -ENDIF(WITH_IMAGE_OPENEXR) +if(WITH_IMAGE_OPENEXR) + add_definitions(-DWITH_OPENEXR) +endif() -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(APPLE) - IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse") - ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") -ENDIF(APPLE) +if(APPLE) + if(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse") + endif() +endif() -BLENDERLIB_NOLIST(bf_render "${SRC}" "${INC}") +blenderlib_nolist(bf_render "${SRC}" "${INC}") diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index b6920a02bfa..8f91011b210 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../nodes ../gpu @@ -47,7 +47,7 @@ SET(INC ${OPENGL_INCLUDE_DIR} ) -SET(SRC +set(SRC intern/wm.c intern/wm_apple.c intern/wm_cursors.c @@ -75,41 +75,41 @@ SET(SRC wm_window.h ) -ADD_DEFINITIONS(-DGLEW_STATIC) +add_definitions(-DGLEW_STATIC) -IF(WITH_INTERNATIONAL) - ADD_DEFINITIONS(-DINTERNATIONAL) -ENDIF(WITH_INTERNATIONAL) +if(WITH_INTERNATIONAL) + add_definitions(-DINTERNATIONAL) +endif() -IF(WITH_OPENCOLLADA) - ADD_DEFINITIONS(-DWITH_COLLADA) -ENDIF(WITH_OPENCOLLADA) +if(WITH_OPENCOLLADA) + add_definitions(-DWITH_COLLADA) +endif() -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_CODEC_FFMPEG) - LIST(APPEND INC ${FFMPEG_INC}) - ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_CODEC_FFMPEG) +if(WITH_CODEC_FFMPEG) + list(APPEND INC ${FFMPEG_INC}) + add_definitions(-DWITH_FFMPEG) +endif() -IF(WITH_PYTHON) - LIST(APPEND INC ../python ${PYTHON_INC}) - ADD_DEFINITIONS(-DWITH_PYTHON) -ENDIF(WITH_PYTHON) +if(WITH_PYTHON) + list(APPEND INC ../python ${PYTHON_INC}) + add_definitions(-DWITH_PYTHON) +endif() -IF(WITH_GAMEENGINE) - ADD_DEFINITIONS(-DWITH_GAMEENGINE) -ENDIF(WITH_GAMEENGINE) +if(WITH_GAMEENGINE) + add_definitions(-DWITH_GAMEENGINE) +endif() -IF(WITH_COCOA) - LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/wm_apple.c") -ENDIF(WITH_COCOA) +if(WITH_COCOA) + list(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/wm_apple.c") +endif() -IF(WITH_BUILDINFO) - ADD_DEFINITIONS(-DNAN_BUILDINFO) -ENDIF(WITH_BUILDINFO) +if(WITH_BUILDINFO) + add_definitions(-DNAN_BUILDINFO) +endif() -BLENDERLIB_NOLIST(bf_windowmanager "${SRC}" "${INC}") +blenderlib_nolist(bf_windowmanager "${SRC}" "${INC}") |