Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: whitespace (CMake)

Browse Source
This commit is contained in:
Campbell Barton
2015-07-18 18:21:17 +10:00
parent 7c5dd14689
commit 752eb64d60
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -1063,9 +1063,9 @@ if(UNIX AND NOT APPLE)
endif() endif()
if(WITH_LLVM) if(WITH_LLVM)
find_package_wrapper(LLVM) find_package_wrapper(LLVM)
if(NOT LLVM_FOUND) if(NOT LLVM_FOUND)
set(WITH_LLVM OFF) set(WITH_LLVM OFF)
message(STATUS "LLVM not found") message(STATUS "LLVM not found")
endif() endif()

32
intern/cycles/CMakeLists.txt
View File

@@ -154,23 +154,23 @@ add_definitions(
TEST_UNORDERED_MAP_SUPPORT() TEST_UNORDERED_MAP_SUPPORT()
if(HAVE_STD_UNORDERED_MAP_HEADER) if(HAVE_STD_UNORDERED_MAP_HEADER)
if(HAVE_UNORDERED_MAP_IN_STD_NAMESPACE) if(HAVE_UNORDERED_MAP_IN_STD_NAMESPACE)
add_definitions(-DCYCLES_STD_UNORDERED_MAP) add_definitions(-DCYCLES_STD_UNORDERED_MAP)
else() else()
if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE) if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
add_definitions(-DCYCLES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE) add_definitions(-DCYCLES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE)
else() else()
add_definitions(-DCYCLES_NO_UNORDERED_MAP) add_definitions(-DCYCLES_NO_UNORDERED_MAP)
message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)") message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)")
endif() endif()
endif() endif()
else() else()
if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE) if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
add_definitions(-DCYCLES_TR1_UNORDERED_MAP) add_definitions(-DCYCLES_TR1_UNORDERED_MAP)
else() else()
add_definitions(-DCYCLES_NO_UNORDERED_MAP) add_definitions(-DCYCLES_NO_UNORDERED_MAP)
message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)") message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)")
endif() endif()
endif() endif()
# Logging capabilities using GLog library. # Logging capabilities using GLog library.

2
source/blender/python/intern/CMakeLists.txt
View File

@@ -225,7 +225,7 @@ if(WITH_SDL_DYNLOAD)
list(APPEND INC list(APPEND INC
../../../../extern/sdlew/include ../../../../extern/sdlew/include
) )
add_definitions(-DWITH_SDL_DYNLOAD) add_definitions(-DWITH_SDL_DYNLOAD)
endif() endif()
if(WITH_JACK) if(WITH_JACK)