forked from bartvdbraak/blender
Compact -I paths in makefiles for more readble files/output.
Also some white space cleaning and removal of redundant parameter.
This commit is contained in:
Guillermo S. Romero
parent
54343b79e6
commit
29799bf09c
@ -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)
|
||||
|
||||
@ -1,3 +1,17 @@
|
||||
# -*- mode: cmake; indent-tabs-mode: t; -*-
|
||||
# $Id$
|
||||
|
||||
# Nicer makefiles with -I/1/foo/ instead of -I/1/2/3/../../foo/
|
||||
# use it instead of include_directories()
|
||||
macro(blender_include_dirs
|
||||
includes)
|
||||
|
||||
foreach(inc ${ARGV})
|
||||
get_filename_component(abs_inc ${inc} ABSOLUTE)
|
||||
list(APPEND all_incs ${abs_inc})
|
||||
endforeach()
|
||||
include_directories(${all_incs})
|
||||
endmacro()
|
||||
|
||||
# only MSVC uses SOURCE_GROUP
|
||||
macro(blenderlib_nolist
|
||||
@ -7,7 +21,7 @@ macro(blenderlib_nolist
|
||||
|
||||
# message(STATUS "Configuring library ${name}")
|
||||
|
||||
include_directories(${includes})
|
||||
blender_include_dirs("${includes}")
|
||||
add_library(${name} ${sources})
|
||||
|
||||
# Group by location on disk
|
||||
@ -33,7 +47,6 @@ endmacro()
|
||||
# add_library(${name} ${sources})
|
||||
# endmacro()
|
||||
|
||||
|
||||
macro(blenderlib
|
||||
name
|
||||
sources
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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(
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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()
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user