From 29799bf09c9f11fa95f4054a799c0b82921ea05c Mon Sep 17 00:00:00 2001 From: "Guillermo S. Romero" Date: Wed, 22 Dec 2010 22:15:20 +0000 Subject: [PATCH] Compact -I paths in makefiles for more readble files/output. Also some white space cleaning and removal of redundant parameter. --- CMakeLists.txt | 6 ++-- build_files/cmake/macros.cmake | 35 +++++++++++++------ source/blender/makesdna/intern/CMakeLists.txt | 3 +- source/blender/makesrna/intern/CMakeLists.txt | 3 +- source/blenderplayer/CMakeLists.txt | 3 +- source/creator/CMakeLists.txt | 9 ++--- source/gameengine/CMakeLists.txt | 3 +- 7 files changed, 40 insertions(+), 22 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) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 00a64893e9f..e21d9491354 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -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,14 +21,14 @@ macro(blenderlib_nolist # message(STATUS "Configuring library ${name}") - include_directories(${includes}) + blender_include_dirs("${includes}") add_library(${name} ${sources}) # Group by location on disk source_group("Source Files" FILES CMakeLists.txt) foreach(SRC ${sources}) get_filename_component(SRC_EXT ${SRC} EXT) - if(${SRC_EXT} MATCHES ".h" OR ${SRC_EXT} MATCHES ".hpp") + if(${SRC_EXT} MATCHES ".h" OR ${SRC_EXT} MATCHES ".hpp") source_group("Header Files" FILES ${SRC}) else() source_group("Source Files" FILES ${SRC}) @@ -33,7 +47,6 @@ endmacro() # add_library(${name} ${sources}) # endmacro() - macro(blenderlib name sources @@ -50,7 +63,7 @@ macro(SETUP_LIBDIRS) if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) endif() - + link_directories(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH}) if(WITH_PYTHON) @@ -136,7 +149,7 @@ macro(setup_liblinks if(WITH_OPENAL) target_link_libraries(${target} ${OPENAL_LIBRARY}) endif() - if(WITH_FFTW3) + if(WITH_FFTW3) target_link_libraries(${target} ${FFTW3_LIB}) endif() if(WITH_JACK) @@ -147,7 +160,7 @@ macro(setup_liblinks endif() if(WITH_SAMPLERATE) target_link_libraries(${target} ${LIBSAMPLERATE_LIB}) - endif() + endif() if(WITH_SDL) target_link_libraries(${target} ${SDL_LIBRARY}) endif() @@ -248,7 +261,7 @@ endmacro() # utility macro macro(_remove_strict_flags flag) - + string(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") string(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") string(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") @@ -342,24 +355,24 @@ macro(get_blender_version) MATH(EXPR BLENDER_VERSION_MINOR "${ITEM} % 100") set(BLENDER_VERSION "${BLENDER_VERSION_MAJOR}.${BLENDER_VERSION_MINOR}") endif() - + if(LASTITEM MATCHES "BLENDER_SUBVERSION") set(BLENDER_SUBVERSION ${ITEM}) endif() - + if(LASTITEM MATCHES "BLENDER_MINVERSION") MATH(EXPR BLENDER_MINVERSION_MAJOR "${ITEM} / 100") MATH(EXPR BLENDER_MINVERSION_MINOR "${ITEM} % 100") set(BLENDER_MINVERSION "${BLENDER_MINVERSION_MAJOR}.${BLENDER_MINVERSION_MINOR}") endif() - + if(LASTITEM MATCHES "BLENDER_MINSUBVERSION") set(BLENDER_MINSUBVERSION ${ITEM}) endif() set(LASTITEM ${ITEM}) endforeach() - + # message(STATUS "Version major: ${BLENDER_VERSION_MAJOR}, Version minor: ${BLENDER_VERSION_MINOR}, Subversion: ${BLENDER_SUBVERSION}, Version: ${BLENDER_VERSION}") # message(STATUS "Minversion major: ${BLENDER_MINVERSION_MAJOR}, Minversion minor: ${BLENDER_MINVERSION_MINOR}, MinSubversion: ${BLENDER_MINSUBVERSION}, Minversion: ${BLENDER_MINVERSION}") endmacro() 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()