diff options
| author | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2010-12-23 01:15:20 +0300 |
|---|---|---|
| committer | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2010-12-23 01:15:20 +0300 |
| commit | 29799bf09c9f11fa95f4054a799c0b82921ea05c (patch) | |
| tree | fc0114df7e7d970233684fd4520f8b7f09acd04d /source | |
| parent | 54343b79e67f8baf93903fbbbaccdf32ebf04560 (diff) | |
Compact -I paths in makefiles for more readble files/output.
Also some white space cleaning and removal of redundant parameter.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/makesdna/intern/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | source/gameengine/CMakeLists.txt | 3 |
5 files changed, 13 insertions, 8 deletions
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index b6b2d2d2a13..c732b05aa03 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -1,3 +1,4 @@ +# -*- mode: cmake; indent-tabs-mode: t; -*- # $Id$ # ***** BEGIN GPL LICENSE BLOCK ***** # @@ -26,7 +27,7 @@ # message(STATUS "Configuring makesdna") -include_directories(../../../../intern/guardedalloc ..) +blender_include_dirs(../../../../intern/guardedalloc ../) # Build makesdna executable set(SRC diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 4794e98285e..2cee3f9cf0c 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -1,3 +1,4 @@ +# -*- mode: cmake; indent-tabs-mode: t; -*- # $Id: CMakeLists.txt 17433 2008-11-12 21:16:53Z blendix $ # ***** BEGIN GPL LICENSE BLOCK ***** # @@ -47,7 +48,7 @@ set(SRC ../../../../intern/guardedalloc/intern/mmap_win.c ) -include_directories( +blender_include_dirs( ../../../../intern/audaspace/intern ../../../../intern/guardedalloc ../../../../intern/memutil diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index eecb67e8882..5950753164b 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -1,3 +1,4 @@ +# -*- mode: cmake; indent-tabs-mode: t; -*- # $Id$ # ***** BEGIN GPL LICENSE BLOCK ***** # @@ -34,7 +35,7 @@ endif() if(CMAKE_SYSTEM_NAME MATCHES "Linux") add_definitions(-DWITH_BINRELOC) - include_directories(${BINRELOC_INC}) + blender_include_dirs(${BINRELOC_INC}) endif() add_custom_command( diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 9b9ab8d537d..78aa98cb7f5 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -1,3 +1,4 @@ +# -*- mode: cmake; indent-tabs-mode: t; -*- # $Id$ # ***** BEGIN GPL LICENSE BLOCK ***** # @@ -29,7 +30,7 @@ cmake_policy(SET CMP0005 NEW) setup_libdirs() -include_directories( +blender_include_dirs( ../../intern/guardedalloc ../blender/blenlib ../blender/blenkernel @@ -67,12 +68,12 @@ if(WITH_IMAGE_HDR) endif() if(WITH_PYTHON) - include_directories(../blender/python) + blender_include_dirs(../blender/python) add_definitions(-DWITH_PYTHON) endif() if(WITH_GAMEENGINE) - include_directories( + blender_include_dirs( ../kernel/gen_messaging ../kernel/gen_system ) @@ -86,7 +87,7 @@ endif() if(CMAKE_SYSTEM_NAME MATCHES "Linux") add_definitions(-DWITH_BINRELOC) - include_directories(${BINRELOC_INC}) + blender_include_dirs(${BINRELOC_INC}) endif() # Setup the exe sources and buildinfo diff --git a/source/gameengine/CMakeLists.txt b/source/gameengine/CMakeLists.txt index 686cb7cc8fa..53688ab3218 100644 --- a/source/gameengine/CMakeLists.txt +++ b/source/gameengine/CMakeLists.txt @@ -1,3 +1,4 @@ +# -*- mode: cmake; indent-tabs-mode: t; -*- # $Id$ # ***** BEGIN GPL LICENSE BLOCK ***** # @@ -26,7 +27,7 @@ # there are too many inter-includes so best define here if(WITH_PYTHON) - include_directories(${PYTHON_INC}) + blender_include_dirs(${PYTHON_INC}) add_definitions(-DWITH_PYTHON) endif() |