diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-06-06 17:32:58 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-06-06 17:32:58 +0400 |
commit | d153c765bcfcdda8686e42dd044e63e832974709 (patch) | |
tree | b6f6ca79dce937ccbc74c68ddad12ba6edb26ffb /source | |
parent | b4f12db4ec517fa9cb03f93b84da26ebf849e018 (diff) |
CMake:
- WITH_LCMS added option, was supported in scons.
- commented web plugin option since its not maintained.
- some formatting changes and removed includes that are not needed for source/creator/CMakeLists.txt.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 5 | ||||
-rw-r--r-- | source/blender/editors/space_image/CMakeLists.txt | 5 | ||||
-rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 35 | ||||
-rw-r--r-- | source/creator/CMakeLists.txt | 9 |
4 files changed, 39 insertions, 15 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 68684bcc0a1..bcd60154379 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -72,6 +72,11 @@ IF(WITH_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG) ENDIF(WITH_FFMPEG) +IF(WITH_LCMS) + SET(INC ${INC} ${LCMS_INCLUDE_DIR}) + ADD_DEFINITIONS(-DWITH_LCMS) +ENDIF(WITH_LCMS) + IF(WITH_PYTHON) SET(INC ${INC} ../python ${PYTHON_INC}) ELSE(WITH_PYTHON) diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index 34c7c774774..71eebdb9b1e 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -41,6 +41,11 @@ IF(WITH_TIFF) ADD_DEFINITIONS(-DWITH_TIFF) ENDIF(WITH_TIFF) +IF(WITH_LCMS) + SET(INC ${INC} ${LCMS_INCLUDE_DIR}) + ADD_DEFINITIONS(-DWITH_LCMS) +ENDIF(WITH_LCMS) + IF(WIN32) SET(INC ${INC} ${PTHREADS_INC}) ENDIF(WIN32) diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index e9fc5c10f9e..9b824279d8d 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -32,14 +32,28 @@ 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(SRC - makesrna.c - rna_define.c - ${DEFSRC} - ${APISRC} - ../../../../intern/guardedalloc/intern/mallocn.c - ../../../../intern/guardedalloc/intern/mmap_win.c) - -INCLUDE_DIRECTORIES(../../../../intern/audaspace/intern ../../../../intern/guardedalloc .. ../../makesdna ../../blenkernel ../../blenlib ../../ikplugin ../../windowmanager ../../editors/include ../../gpu ../../imbuf ../../render/extern/include .) + makesrna.c + rna_define.c + ${DEFSRC} + ${APISRC} + ../../../../intern/guardedalloc/intern/mallocn.c + ../../../../intern/guardedalloc/intern/mmap_win.c) + +INCLUDE_DIRECTORIES( + ../../../../intern/audaspace/intern + ../../../../intern/guardedalloc + .. + ../../makesdna + ../../blenkernel + ../../blenlib + ../../ikplugin + ../../windowmanager + ../../editors/include + ../../gpu + ../../imbuf + ../../render/extern/include + . ) + FILE(GLOB INC_FILES ../*.h ../../makesdna/*.h) IF(NOT WITH_PYTHON) @@ -80,6 +94,11 @@ IF(WITH_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG) ENDIF(WITH_FFMPEG) +IF(WITH_LCMS) + SET(INC ${INC} ${LCMS_INCLUDE_DIR}) + ADD_DEFINITIONS(-DWITH_LCMS) +ENDIF(WITH_LCMS) + IF(NOT WITH_ELBEEM) ADD_DEFINITIONS(-DDISABLE_ELBEEM) ENDIF(NOT WITH_ELBEEM) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 97a85b5b70b..11997550ee1 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -29,24 +29,19 @@ CMAKE_POLICY(SET CMP0005 NEW) SETUP_LIBDIRS() -INCLUDE_DIRECTORIES(../../intern/guardedalloc +INCLUDE_DIRECTORIES( + ../../intern/guardedalloc ../blender/blenlib ../blender/blenkernel ../blender/editors/include ../blender/makesrna - ../blender/makesrna/intern - ../blender/nodes - ../blender/include - ../blender/blenloader ../blender/imbuf - ../blender/renderconverter ../blender/render/extern/include ../blender/makesdna ../blender/gpu ../blender/windowmanager ../kernel/gen_messaging ../kernel/gen_system - ../../extern/glew/include ) IF(WIN32) |