Commit: c47ca6adab4d3a726f5dd942d625a270188e8043
Author: Pablo Dobarro
Date: Tue Apr 23 20:24:54 2019 +0200
Branches: sculpt-mode-features
https://developer.blender.org/rBc47ca6adab4d3a726f5dd942d625a270188e8043
Merge branch 'master' into sculpt-mode-features
===================================================================
===================================================================
diff --cc build_files/cmake/macros.cmake
index fdbb610338f,56d9117e560..90f07e7edc7
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@@ -19,175 -19,175 +19,175 @@@
# ***** END GPL LICENSE BLOCK *****
macro(list_insert_after
-- list_id item_check item_add
-- )
-- set(_index)
-- list(FIND "${list_id}" "${item_check}" _index)
-- if("${_index}" MATCHES "-1")
-- message(FATAL_ERROR "'${list_id}' doesn't contain '${item_check}'")
-- endif()
-- math(EXPR _index "${_index} + 1")
-- list(INSERT ${list_id} "${_index}" ${item_add})
-- unset(_index)
++ list_id item_check item_add
++ )
++ set(_index)
++ list(FIND "${list_id}" "${item_check}" _index)
++ if("${_index}" MATCHES "-1")
++ message(FATAL_ERROR "'${list_id}' doesn't contain
'${item_check}'")
++ endif()
++ math(EXPR _index "${_index} + 1")
++ list(INSERT ${list_id} "${_index}" ${item_add})
++ unset(_index)
endmacro()
macro(list_insert_before
-- list_id item_check item_add
-- )
-- set(_index)
-- list(FIND "${list_id}" "${item_check}" _index)
-- if("${_index}" MATCHES "-1")
-- message(FATAL_ERROR "'${list_id}' doesn't contain '${item_check}'")
-- endif()
-- list(INSERT ${list_id} "${_index}" ${item_add})
-- unset(_index)
++ list_id item_check item_add
++ )
++ set(_index)
++ list(FIND "${list_id}" "${item_check}" _index)
++ if("${_index}" MATCHES "-1")
++ message(FATAL_ERROR "'${list_id}' doesn't contain
'${item_check}'")
++ endif()
++ list(INSERT ${list_id} "${_index}" ${item_add})
++ unset(_index)
endmacro()
function(list_assert_duplicates
-- list_id
-- )
--
-- # message(STATUS "list data: ${list_id}")
--
-- list(LENGTH list_id _len_before)
-- list(REMOVE_DUPLICATES list_id)
-- list(LENGTH list_id _len_after)
-- # message(STATUS "list size ${_len_before} -> ${_len_after}")
-- if(NOT _len_before EQUAL _len_after)
-- message(FATAL_ERROR "duplicate found in list which should not contain
duplicates: ${list_id}")
-- endif()
-- unset(_len_before)
-- unset(_len_after)
++ list_id
++ )
++
++ # message(STATUS "list data: ${list_id}")
++
++ list(LENGTH list_id _len_before)
++ list(REMOVE_DUPLICATES list_id)
++ list(LENGTH list_id _len_after)
++ # message(STATUS "list size ${_len_before} -> ${_len_after}")
++ if(NOT _len_before EQUAL _len_after)
++ message(FATAL_ERROR "duplicate found in list which should not
contain duplicates: ${list_id}")
++ endif()
++ unset(_len_before)
++ unset(_len_after)
endfunction()
# foo_bar.spam --> foo_barMySuffix.spam
macro(file_suffix
-- file_name_new file_name file_suffix
-- )
++ file_name_new file_name file_suffix
++ )
-- get_filename_component(_file_name_PATH ${file_name} PATH)
-- get_filename_component(_file_name_NAME_WE ${file_name} NAME_WE)
-- get_filename_component(_file_name_EXT ${file_name} EXT)
-- set(${file_name_new}
"${_file_name_PATH}/${_file_name_NAME_WE}${file_suffix}${_file_name_EXT}")
++ get_filename_component(_file_name_PATH ${file_name} PATH)
++ get_filename_component(_file_name_NAME_WE ${file_name} NAME_WE)
++ get_filename_component(_file_name_EXT ${file_name} EXT)
++ set(${file_name_new}
"${_file_name_PATH}/${_file_name_NAME_WE}${file_suffix}${_file_name_EXT}")
-- unset(_file_name_PATH)
-- unset(_file_name_NAME_WE)
-- unset(_file_name_EXT)
++ unset(_file_name_PATH)
++ unset(_file_name_NAME_WE)
++ unset(_file_name_EXT)
endmacro()
# useful for adding debug suffix to library lists:
# /somepath/foo.lib --> /somepath/foo_d.lib
macro(file_list_suffix
-- fp_list_new fp_list fn_suffix
-- )
++ fp_list_new fp_list fn_suffix
++ )
-- # incase of empty list
-- set(_fp)
-- set(_fp_suffixed)
++ # incase of empty list
++ set(_fp)
++ set(_fp_suffixed)
-- set(fp_list_new)
++ set(fp_list_new)
-- foreach(_fp ${fp_list})
-- file_suffix(_fp_suffixed "${_fp}" "${fn_suffix}")
-- list(APPEND "${fp_list_new}" "${_fp_suffixed}")
-- endforeach()
++ foreach(_fp ${fp_list})
++ file_suffix(_fp_suffixed "${_fp}" "${fn_suffix}")
++ list(APPEND "${fp_list_new}" "${_fp_suffixed}")
++ endforeach()
-- unset(_fp)
-- unset(_fp_suffixed)
++ unset(_fp)
++ unset(_fp_suffixed)
endmacro()
if(UNIX AND NOT APPLE)
-- macro(find_package_static)
-- set(_cmake_find_library_suffixes_back ${CMAKE_FIND_LIBRARY_SUFFIXES})
-- set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
-- find_package(${ARGV})
-- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_cmake_find_library_suffixes_back})
-- unset(_cmake_find_library_suffixes_back)
-- endmacro()
--
-- macro(find_library_static)
-- set(_cmake_find_library_suffixes_back ${CMAKE_FIND_LIBRARY_SUFFIXES})
-- set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
-- find_library(${ARGV})
-- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_cmake_find_library_suffixes_back})
-- unset(_cmake_find_library_suffixes_back)
-- endmacro()
++ macro(find_package_static)
++ set(_cmake_find_library_suffixes_back
${CMAKE_FIND_LIBRARY_SUFFIXES})
++ set(CMAKE_FIND_LIBRARY_SUFFIXES .a
${CMAKE_FIND_LIBRARY_SUFFIXES})
++ find_package(${ARGV})
++ set(CMAKE_FIND_LIBRARY_SUFFIXES
${_cmake_find_library_suffixes_back})
++ unset(_cmake_find_library_suffixes_back)
++ endmacro()
++
++ macro(find_library_static)
++ set(_cmake_find_library_suffixes_back
${CMAKE_FIND_LIBRARY_SUFFIXES})
++ set(CMAKE_FIND_LIBRARY_SUFFIXES .a
${CMAKE_FIND_LIBRARY_SUFFIXES})
++ find_library(${ARGV})
++ set(CMAKE_FIND_LIBRARY_SUFFIXES
${_cmake_find_library_suffixes_back})
++ unset(_cmake_find_library_suffixes_back)
++ endmacro()
endif()
function(target_link_libraries_optimized
-- TARGET
-- LIBS
-- )
++ TARGET
++ LIBS
++ )
-- foreach(_LIB ${LIBS})
-- target_link_libraries(${TARGET} optimized "${_LIB}")
-- endforeach()
++ foreach(_LIB ${LIBS})
++ target_link_libraries(${TARGET} optimized "${_LIB}")
++ endforeach()
endfunction()
function(target_link_libraries_debug
-- TARGET
-- LIBS
-- )
++ TARGET
++ LIBS
++ )
-- foreach(_LIB ${LIBS})
-- target_link_libraries(${TARGET} debug "${_LIB}")
-- endforeach()
++ foreach(_LIB ${LIBS})
++ target_link_libraries(${TARGET} debug "${_LIB}")
++ endforeach()
endfunction()
# Nicer makefiles with -I/1/foo/ instead of -I/1/2/3/../../foo/
# use it instead of include_directories()
function(blender_include_dirs
-- includes
-- )
--
-- set(_ALL_INCS "")
-- foreach(_INC ${ARGV})
-- get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
-- list(APPEND _ALL_INCS ${_ABS_INC})
-- # for checking for invalid includes, disable for regular use
-- ##if(NOT EXISTS "${_ABS_INC}/")
-- ## message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
-- ##endif()
-- endforeach()
-- include_directories(${_ALL_INCS})
++ includes
++ )
++
++ set(_ALL_INCS "")
++ foreach(_INC ${ARGV})
++ get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
++ list(APPEND _ALL_INCS ${_ABS_INC})
++ # for checking for invalid includes, disable for regular use
++ ##if(NOT EXISTS "${_ABS_INC}/")
++ ## message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
++ ##endif()
++ endforeach()
++ include_directories(${_ALL_INCS})
endfunction()
function(blender_include_dirs_sys
-- includes
-- )
--
-- set(_ALL_INCS "")
-- foreach(_INC ${ARGV})
-- get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
-- list(APPEND _ALL_INCS ${_ABS_INC})
-- ##if(NOT EXISTS "${_ABS_INC}/")
-- ## message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
-- ##endif()
-- endforeach()
-- include_directories(SYSTEM ${_ALL_INCS})
++ includes
++ )
++
++ set(_ALL_INCS "")
++ foreach(_INC ${ARGV})
++ get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
++ list(APPEND _ALL_INCS ${_ABS_INC})
++ ##if(NOT EXISTS "${_ABS_INC}/")
++ ## message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
++ ##endif()
++ endforeach()
++ include_directories(SYSTEM ${_ALL_INCS})
endfunction()
function(blender_source_group
-- 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") OR
-- (${_SRC_EXT} MATCHES ".hh"))
--
-- set(GROUP_ID "Header Files")
-- else()
-- set(GROUP_ID "Source Files")
-- endif()
-- source_group("${GROUP_ID}" FILES ${_SRC})
-- endforeach()
++ 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") OR
++ (${_SRC_EXT} MATCHES ".hh"))
++
++ set(GROUP_ID "Header Files")
++ else()
++ set(GROUP_ID "Source Files")
++ endif()
++ source_group("${GROUP_ID}" FILES ${_SRC})
++ endforeach()
endfunction()
@@@ -199,682 -199,404 +199,682 @@@
#
# Optionally takes an arg passed to set(), eg PARENT_SCOPE.
macro(add_cc_flags_custom_test
-- name
-- )
--
-- string(TOUPPER ${name} _name_upper)
-- if(DEFINED CMAKE_C_FLAGS_${_name_upper})
-- message(STATUS "Using custom CFLAGS: CMAKE_C_FLAGS_${_name_upper} in
\"${CMAKE_CURRENT_SOURCE_DIR}\"")
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${_name_upper}}"
${ARGV1})
-- endif()
-- if(DEFINED CMAKE_CXX_FLAGS_${_name_upper})
-- message(STATUS "Using custom CXXFLAGS: CMAKE_CXX_FLAGS_${_name_upper} in
\"${CMAKE_CURRENT_SOURCE_DIR}\"")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
${CMAKE_CXX_FLAGS_${_name_upper}}" ${ARGV1})
-- endif()
-- unset(_name_upper)
++ name
++ )
++
++ string(TOUPPER ${name} _name_upper)
++ if(DEFINED CMAKE_C_FLAGS_${_name_upper})
++ message(STATUS "Using custom CFLAGS:
CMAKE_C_FLAGS_${_name_upper} in \"${CMAKE_CURRENT_SOURCE_DIR}\"")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}
${CMAKE_C_FLAGS_${_name_upper}}" ${ARGV1})
++ endif()
++ if(DEFINED CMAKE_CXX_FLAGS_${_name_upper})
++ message(STATUS "Using custom CXXFLAGS:
CMAKE_CXX_FLAGS_${_name_upper} in \"${CMAKE_CURRENT_SOURCE_DIR}\"")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
${CMAKE_CXX_FLAGS_${_name_upper}}" ${ARGV1})
++ endif()
++ unset(_name_upper)
endmacro()
# only MSVC uses SOURCE_GROUP
function(blender
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
