diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-30 19:38:27 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-30 19:44:18 +0300 |
| commit | 2e2e7aff7cb28337684534d2207816946407788b (patch) | |
| tree | 14da1dfc59a2638b28cd12aeea70698e89c97235 /source/blender/depsgraph/CMakeLists.txt | |
| parent | cc397b918ff1b2a51b3b82367506eb7684860cea (diff) | |
| parent | 885cc4cf9a1d5c167e4cbd26c3294d8b1ad400d8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/CMakeLists.txt')
| -rw-r--r-- | source/blender/depsgraph/CMakeLists.txt | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt index 185a98f2a2b..c9cdea34401 100644 --- a/source/blender/depsgraph/CMakeLists.txt +++ b/source/blender/depsgraph/CMakeLists.txt @@ -106,28 +106,6 @@ set(SRC 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() -endif() - if(WITH_BOOST) list(APPEND INC_SYS ${BOOST_INCLUDE_DIR} |