From 360235a5f4ce9b56b3790e2c294662a09b5528e4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 19 Aug 2009 07:48:56 +0000 Subject: cmake cleanup (remove unused includes, make some within IF checks) --- source/blender/editors/CMakeLists.txt | 6 +++--- source/blender/editors/screen/CMakeLists.txt | 5 ++--- source/blender/imbuf/CMakeLists.txt | 4 ++-- source/blender/nodes/CMakeLists.txt | 4 ++-- source/blender/render/CMakeLists.txt | 6 +++--- source/blender/windowmanager/CMakeLists.txt | 6 +++--- 6 files changed, 15 insertions(+), 16 deletions(-) (limited to 'source/blender') diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt index 96b6fa5b7ab..c40b18ea099 100644 --- a/source/blender/editors/CMakeLists.txt +++ b/source/blender/editors/CMakeLists.txt @@ -31,10 +31,10 @@ SET(INC ../windowmanager ../../../intern/guardedalloc ../../../intern/memutil ../blenlib ../makesdna ../makesrna ../blenkernel ../include ../imbuf ../render/extern/include - ../../../intern/bsp/extern ../radiosity/extern/include + ../../../intern/bsp/extern ../../../intern/decimation/extern ../blenloader ../python ../../kernel/gen_system ../readstreamglue - ../quicktime ../../../intern/elbeem/extern + ../../../intern/elbeem/extern ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include ../../../intern/smoke/extern ../../../intern/audaspace/intern ../nodes @@ -59,7 +59,7 @@ IF(WITH_OPENJPEG) ENDIF(WITH_OPENJPEG) IF(WITH_QUICKTIME) - SET(INC ${INC} ${QUICKTIME_INC}) + SET(INC ${INC} ../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) ENDIF(WITH_QUICKTIME) diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index 6861f82ac3f..7429f45c00f 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -35,10 +35,9 @@ SET(INC ../../windowmanager ../../blenlib ../../makesdna ../../makesrna ../../blenkernel ../../include ../../imbuf ../../render/extern/include ../../../../intern/bsp/extern - ../../radiosity/extern/include ../../../intern/decimation/extern ../../blenloader ../../../kernel/gen_system ../../readstreamglue - ../../quicktime ../../../../intern/elbeem/extern + ../../../../intern/elbeem/extern ../../../../intern/ghost ../../../../intern/opennl/extern ../../nodes ) @@ -52,7 +51,7 @@ IF(WITH_OPENEXR) ENDIF(WITH_OPENEXR) IF(WITH_QUICKTIME) - SET(INC ${INC} ${QUICKTIME_INC}) + SET(INC ${INC} ../../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) ENDIF(WITH_QUICKTIME) diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 391f6e9e1a2..76dd2afebdc 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -28,7 +28,7 @@ FILE(GLOB SRC intern/*.c) SET(INC . ../makesdna ../../../intern/guardedalloc ../../../intern/memutil ../blenlib - ../avi ../quicktime ../blenkernel + ../avi ../blenkernel ${JPEG_INC} ${PNG_INC} ${TIFF_INC} @@ -45,7 +45,7 @@ IF(WITH_OPENJPEG) ENDIF(WITH_OPENJPEG) IF(WITH_QUICKTIME) - SET(INC ${INC} ${QUICKTIME_INC}) + SET(INC ${INC} ../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) ENDIF(WITH_QUICKTIME) diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index ca21ba592a8..bba96adf25e 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -29,7 +29,7 @@ SET(INC . ../../../intern/guardedalloc ../editors/include ../blenlib ../makesdna ../render/extern/include ../../../intern/decimation/extern ../makesrna ../imbuf ../avi ../../../intern/elbeem/extern - ../../../intern/iksolver/extern ../blenloader ../quicktime + ../../../intern/iksolver/extern ../blenloader ../blenkernel ../../../extern/glew/include ../gpu ${ZLIB_INC} ) @@ -39,7 +39,7 @@ IF(WITH_OPENEXR) ENDIF(WITH_OPENEXR) IF(WITH_QUICKTIME) - SET(INC ${INC} ${QUICKTIME_INC}) + SET(INC ${INC} ../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) ENDIF(WITH_QUICKTIME) diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index 411bd61c3ff..185662c5a42 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -28,8 +28,8 @@ FILE(GLOB SRC intern/source/*.c) SET(INC intern/include ../../../intern/guardedalloc ../blenlib ../makesdna - extern/include ../blenkernel ../radiosity/extern/include ../imbuf - ../quicktime ../include ../../kernel/gen_messaging ../blenloader + extern/include ../blenkernel ../imbuf + ../include ../../kernel/gen_messaging ../blenloader ../makesrna ) @@ -38,7 +38,7 @@ IF(WITH_OPENEXR) ENDIF(WITH_OPENEXR) IF(WITH_QUICKTIME) - SET(INC ${INC} ${QUICKTIME_INC}) + SET(INC ${INC} ../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) ENDIF(WITH_QUICKTIME) diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index a268ffebffb..26d4ab20356 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -31,10 +31,10 @@ SET(INC . ../../../intern/guardedalloc ../../../intern/memutil ../blenlib ../makesdna ../makesrna ../blenkernel ../include ../imbuf ../render/extern/include - ../../../intern/bsp/extern ../radiosity/extern/include + ../../../intern/bsp/extern ../../../intern/decimation/extern ../blenloader ../../kernel/gen_system ../readstreamglue - ../quicktime ../../../intern/elbeem/extern + ../../../intern/elbeem/extern ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include ../nodes ../gpu @@ -51,7 +51,7 @@ IF(WITH_OPENEXR) ENDIF(WITH_OPENEXR) IF(WITH_QUICKTIME) - SET(INC ${INC} ${QUICKTIME_INC}) + SET(INC ${INC} ../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) ENDIF(WITH_QUICKTIME) -- cgit v1.2.3