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 /CMakeLists.txt | |
| 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 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cc6715f8237..c3001b605d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,4 @@ +# -*- mode: cmake; indent-tabs-mode: t; -*- # $Id$ # ***** BEGIN GPL LICENSE BLOCK ***** # @@ -689,7 +690,7 @@ elseif(WIN32) endif() # used in many places so include globally, like OpenGL - include_directories(${PTHREADS_INC}) + blender_include_dirs(${PTHREADS_INC}) elseif(APPLE) @@ -944,7 +945,7 @@ endif() #----------------------------------------------------------------------------- # Configure OpenGL. find_package(OpenGL) -include_directories(${OPENGL_INCLUDE_DIR}) +blender_include_dirs(${OPENGL_INCLUDE_DIR}) # unset(OPENGL_LIBRARIES CACHE) # not compat with older cmake # unset(OPENGL_xmesa_INCLUDE_DIR CACHE) # not compat with older cmake @@ -989,7 +990,6 @@ if(CMAKE_COMPILER_IS_GNUCC) ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall) ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_CAST_ALIGN -Wcast-align) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DECLARATION_AFTER_STATEMENT -Wdeclaration-after-statement) ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_DECLARATION_AFTER_STATEMENT -Werror=declaration-after-statement) ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration) ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_RETURN_TYPE -Werror=return-type) |