Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 30 Jul 2018 16:38:27 +0000 (18:38 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 30 Jul 2018 16:44:18 +0000 (18:44 +0200)
1  2 
CMakeLists.txt
build_files/build_environment/install_deps.sh
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_win32.cmake
intern/cycles/kernel/kernel_light.h
source/blender/depsgraph/CMakeLists.txt

diff --cc CMakeLists.txt
index f285b31b9d494828279590415bb21e558b68fa90,f6435316fec1f64767f063fa8e03ba0cce4982b6..419da9d94b735bbf120be44aea6dbdb89238798d
@@@ -738,13 -740,31 +715,10 @@@ if(WITH_BUILDINFO
        endif()
  endif()
  
- TEST_SHARED_PTR_SUPPORT()
- TEST_UNORDERED_MAP_SUPPORT()
  if(WITH_AUDASPACE)
 -      if(WITH_SYSTEM_AUDASPACE)
 -              set(AUDASPACE_DEFINITIONS
 -                      -DWITH_AUDASPACE
 -                      -DWITH_SYSTEM_AUDASPACE
 -                      "-DAUD_DEVICE_H=<AUD_Device.h>"
 -                      "-DAUD_SPECIAL_H=<AUD_Special.h>"
 -                      "-DAUD_SOUND_H=<AUD_Sound.h>"
 -                      "-DAUD_HANDLE_H=<AUD_Handle.h>"
 -                      "-DAUD_SEQUENCE_H=<AUD_Sequence.h>"
 -                      "-DAUD_TYPES_H=<AUD_Types.h>"
 -                      "-DAUD_PYTHON_H=<python/PyAPI.h>"
 -              )
 -      else()
 -              set(AUDASPACE_C_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/intern/audaspace/intern")
 -              set(AUDASPACE_PY_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/intern/audaspace/intern")
 -              set(AUDASPACE_DEFINITIONS
 -                      -DWITH_AUDASPACE
 -                      "-DAUD_DEVICE_H=<AUD_C-API.h>"
 -                      "-DAUD_SPECIAL_H=<AUD_C-API.h>"
 -                      "-DAUD_SOUND_H=<AUD_C-API.h>"
 -                      "-DAUD_HANDLE_H=<AUD_C-API.h>"
 -                      "-DAUD_SEQUENCE_H=<AUD_C-API.h>"
 -                      "-DAUD_TYPES_H=<AUD_Space.h>"
 -              )
 +      if(NOT WITH_SYSTEM_AUDASPACE)
 +              set(AUDASPACE_C_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/audaspace/bindings/C" "${CMAKE_BINARY_DIR}/extern/audaspace")
 +              set(AUDASPACE_PY_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/audaspace/bindings")
        endif()
  endif()
  
Simple merge
Simple merge
index 185a98f2a2b224c1224bb493d401a895bb4e5917,ced045e9e2fc1326ca790721a568e81634fcfc1a..c9cdea34401f5370d589f61a5e12152cc3c0a434
@@@ -106,28 -100,10 +106,6 @@@ set(SR
        util/deg_util_function.h
  )
  
- if(WITH_CXX11)
-       add_definitions(-DDEG_STD_UNORDERED_MAP)
- elseif(HAVE_STD_UNORDERED_MAP_HEADER)
-       if(HAVE_UNORDERED_MAP_IN_STD_NAMESPACE)
-               add_definitions(-DDEG_STD_UNORDERED_MAP)
-       else()
-               if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
-                       add_definitions(-DDEG_STD_UNORDERED_MAP_IN_TR1_NAMESPACE)
-               else()
-                       add_definitions(-DDEG_NO_UNORDERED_MAP)
-                       message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)")
-               endif()
-       endif()
- else()
-       if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
-               add_definitions(-DDEG_TR1_UNORDERED_MAP)
-       else()
-               add_definitions(-DDEG_NO_UNORDERED_MAP)
-               message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)")
-       endif()
 -if(WITH_LEGACY_DEPSGRAPH)
 -      add_definitions(-DWITH_LEGACY_DEPSGRAPH)
--endif()
--
  if(WITH_BOOST)
        list(APPEND INC_SYS
                ${BOOST_INCLUDE_DIR}