diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-07-18 11:21:17 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-18 11:42:35 +0300 |
| commit | 752eb64d6025dac88a2cdd8fd423b70c97e3ab1d (patch) | |
| tree | df9111b8608b755e4351e291e82fd95fe1a7cab1 | |
| parent | 7c5dd146897f3427fafe658c6deba2732e937b20 (diff) | |
Cleanup: whitespace (CMake)
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 32 | ||||
| -rw-r--r-- | source/blender/python/intern/CMakeLists.txt | 2 |
3 files changed, 19 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e84b31ecc9..e214b23a5db 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 ed6961f49e0..acd6cd69329 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 ed04152182e..7c58c1158c1 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) |