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

Cleanup: cmake indentation, white-space

Browse Source
This commit is contained in:
Campbell Barton
2021-02-05 09:45:16 +11:00
parent 94cf74afbb
commit 7e850ffa73
16 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build_files/build_environment/cmake/versions.cmake
View File

@@ -265,7 +265,7 @@ set(PUGIXML_URI https://github.com/zeux/pugixml/archive/v${PUGIXML_VERSION}.tar.
set(PUGIXML_HASH 0c208b0664c7fb822bf1b49ad035e8fd) set(PUGIXML_HASH 0c208b0664c7fb822bf1b49ad035e8fd)
set(FLEXBISON_VERSION 2.5.5) set(FLEXBISON_VERSION 2.5.5)
set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison//win_flex_bison-2.5.5.zip) set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison/win_flex_bison-2.5.5.zip)
set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce) set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)
# Libraries to keep Python modules static on Linux. # Libraries to keep Python modules static on Linux.
@@ -309,7 +309,7 @@ set(LIBGLU_URI ftp://ftp.freedesktop.org/pub/mesa/glu/glu-${LIBGLU_VERSION}.tar.
set(LIBGLU_HASH 151aef599b8259efe9acd599c96ea2a3) set(LIBGLU_HASH 151aef599b8259efe9acd599c96ea2a3)
set(MESA_VERSION 18.3.1) set(MESA_VERSION 18.3.1)
set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa//mesa-${MESA_VERSION}.tar.xz) set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa/mesa-${MESA_VERSION}.tar.xz)
set(MESA_HASH d60828056d77bfdbae0970f9b15fb1be) set(MESA_HASH d60828056d77bfdbae0970f9b15fb1be)
set(NASM_VERSION 2.15.02) set(NASM_VERSION 2.15.02)

8
build_files/cmake/Modules/FindEmbree.cmake
View File

@@ -59,14 +59,14 @@ FOREACH(COMPONENT ${_embree_FIND_COMPONENTS})
PATH_SUFFIXES PATH_SUFFIXES
lib64 lib lib64 lib
) )
IF (NOT EMBREE_${UPPERCOMPONENT}_LIBRARY) IF(NOT EMBREE_${UPPERCOMPONENT}_LIBRARY)
IF (EMBREE_EMBREE3_LIBRARY) IF(EMBREE_EMBREE3_LIBRARY)
# If we can't find all the static libraries, try to fall back to the shared library if found. # If we can't find all the static libraries, try to fall back to the shared library if found.
# This allows building with a shared embree library # This allows building with a shared embree library
SET(_embree_LIBRARIES ${EMBREE_EMBREE3_LIBRARY}) SET(_embree_LIBRARIES ${EMBREE_EMBREE3_LIBRARY})
BREAK() BREAK()
ENDIF () ENDIF()
ENDIF () ENDIF()
LIST(APPEND _embree_LIBRARIES "${EMBREE_${UPPERCOMPONENT}_LIBRARY}") LIST(APPEND _embree_LIBRARIES "${EMBREE_${UPPERCOMPONENT}_LIBRARY}")
ENDFOREACH() ENDFOREACH()

4
build_files/cmake/Modules/GTest.cmake
View File

@@ -272,7 +272,7 @@ cmake_policy(SET CMP0057 NEW) # if IN_LIST
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
function(gtest_add_tests) function(gtest_add_tests)
if (ARGC LESS 1) if(ARGC LESS 1)
message(FATAL_ERROR "No arguments supplied to gtest_add_tests()") message(FATAL_ERROR "No arguments supplied to gtest_add_tests()")
endif() endif()
@@ -298,7 +298,7 @@ function(gtest_add_tests)
set(autoAddSources YES) set(autoAddSources YES)
else() else()
# Non-keyword syntax, convert to keyword form # Non-keyword syntax, convert to keyword form
if (ARGC LESS 3) if(ARGC LESS 3)
message(FATAL_ERROR "gtest_add_tests() without keyword options requires at least 3 arguments") message(FATAL_ERROR "gtest_add_tests() without keyword options requires at least 3 arguments")
endif() endif()
set(ARGS_TARGET "${ARGV0}") set(ARGS_TARGET "${ARGV0}")

2
build_files/cmake/macros.cmake
View File

@@ -389,7 +389,7 @@ function(blender_add_lib
endfunction() endfunction()
function(blender_add_test_suite) function(blender_add_test_suite)
if (ARGC LESS 1) if(ARGC LESS 1)
message(FATAL_ERROR "No arguments supplied to blender_add_test_suite()") message(FATAL_ERROR "No arguments supplied to blender_add_test_suite()")
endif() endif()

2
build_files/cmake/platform/platform_unix.cmake
View File

@@ -353,7 +353,7 @@ endif()
if(WITH_PUGIXML) if(WITH_PUGIXML)
find_package_wrapper(PugiXML) find_package_wrapper(PugiXML)
if (NOT PUGIXML_FOUND) if(NOT PUGIXML_FOUND)
set(WITH_PUGIXML OFF) set(WITH_PUGIXML OFF)
message(STATUS "PugiXML not found, disabling WITH_PUGIXML") message(STATUS "PugiXML not found, disabling WITH_PUGIXML")
endif() endif()

2
intern/ghost/test/CMakeLists.txt
View File

@@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.5)
project(GhostMultiTest) project(GhostMultiTest)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../../..//build_files/cmake/Modules") list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../../../build_files/cmake/Modules")
set(WITH_GUARDEDALLOC ON) set(WITH_GUARDEDALLOC ON)

1
source/creator/CMakeLists.txt
View File

@@ -772,7 +772,6 @@ elseif(WIN32)
PATTERN "__pycache__" EXCLUDE # * any cache * PATTERN "__pycache__" EXCLUDE # * any cache *
PATTERN "*.pyc" EXCLUDE # * any cache * PATTERN "*.pyc" EXCLUDE # * any cache *
PATTERN "*.pyo" EXCLUDE # * any cache *) PATTERN "*.pyo" EXCLUDE # * any cache *)
) )
install( install(

2
tests/gtests/runner/CMakeLists.txt
View File

@@ -72,7 +72,7 @@ elseif(APPLE)
set(_test_libs_dependencies) set(_test_libs_dependencies)
foreach(_lib ${_test_libs}) foreach(_lib ${_test_libs})
get_target_property(_interface_libs ${_lib} INTERFACE_LINK_LIBRARIES) get_target_property(_interface_libs ${_lib} INTERFACE_LINK_LIBRARIES)
if (_interface_libs) if(_interface_libs)
list(APPEND _test_libs_dependencies ${_interface_libs}) list(APPEND _test_libs_dependencies ${_interface_libs})
endif() endif()
unset(_interface_libs) unset(_interface_libs)