Commit: 752eb64d6025dac88a2cdd8fd423b70c97e3ab1d
Author: Campbell Barton
Date: Sat Jul 18 18:21:17 2015 +1000
Branches: master
https://developer.blender.org/rB752eb64d6025dac88a2cdd8fd423b70c97e3ab1d
Cleanup: whitespace (CMake)
===================================================================
M CMakeLists.txt
M intern/cycles/CMakeLists.txt
M source/blender/python/intern/CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e84b31..e214b23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1063,9 +1063,9 @@ if(UNIX AND NOT APPLE)
endif()
if(WITH_LLVM)
- find_package_wrapper(LLVM)
+ find_package_wrapper(LLVM)
- if(NOT LLVM_FOUND)
+ if(NOT LLVM_FOUND)
set(WITH_LLVM OFF)
message(STATUS "LLVM not found")
endif()
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index ed6961f..acd6cd6 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -154,23 +154,23 @@ add_definitions(
TEST_UNORDERED_MAP_SUPPORT()
if(HAVE_STD_UNORDERED_MAP_HEADER)
- if(HAVE_UNORDERED_MAP_IN_STD_NAMESPACE)
- add_definitions(-DCYCLES_STD_UNORDERED_MAP)
- else()
- if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
- add_definitions(-DCYCLES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE)
- else()
- add_definitions(-DCYCLES_NO_UNORDERED_MAP)
- message(STATUS "Replacing unordered_map/set with map/set (warning:
slower!)")
- endif()
- endif()
+ if(HAVE_UNORDERED_MAP_IN_STD_NAMESPACE)
+ add_definitions(-DCYCLES_STD_UNORDERED_MAP)
+ else()
+ if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
+
add_definitions(-DCYCLES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE)
+ else()
+ add_definitions(-DCYCLES_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(-DCYCLES_TR1_UNORDERED_MAP)
- else()
- add_definitions(-DCYCLES_NO_UNORDERED_MAP)
- message(STATUS "Replacing unordered_map/set with map/set (warning:
slower!)")
- endif()
+ if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
+ add_definitions(-DCYCLES_TR1_UNORDERED_MAP)
+ else()
+ add_definitions(-DCYCLES_NO_UNORDERED_MAP)
+ message(STATUS "Replacing unordered_map/set with map/set
(warning: slower!)")
+ endif()
endif()
# Logging capabilities using GLog library.
diff --git a/source/blender/python/intern/CMakeLists.txt
b/source/blender/python/intern/CMakeLists.txt
index ed04152..7c58c11 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -225,7 +225,7 @@ if(WITH_SDL_DYNLOAD)
list(APPEND INC
../../../../extern/sdlew/include
)
- add_definitions(-DWITH_SDL_DYNLOAD)
+ add_definitions(-DWITH_SDL_DYNLOAD)
endif()
if(WITH_JACK)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
