diff options
| -rw-r--r-- | CMakeLists.txt | 258 | ||||
| -rw-r--r-- | build_files/cmake/buildinfo.cmake | 4 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 20 | ||||
| -rw-r--r-- | build_files/cmake/packaging.cmake | 6 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 10 | ||||
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | intern/cycles/scene/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/opensubdiv/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | source/blender/blenlib/tests/performance/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/io/collada/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/io/usd/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | tests/gtests/runner/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/python/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | tests/python/collada/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/CMakeLists.txt | 254 |
18 files changed, 325 insertions, 322 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ed2aa4de78e..7a48caa4eae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1022,9 +1022,9 @@ if(WITH_CPU_SIMD) set(COMPILER_SSE2_FLAG) # Test Neon first since macOS Arm can compile and run x86-64 SSE binaries. - TEST_NEON_SUPPORT() + test_neon_support() if(NOT SUPPORT_NEON_BUILD) - TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG) + test_sse_support(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG) endif() endif() @@ -1089,7 +1089,7 @@ if(WITH_INTERNATIONAL) endif() endif() -# Enable SIMD support if detected by TEST_SSE_SUPPORT() or TEST_NEON_SUPPORT(). +# Enable SIMD support if detected by `test_sse_support()` or `test_neon_support()`. # # This is done globally, so that all modules can use it if available, and # because these are used in headers used by many modules. @@ -1403,89 +1403,89 @@ endif() if(CMAKE_COMPILER_IS_GNUCC) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_RETURN_TYPE -Werror=return-type) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_VLA -Werror=vla) + add_check_c_compiler_flag(C_WARNINGS C_WARN_ALL -Wall) + add_check_c_compiler_flag(C_WARNINGS C_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration) + add_check_c_compiler_flag(C_WARNINGS C_WARN_ERROR_RETURN_TYPE -Werror=return-type) + add_check_c_compiler_flag(C_WARNINGS C_WARN_ERROR_VLA -Werror=vla) # system headers sometimes do this, disable for now, was: -Werror=strict-prototypes - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_STRICT_PROTOTYPES -Wstrict-prototypes) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_MISSING_PROTOTYPES -Wmissing-prototypes) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_WRITE_STRINGS -Wwrite-strings) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_LOGICAL_OP -Wlogical-op) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNDEF -Wundef) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_INIT_SELF -Winit-self) # needs -Wuninitialized - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_MISSING_INCLUDE_DIRS -Wmissing-include-dirs) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_TYPE_LIMITS -Wtype-limits) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_FORMAT_SIGN -Wformat-signedness) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_RESTRICT -Wrestrict) + add_check_c_compiler_flag(C_WARNINGS C_WARN_STRICT_PROTOTYPES -Wstrict-prototypes) + add_check_c_compiler_flag(C_WARNINGS C_WARN_MISSING_PROTOTYPES -Wmissing-prototypes) + add_check_c_compiler_flag(C_WARNINGS C_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts) + add_check_c_compiler_flag(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas) + add_check_c_compiler_flag(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith) + add_check_c_compiler_flag(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter) + add_check_c_compiler_flag(C_WARNINGS C_WARN_WRITE_STRINGS -Wwrite-strings) + add_check_c_compiler_flag(C_WARNINGS C_WARN_LOGICAL_OP -Wlogical-op) + add_check_c_compiler_flag(C_WARNINGS C_WARN_UNDEF -Wundef) + add_check_c_compiler_flag(C_WARNINGS C_WARN_INIT_SELF -Winit-self) # needs -Wuninitialized + add_check_c_compiler_flag(C_WARNINGS C_WARN_MISSING_INCLUDE_DIRS -Wmissing-include-dirs) + add_check_c_compiler_flag(C_WARNINGS C_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero) + add_check_c_compiler_flag(C_WARNINGS C_WARN_TYPE_LIMITS -Wtype-limits) + add_check_c_compiler_flag(C_WARNINGS C_WARN_FORMAT_SIGN -Wformat-signedness) + add_check_c_compiler_flag(C_WARNINGS C_WARN_RESTRICT -Wrestrict) # C-only. - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_NULL -Wnonnull) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ABSOLUTE_VALUE -Wabsolute-value) + add_check_c_compiler_flag(C_WARNINGS C_WARN_NO_NULL -Wnonnull) + add_check_c_compiler_flag(C_WARNINGS C_WARN_ABSOLUTE_VALUE -Wabsolute-value) # gcc 4.2 gives annoying warnings on every file with this if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3") - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNINITIALIZED -Wuninitialized) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNINITIALIZED -Wuninitialized) + add_check_c_compiler_flag(C_WARNINGS C_WARN_UNINITIALIZED -Wuninitialized) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_UNINITIALIZED -Wuninitialized) endif() # versions before gcc4.6 give many BLI_math warnings if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.6") - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_REDUNDANT_DECLS -Wredundant-decls) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_REDUNDANT_DECLS -Wredundant-decls) + add_check_c_compiler_flag(C_WARNINGS C_WARN_REDUNDANT_DECLS -Wredundant-decls) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_REDUNDANT_DECLS -Wredundant-decls) endif() # versions before gcc4.8 include global name-space. if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.8") - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_SHADOW -Wshadow) + add_check_c_compiler_flag(C_WARNINGS C_WARN_SHADOW -Wshadow) endif() # disable because it gives warnings for printf() & friends. - # ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION -Wdouble-promotion -Wno-error=double-promotion) + # add_check_c_compiler_flag(C_WARNINGS C_WARN_DOUBLE_PROMOTION -Wdouble-promotion -Wno-error=double-promotion) if(NOT APPLE) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable) + add_check_c_compiler_flag(C_WARNINGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable) endif() - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_LOGICAL_OP -Wlogical-op) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_INIT_SELF -Winit-self) # needs -Wuninitialized - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_MISSING_INCLUDE_DIRS -Wmissing-include-dirs) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_TYPE_LIMITS -Wtype-limits) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ERROR_RETURN_TYPE -Werror=return-type) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_POINTER_ARITH -Wpointer-arith) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNUSED_PARAMETER -Wunused-parameter) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_WRITE_STRINGS -Wwrite-strings) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEF -Wundef) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_FORMAT_SIGN -Wformat-signedness) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_RESTRICT -Wrestrict) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SUGGEST_OVERRIDE -Wno-suggest-override) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_ALL -Wall) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_LOGICAL_OP -Wlogical-op) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_INIT_SELF -Winit-self) # needs -Wuninitialized + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_MISSING_INCLUDE_DIRS -Wmissing-include-dirs) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_TYPE_LIMITS -Wtype-limits) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_ERROR_RETURN_TYPE -Werror=return-type) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_POINTER_ARITH -Wpointer-arith) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_UNUSED_PARAMETER -Wunused-parameter) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_WRITE_STRINGS -Wwrite-strings) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_UNDEF -Wundef) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_FORMAT_SIGN -Wformat-signedness) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_RESTRICT -Wrestrict) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_NO_SUGGEST_OVERRIDE -Wno-suggest-override) # gcc 4.2 gives annoying warnings on every file with this if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3") - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNINITIALIZED -Wuninitialized) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_UNINITIALIZED -Wuninitialized) endif() # causes too many warnings if(NOT APPLE) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEF -Wundef) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_MISSING_DECLARATIONS -Wmissing-declarations) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_UNDEF -Wundef) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_MISSING_DECLARATIONS -Wmissing-declarations) endif() # Use 'ATTR_FALLTHROUGH' macro to suppress. if(CMAKE_COMPILER_IS_GNUCC AND (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "7.0")) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_IMPLICIT_FALLTHROUGH -Wimplicit-fallthrough=5) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_IMPLICIT_FALLTHROUGH -Wimplicit-fallthrough=5) + add_check_c_compiler_flag(C_WARNINGS C_WARN_IMPLICIT_FALLTHROUGH -Wimplicit-fallthrough=5) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_IMPLICIT_FALLTHROUGH -Wimplicit-fallthrough=5) endif() @@ -1501,102 +1501,102 @@ if(CMAKE_COMPILER_IS_GNUCC) # If code in `./extern/` needs to suppress these flags that can be done on a case-by-case basis. # flags to undo strict flags - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION -Wno-unused-function) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_TYPE_LIMITS -Wno-type-limits) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_INT_IN_BOOL_CONTEXT -Wno-int-in-bool-context) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_FORMAT -Wno-format) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_SWITCH -Wno-switch) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_VARIABLE -Wno-unused-variable) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_VARIABLE -Wno-uninitialized) - - ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_CLASS_MEMACCESS -Wno-class-memaccess) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_COMMENT -Wno-comment) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_TYPEDEFS -Wno-unused-local-typedefs) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_VARIABLE -Wno-unused-variable) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_VARIABLE -Wno-uninitialized) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION -Wno-unused-function) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_TYPE_LIMITS -Wno-type-limits) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_INT_IN_BOOL_CONTEXT -Wno-int-in-bool-context) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_FORMAT -Wno-format) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_SWITCH -Wno-switch) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_VARIABLE -Wno-unused-variable) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_VARIABLE -Wno-uninitialized) + + add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_CLASS_MEMACCESS -Wno-class-memaccess) + add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_COMMENT -Wno-comment) + add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_TYPEDEFS -Wno-unused-local-typedefs) + add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_VARIABLE -Wno-unused-variable) + add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_VARIABLE -Wno-uninitialized) if(CMAKE_COMPILER_IS_GNUCC AND (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "7.0")) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_IMPLICIT_FALLTHROUGH -Wno-implicit-fallthrough) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_IMPLICIT_FALLTHROUGH -Wno-implicit-fallthrough) endif() if(NOT APPLE) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable) endif() elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") # strange, clang complains these are not supported, but then uses them. - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_RETURN_TYPE -Werror=return-type) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_STRICT_PROTOTYPES -Wstrict-prototypes) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_MISSING_PROTOTYPES -Wmissing-prototypes) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter) - - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall) + add_check_c_compiler_flag(C_WARNINGS C_WARN_ALL -Wall) + add_check_c_compiler_flag(C_WARNINGS C_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration) + add_check_c_compiler_flag(C_WARNINGS C_WARN_ERROR_RETURN_TYPE -Werror=return-type) + add_check_c_compiler_flag(C_WARNINGS C_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare) + add_check_c_compiler_flag(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas) + add_check_c_compiler_flag(C_WARNINGS C_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts) + add_check_c_compiler_flag(C_WARNINGS C_WARN_STRICT_PROTOTYPES -Wstrict-prototypes) + add_check_c_compiler_flag(C_WARNINGS C_WARN_MISSING_PROTOTYPES -Wmissing-prototypes) + add_check_c_compiler_flag(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter) + + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_ALL -Wall) # Using C++20 features while having C++17 as the project language isn't allowed by MSVC. - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_CXX20_DESIGNATOR -Wc++20-designator) - - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_OVERLOADED_VIRTUAL -Wno-overloaded-virtual) # we get a lot of these, if its a problem a dev needs to look into it. - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_CXX20_DESIGNATOR -Wc++20-designator) + + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_NO_OVERLOADED_VIRTUAL -Wno-overloaded-virtual) # we get a lot of these, if its a problem a dev needs to look into it. + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof) # Apple Clang (tested on version 12) doesn't support this flag while LLVM Clang 11 does. - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SUGGEST_OVERRIDE -Wno-suggest-override) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_NO_SUGGEST_OVERRIDE -Wno-suggest-override) # gives too many unfixable warnings - # ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_MACROS -Wunused-macros) - # ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNUSED_MACROS -Wunused-macros) + # add_check_c_compiler_flag(C_WARNINGS C_WARN_UNUSED_MACROS -Wunused-macros) + # add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_UNUSED_MACROS -Wunused-macros) # --------------------- # Suppress Strict Flags # flags to undo strict flags - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_VARIABLE -Wno-unused-variable) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_MACROS -Wno-unused-macros) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISLEADING_INDENTATION -Wno-misleading-indentation) - - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_VARIABLE_DECLARATIONS -Wno-missing-variable-declarations) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_INCOMPAT_PTR_DISCARD_QUAL -Wno-incompatible-pointer-types-discards-qualifiers) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION -Wno-unused-function) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_INT_TO_VOID_POINTER_CAST -Wno-int-to-void-pointer-cast) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_PROTOTYPES -Wno-missing-prototypes) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_DUPLICATE_ENUM -Wno-duplicate-enum) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNDEF -Wno-undef) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_NORETURN -Wno-missing-noreturn) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_BUT_SET_VARIABLE -Wno-unused-but-set-variable) - ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations) - - ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PRIVATE_FIELD -Wno-unused-private-field) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_CXX11_NARROWING -Wno-c++11-narrowing) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_NON_VIRTUAL_DTOR -Wno-non-virtual-dtor) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_MACROS -Wno-unused-macros) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_VARIABLE -Wno-unused-variable) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_REORDER -Wno-reorder) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_COMMENT -Wno-comment) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_TYPEDEFS -Wno-unused-local-typedefs) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNDEFINED_VAR_TEMPLATE -Wno-undefined-var-template) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_INSTANTIATION_AFTER_SPECIALIZATION -Wno-instantiation-after-specialization) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_MISLEADING_INDENTATION -Wno-misleading-indentation) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_VARIABLE -Wno-unused-variable) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_MACROS -Wno-unused-macros) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISLEADING_INDENTATION -Wno-misleading-indentation) + + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_VARIABLE_DECLARATIONS -Wno-missing-variable-declarations) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_INCOMPAT_PTR_DISCARD_QUAL -Wno-incompatible-pointer-types-discards-qualifiers) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION -Wno-unused-function) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_INT_TO_VOID_POINTER_CAST -Wno-int-to-void-pointer-cast) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_PROTOTYPES -Wno-missing-prototypes) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_DUPLICATE_ENUM -Wno-duplicate-enum) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNDEF -Wno-undef) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_NORETURN -Wno-missing-noreturn) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_BUT_SET_VARIABLE -Wno-unused-but-set-variable) + add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations) + + add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter) + add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PRIVATE_FIELD -Wno-unused-private-field) + add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_CXX11_NARROWING -Wno-c++11-narrowing) + add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_NON_VIRTUAL_DTOR -Wno-non-virtual-dtor) + add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_MACROS -Wno-unused-macros) + add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_VARIABLE -Wno-unused-variable) + add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_REORDER -Wno-reorder) + add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_COMMENT -Wno-comment) + add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_TYPEDEFS -Wno-unused-local-typedefs) + add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNDEFINED_VAR_TEMPLATE -Wno-undefined-var-template) + add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_INSTANTIATION_AFTER_SPECIALIZATION -Wno-instantiation-after-specialization) + add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_MISLEADING_INDENTATION -Wno-misleading-indentation) elseif(CMAKE_C_COMPILER_ID MATCHES "Intel") - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas) + add_check_c_compiler_flag(C_WARNINGS C_WARN_ALL -Wall) + add_check_c_compiler_flag(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith) + add_check_c_compiler_flag(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_ALL -Wall) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof) + add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare) # disable numbered, false positives string(APPEND C_WARNINGS " -wd188,186,144,913,556,858,597,177,1292,167,279,592,94,2722,3199") @@ -1709,8 +1709,8 @@ endif() if(WITH_COMPILER_SHORT_FILE_MACRO) # Use '-fmacro-prefix-map' for Clang and GCC (MSVC doesn't support this). - ADD_CHECK_C_COMPILER_FLAG(C_PREFIX_MAP_FLAGS C_MACRO_PREFIX_MAP -fmacro-prefix-map=foo=bar) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_PREFIX_MAP_FLAGS CXX_MACRO_PREFIX_MAP -fmacro-prefix-map=foo=bar) + add_check_c_compiler_flag(C_PREFIX_MAP_FLAGS C_MACRO_PREFIX_MAP -fmacro-prefix-map=foo=bar) + add_check_cxx_compiler_flag(CXX_PREFIX_MAP_FLAGS CXX_MACRO_PREFIX_MAP -fmacro-prefix-map=foo=bar) if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP) if(APPLE) if(XCODE AND ${XCODE_VERSION} VERSION_LESS 12.0) diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake index 53e22ed23ad..b0640acbe96 100644 --- a/build_files/cmake/buildinfo.cmake +++ b/build_files/cmake/buildinfo.cmake @@ -150,10 +150,10 @@ endif() # BUILD_PLATFORM is taken from CMake # but BUILD_DATE and BUILD_TIME are platform dependent if(NOT BUILD_DATE) - STRING(TIMESTAMP BUILD_DATE "%Y-%m-%d" UTC) + string(TIMESTAMP BUILD_DATE "%Y-%m-%d" UTC) endif() if(NOT BUILD_TIME) - STRING(TIMESTAMP BUILD_TIME "%H:%M:%S" UTC) + string(TIMESTAMP BUILD_TIME "%H:%M:%S" UTC) endif() # Write a file with the BUILD_HASH define diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index b197cd01bbb..d41024759fc 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -381,7 +381,7 @@ function(blender_add_test_suite) cmake_parse_arguments(ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) # Figure out the release dir, as some tests need files from there. - GET_BLENDER_TEST_INSTALL_DIR(TEST_INSTALL_DIR) + get_blender_test_install_dir(TEST_INSTALL_DIR) if(APPLE) set(_test_release_dir ${TEST_INSTALL_DIR}/Blender.app/Contents/Resources/${BLENDER_VERSION}) else() @@ -424,10 +424,10 @@ function(blender_add_test_lib # This duplicates logic that's also in GTestTesting.cmake, macro BLENDER_SRC_GTEST_EX. # TODO(Sybren): deduplicate after the general approach in D7649 has been approved. - LIST(APPEND includes + list(APPEND includes ${CMAKE_SOURCE_DIR}/tests/gtests ) - LIST(APPEND includes_sys + list(APPEND includes_sys ${GLOG_INCLUDE_DIRS} ${GFLAGS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/extern/gtest/include @@ -468,7 +468,7 @@ function(blender_add_test_executable ## Otherwise external projects will produce warnings that we cannot fix. remove_strict_flags() - BLENDER_SRC_GTEST_EX( + blender_src_gtest_ex( NAME ${name} SRC "${sources}" EXTRA_LIBS "${library_deps}" @@ -764,7 +764,7 @@ function(ADD_CHECK_C_COMPILER_FLAG include(CheckCCompilerFlag) - CHECK_C_COMPILER_FLAG("${_FLAG}" "${_CACHE_VAR}") + check_c_compiler_flag("${_FLAG}" "${_CACHE_VAR}") if(${_CACHE_VAR}) # message(STATUS "Using CFLAG: ${_FLAG}") set(${_CFLAGS} "${${_CFLAGS}} ${_FLAG}" PARENT_SCOPE) @@ -781,7 +781,7 @@ function(ADD_CHECK_CXX_COMPILER_FLAG include(CheckCXXCompilerFlag) - CHECK_CXX_COMPILER_FLAG("${_FLAG}" "${_CACHE_VAR}") + check_cxx_compiler_flag("${_FLAG}" "${_CACHE_VAR}") if(${_CACHE_VAR}) # message(STATUS "Using CXXFLAG: ${_FLAG}") set(${_CXXFLAGS} "${${_CXXFLAGS}} ${_FLAG}" PARENT_SCOPE) @@ -799,9 +799,11 @@ function(get_blender_version) # - BLENDER_VERSION_PATCH # - BLENDER_VERSION_CYCLE (alpha, beta, rc, release) - # So cmake depends on BKE_blender.h, beware of inf-loops! - CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender_version.h - ${CMAKE_BINARY_DIR}/source/blender/blenkernel/BKE_blender_version.h.done) + # So CMAKE depends on `BKE_blender.h`, beware of infinite-loops! + configure_file( + ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender_version.h + ${CMAKE_BINARY_DIR}/source/blender/blenkernel/BKE_blender_version.h.done + ) file(STRINGS ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender_version.h _contents REGEX "^#define[ \t]+BLENDER_.*$") diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake index f6073eba82e..2f2e90dc934 100644 --- a/build_files/cmake/packaging.cmake +++ b/build_files/cmake/packaging.cmake @@ -17,9 +17,9 @@ set(CPACK_PACKAGE_VENDOR ${PROJECT_VENDOR}) set(CPACK_PACKAGE_CONTACT ${PROJECT_CONTACT}) set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING") set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") -SET(CPACK_PACKAGE_VERSION_MAJOR "${MAJOR_VERSION}") -SET(CPACK_PACKAGE_VERSION_MINOR "${MINOR_VERSION}") -SET(CPACK_PACKAGE_VERSION_PATCH "${PATCH_VERSION}") +set(CPACK_PACKAGE_VERSION_MAJOR "${MAJOR_VERSION}") +set(CPACK_PACKAGE_VERSION_MINOR "${MINOR_VERSION}") +set(CPACK_PACKAGE_VERSION_PATCH "${PATCH_VERSION}") # Get the build revision, note that this can get out-of-sync, so for packaging run cmake first. diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index d9f06811984..bfbc6b76b40 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -1089,7 +1089,7 @@ function(CONFIGURE_ATOMIC_LIB_IF_NEEDED) endif() endfunction() -CONFIGURE_ATOMIC_LIB_IF_NEEDED() +configure_atomic_lib_if_needed() if(PLATFORM_BUNDLED_LIBRARIES) # For the installed Python module and installed Blender executable, we set the diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 7d7efb83b8e..eeec4760b80 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -26,7 +26,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang") set(OPENMP_FOUND ON) set(OpenMP_C_FLAGS "/clang:-fopenmp") set(OpenMP_CXX_FLAGS "/clang:-fopenmp") - GET_FILENAME_COMPONENT(LLVMROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\LLVM\\LLVM;]" ABSOLUTE CACHE) + get_filename_component(LLVMROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\LLVM\\LLVM;]" ABSOLUTE CACHE) set(CLANG_OPENMP_DLL "${LLVMROOT}/bin/libomp.dll") set(CLANG_OPENMP_LIB "${LLVMROOT}/lib/libomp.lib") if(NOT EXISTS "${CLANG_OPENMP_DLL}") @@ -874,8 +874,8 @@ endif() if(WINDOWS_PYTHON_DEBUG) # Include the system scripts in the blender_python_system_scripts project. - FILE(GLOB_RECURSE inFiles "${CMAKE_SOURCE_DIR}/release/scripts/*.*" ) - ADD_CUSTOM_TARGET(blender_python_system_scripts SOURCES ${inFiles}) + file(GLOB_RECURSE inFiles "${CMAKE_SOURCE_DIR}/release/scripts/*.*" ) + add_custom_target(blender_python_system_scripts SOURCES ${inFiles}) foreach(_source IN ITEMS ${inFiles}) get_filename_component(_source_path "${_source}" PATH) string(REPLACE "${CMAKE_SOURCE_DIR}/release/scripts/" "" _source_path "${_source_path}") @@ -895,8 +895,8 @@ if(WINDOWS_PYTHON_DEBUG) endif() file(TO_CMAKE_PATH ${USER_SCRIPTS_ROOT} USER_SCRIPTS_ROOT) - FILE(GLOB_RECURSE inFiles "${USER_SCRIPTS_ROOT}/*.*" ) - ADD_CUSTOM_TARGET(blender_python_user_scripts SOURCES ${inFiles}) + file(GLOB_RECURSE inFiles "${USER_SCRIPTS_ROOT}/*.*" ) + add_custom_target(blender_python_user_scripts SOURCES ${inFiles}) foreach(_source IN ITEMS ${inFiles}) get_filename_component(_source_path "${_source}" PATH) string(REPLACE "${USER_SCRIPTS_ROOT}" "" _source_path "${_source_path}") diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 89dad8ed36e..8adb032ad9e 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -36,7 +36,7 @@ if(WITH_CYCLES_NATIVE_ONLY) ) if(NOT MSVC) - ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_march_native "-march=native") + add_check_cxx_compiler_flag(CMAKE_CXX_FLAGS _has_march_native "-march=native") if(_has_march_native) set(CYCLES_KERNEL_FLAGS "-march=native") else() @@ -45,18 +45,18 @@ if(WITH_CYCLES_NATIVE_ONLY) unset(_has_march_native) else() if(NOT MSVC_NATIVE_ARCH_FLAGS) - TRY_RUN( - arch_run_result - arch_compile_result - ${CMAKE_CURRENT_BINARY_DIR}/ - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/msvc_arch_flags.c - COMPILE_OUTPUT_VARIABLE arch_compile_output - RUN_OUTPUT_VARIABLE arch_run_output - ) - if(arch_compile_result AND "${arch_run_result}" EQUAL "0") - string(STRIP ${arch_run_output} arch_run_output) - set(MSVC_NATIVE_ARCH_FLAGS ${arch_run_output} CACHE STRING "MSVC Native architecture flags") - endif() + try_run( + arch_run_result + arch_compile_result + ${CMAKE_CURRENT_BINARY_DIR}/ + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/msvc_arch_flags.c + COMPILE_OUTPUT_VARIABLE arch_compile_output + RUN_OUTPUT_VARIABLE arch_run_output + ) + if(arch_compile_result AND "${arch_run_result}" EQUAL "0") + string(STRIP ${arch_run_output} arch_run_output) + set(MSVC_NATIVE_ARCH_FLAGS ${arch_run_output} CACHE STRING "MSVC Native architecture flags") + endif() endif() set(CYCLES_KERNEL_FLAGS "${MSVC_NATIVE_ARCH_FLAGS}") endif() @@ -364,7 +364,7 @@ endif() # Warnings if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER_ID MATCHES "Clang") - ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros") + add_check_cxx_compiler_flag(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros") unset(_has_no_error_unused_macros) endif() diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index a89c5679b27..ee0cefa823e 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -529,7 +529,7 @@ if(WITH_CYCLES_CUDA_BINARIES) endif() if(DEFINED cuda_nvcc_executable AND DEFINED cuda_toolkit_root_dir) # Compile regular kernel - CYCLES_CUDA_KERNEL_ADD(${arch} ${prev_arch} kernel "" "${cuda_sources}" FALSE) + cycles_cuda_kernel_add(${arch} ${prev_arch} kernel "" "${cuda_sources}" FALSE) if(WITH_CYCLES_CUDA_BUILD_SERIAL) set(prev_arch ${arch}) @@ -611,7 +611,7 @@ if(WITH_CYCLES_HIP_BINARIES AND WITH_CYCLES_DEVICE_HIP) foreach(arch ${CYCLES_HIP_BINARIES_ARCH}) # Compile regular kernel - CYCLES_HIP_KERNEL_ADD(${arch} kernel "" "${hip_sources}" FALSE) + cycles_hip_kernel_add(${arch} kernel "" "${hip_sources}" FALSE) endforeach() add_custom_target(cycles_kernel_hip ALL DEPENDS ${hip_fatbins}) @@ -696,11 +696,11 @@ if(WITH_CYCLES_DEVICE_OPTIX AND WITH_CYCLES_CUDA_BINARIES) delayed_install("${CMAKE_CURRENT_BINARY_DIR}" "${output}" ${CYCLES_INSTALL_PATH}/lib) endmacro() - CYCLES_OPTIX_KERNEL_ADD( + cycles_optix_kernel_add( kernel_optix "device/optix/kernel.cu" "") - CYCLES_OPTIX_KERNEL_ADD( + cycles_optix_kernel_add( kernel_optix_shader_raytrace "device/optix/kernel_shader_raytrace.cu" "--keep-device-functions") @@ -950,8 +950,8 @@ endif() # Warnings to avoid using doubles in the kernel. if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER_ID MATCHES "Clang") - ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion") - ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion") + add_check_cxx_compiler_flag(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion") + add_check_cxx_compiler_flag(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion") unset(_has_cxxflag_float_conversion) unset(_has_cxxflag_double_promotion) endif() diff --git a/intern/cycles/scene/CMakeLists.txt b/intern/cycles/scene/CMakeLists.txt index 10a06ee595d..1bce93aa140 100644 --- a/intern/cycles/scene/CMakeLists.txt +++ b/intern/cycles/scene/CMakeLists.txt @@ -101,7 +101,7 @@ if(WITH_CYCLES_OSL) cycles_kernel_osl ) - SET_PROPERTY(SOURCE osl.cpp PROPERTY COMPILE_FLAGS ${RTTI_DISABLE_FLAGS}) + set_property(SOURCE osl.cpp PROPERTY COMPILE_FLAGS ${RTTI_DISABLE_FLAGS}) endif() if(WITH_OPENCOLORIO) diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt index 3f64febf4df..b126247de5f 100644 --- a/intern/cycles/test/CMakeLists.txt +++ b/intern/cycles/test/CMakeLists.txt @@ -59,5 +59,5 @@ if(NOT APPLE) endif() if(WITH_GTESTS) - BLENDER_SRC_GTEST(cycles "${SRC}" "${LIB}") + blender_src_gtest(cycles "${SRC}" "${LIB}") endif() diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt index 7df1a94bbd8..1dddd70928a 100644 --- a/intern/opensubdiv/CMakeLists.txt +++ b/intern/opensubdiv/CMakeLists.txt @@ -81,11 +81,11 @@ if(WITH_OPENSUBDIV) ) endif() - OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_OPENMP) - OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_OPENCL) - OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_CUDA) - OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK) - OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_GLSL_COMPUTE) + opensubdiv_define_component(OPENSUBDIV_HAS_OPENMP) + opensubdiv_define_component(OPENSUBDIV_HAS_OPENCL) + opensubdiv_define_component(OPENSUBDIV_HAS_CUDA) + opensubdiv_define_component(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK) + opensubdiv_define_component(OPENSUBDIV_HAS_GLSL_COMPUTE) if(WIN32) add_definitions(-DNOMINMAX) diff --git a/source/blender/blenlib/tests/performance/CMakeLists.txt b/source/blender/blenlib/tests/performance/CMakeLists.txt index 2e4fcd4516c..722fd44733a 100644 --- a/source/blender/blenlib/tests/performance/CMakeLists.txt +++ b/source/blender/blenlib/tests/performance/CMakeLists.txt @@ -12,5 +12,5 @@ set(INC include_directories(${INC}) -BLENDER_TEST_PERFORMANCE(BLI_ghash_performance "bf_blenlib") -BLENDER_TEST_PERFORMANCE(BLI_task_performance "bf_blenlib") +blender_test_performance(BLI_ghash_performance "bf_blenlib") +blender_test_performance(BLI_task_performance "bf_blenlib") diff --git a/source/blender/io/collada/CMakeLists.txt b/source/blender/io/collada/CMakeLists.txt index 3289a7c6e66..963a852a26a 100644 --- a/source/blender/io/collada/CMakeLists.txt +++ b/source/blender/io/collada/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2006 Blender Foundation. All rights reserved. remove_strict_flags() -FIND_FILE(OPENCOLLADA_ANIMATION_CLIP +find_file(OPENCOLLADA_ANIMATION_CLIP NAMES COLLADAFWAnimationClip.h PATHS @@ -14,7 +14,7 @@ if(OPENCOLLADA_ANIMATION_CLIP) add_definitions(-DWITH_OPENCOLLADA_ANIMATION_CLIP) endif() -# In cmake version 3.21 and up, we can instead use the NO_CACHE option for +# In CMAKE version 3.21 and up, we can instead use the NO_CACHE option for # find_file so we don't need to clear it from the cache here. unset(OPENCOLLADA_ANIMATION_CLIP CACHE) diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt index 1205ae74e6f..4f1bc29cd0d 100644 --- a/source/blender/io/usd/CMakeLists.txt +++ b/source/blender/io/usd/CMakeLists.txt @@ -20,13 +20,14 @@ add_definitions(-DTBB_SUPPRESS_DEPRECATED_MESSAGES=1) # add a USD_HAS_IMAGING define so code can dynamically detect this. # Cleanup of this variable is done at the end of the file since # test code further down uses it to add imaging tests. -FIND_FILE(USD_IMAGING_HEADERS +find_file( + USD_IMAGING_HEADERS NAMES capsuleAdapter.h PATHS - ${USD_INCLUDE_DIRS} + ${USD_INCLUDE_DIRS} PATH_SUFFIXES - pxr/usdImaging/usdImaging/ + pxr/usdImaging/usdImaging/ NO_DEFAULT_PATH ) @@ -162,7 +163,7 @@ if(WITH_GTESTS) tests/usd_tests_common.h ) if(USD_IMAGING_HEADERS) - LIST(APPEND TEST_SRC tests/usd_imaging_test.cc) + list(APPEND TEST_SRC tests/usd_imaging_test.cc) endif() set(TEST_INC diff --git a/tests/gtests/runner/CMakeLists.txt b/tests/gtests/runner/CMakeLists.txt index 97b95851be8..be0aa65d409 100644 --- a/tests/gtests/runner/CMakeLists.txt +++ b/tests/gtests/runner/CMakeLists.txt @@ -27,7 +27,7 @@ else() endif() # This builds `bin/tests/blender_test`, but does not add it as a single test. -BLENDER_SRC_GTEST_EX( +blender_src_gtest_ex( NAME blender SRC "${SRC}" EXTRA_LIBS "${TEST_LIBS}" diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index ca3070b60ad..27473061304 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -632,13 +632,13 @@ endif() if(WITH_CYCLES OR WITH_OPENGL_RENDER_TESTS) if(NOT OPENIMAGEIO_IDIFF) - MESSAGE(WARNING "Disabling render tests because OIIO idiff does not exist") + message(WARNING "Disabling render tests because OIIO idiff does not exist") elseif(NOT EXISTS "${TEST_SRC_DIR}/render/shader") - MESSAGE(WARNING "Disabling render tests because tests folder does not exist at ${TEST_SRC_DIR}") + message(WARNING "Disabling render tests because tests folder does not exist at ${TEST_SRC_DIR}") elseif(NOT WITH_COMPOSITOR_CPU) - MESSAGE(WARNING "Disabling render tests because WITH_COMPOSITOR_CPU is disabled") + message(WARNING "Disabling render tests because WITH_COMPOSITOR_CPU is disabled") elseif(NOT WITH_OPENCOLORIO) - MESSAGE(WARNING "Disabling render tests because WITH_OPENCOLORIO is disabled") + message(WARNING "Disabling render tests because WITH_OPENCOLORIO is disabled") else() set(render_tests camera @@ -801,15 +801,15 @@ foreach(geo_node_test ${geo_node_tests}) ) endforeach() else() - MESSAGE(STATUS "Directory named ${TEST_SRC_DIR}/modeling/geometry_nodes/${geo_node_test}/ Not Found, disabling test.") + message(STATUS "Directory named ${TEST_SRC_DIR}/modeling/geometry_nodes/${geo_node_test}/ Not Found, disabling test.") endif() endforeach() if(WITH_OPENGL_DRAW_TESTS) if(NOT OPENIMAGEIO_IDIFF) - MESSAGE(STATUS "Disabling OpenGL draw tests because OIIO idiff does not exist") + message(STATUS "Disabling OpenGL draw tests because OIIO idiff does not exist") elseif(NOT EXISTS "${TEST_SRC_DIR}/opengl") - MESSAGE(STATUS "Disabling OpenGL draw tests because tests folder does not exist at ${TEST_SRC_DIR}") + message(STATUS "Disabling OpenGL draw tests because tests folder does not exist at ${TEST_SRC_DIR}") else() # Use all subdirectories of opengl folder. file(GLOB children RELATIVE ${TEST_SRC_DIR}/opengl ${TEST_SRC_DIR}/opengl/*) @@ -881,7 +881,7 @@ endif() # SEQUENCER RENDER TESTS if(NOT OPENIMAGEIO_IDIFF) - MESSAGE(STATUS "Disabling sequencer render tests because OIIO idiff does not exist") + message(STATUS "Disabling sequencer render tests because OIIO idiff does not exist") else() set(render_tests transform diff --git a/tests/python/collada/CMakeLists.txt b/tests/python/collada/CMakeLists.txt index ecc092250c9..27388337de6 100644 --- a/tests/python/collada/CMakeLists.txt +++ b/tests/python/collada/CMakeLists.txt @@ -47,5 +47,5 @@ endmacro() # Tests are disabled because they only work on Windows # Tests will be redone completely to work reliable # -# COLLADA_TEST(mesh simple mesh_simple.blend) -# COLLADA_TEST(animation simple suzannes_parent_inverse.blend) +# collada_test(mesh simple mesh_simple.blend) +# collada_test(animation simple suzannes_parent_inverse.blend) diff --git a/tests/python/view_layer/CMakeLists.txt b/tests/python/view_layer/CMakeLists.txt index 56dc1c8b5e9..8052d375d23 100644 --- a/tests/python/view_layer/CMakeLists.txt +++ b/tests/python/view_layer/CMakeLists.txt @@ -20,7 +20,7 @@ set(TEST_BLENDER_EXE $<TARGET_FILE:blender> --background -noaudio --factory-star # ------------------------------------------------------------------------------ -macro(VIEW_LAYER_TEST test_name) +macro(view_layer_test test_name) # Adds ${CMAKE_CURRENT_LIST_DIR} to sys.path so that the tests can import # things from view_layer_common.py add_test(view_layer_${test_name} ${TEST_BLENDER_EXE} @@ -31,129 +31,129 @@ macro(VIEW_LAYER_TEST test_name) ) endmacro() -VIEW_LAYER_TEST(active_collection) -VIEW_LAYER_TEST(background_set) -VIEW_LAYER_TEST(collection_new_sync) -VIEW_LAYER_TEST(collection_rename_a) -VIEW_LAYER_TEST(collection_rename_b) -# VIEW_LAYER_TEST(evaluation_render_settings_a) -# VIEW_LAYER_TEST(evaluation_render_settings_b) -# VIEW_LAYER_TEST(evaluation_render_settings_c) -# VIEW_LAYER_TEST(evaluation_render_settings_d) -# VIEW_LAYER_TEST(evaluation_render_settings_e) -# VIEW_LAYER_TEST(evaluation_render_settings_f) -# VIEW_LAYER_TEST(evaluation_render_settings_g) -# VIEW_LAYER_TEST(evaluation_render_settings_h) -# VIEW_LAYER_TEST(evaluation_render_settings_i) -VIEW_LAYER_TEST(evaluation_visibility_a) -VIEW_LAYER_TEST(evaluation_visibility_b) -VIEW_LAYER_TEST(evaluation_visibility_c) -VIEW_LAYER_TEST(evaluation_visibility_d) -VIEW_LAYER_TEST(evaluation_visibility_e) -VIEW_LAYER_TEST(evaluation_visibility_f) -VIEW_LAYER_TEST(evaluation_visibility_g) -VIEW_LAYER_TEST(evaluation_visibility_h) -VIEW_LAYER_TEST(evaluation_visibility_i) -VIEW_LAYER_TEST(evaluation_visibility_j) -VIEW_LAYER_TEST(evaluation_selectability_a) -VIEW_LAYER_TEST(evaluation_selectability_b) -VIEW_LAYER_TEST(evaluation_selectability_c) -VIEW_LAYER_TEST(evaluation_selectability_d) -VIEW_LAYER_TEST(evaluation_selectability_e) -VIEW_LAYER_TEST(evaluation_selectability_f) -VIEW_LAYER_TEST(group_a) -VIEW_LAYER_TEST(group_b) -VIEW_LAYER_TEST(group_c) -VIEW_LAYER_TEST(group_d) -VIEW_LAYER_TEST(group_e) -VIEW_LAYER_TEST(object_add_cylinder) -VIEW_LAYER_TEST(object_add_empty) -VIEW_LAYER_TEST(object_add_torus) -VIEW_LAYER_TEST(object_add_no_collection_cylinder) -VIEW_LAYER_TEST(object_add_no_collection_empty) -VIEW_LAYER_TEST(object_add_no_collection_torus) -VIEW_LAYER_TEST(object_copy) -VIEW_LAYER_TEST(object_delete_a) -VIEW_LAYER_TEST(object_delete_b) -VIEW_LAYER_TEST(object_link_a) -VIEW_LAYER_TEST(object_link_b) -VIEW_LAYER_TEST(object_link_c) -VIEW_LAYER_TEST(operator_context) -VIEW_LAYER_TEST(make_single_user) -VIEW_LAYER_TEST(move_above_below_scene_collection_a) -VIEW_LAYER_TEST(move_above_below_scene_collection_b) -VIEW_LAYER_TEST(move_above_below_scene_collection_c) -VIEW_LAYER_TEST(move_above_below_scene_collection_d) -VIEW_LAYER_TEST(move_above_below_scene_collection_e) -VIEW_LAYER_TEST(move_above_below_scene_collection_f) -VIEW_LAYER_TEST(move_above_below_scene_collection_g) -VIEW_LAYER_TEST(move_above_below_scene_collection_h) -VIEW_LAYER_TEST(move_above_below_scene_collection_i) -VIEW_LAYER_TEST(move_above_below_scene_collection_sync_a) -VIEW_LAYER_TEST(move_above_below_scene_collection_sync_b) -VIEW_LAYER_TEST(move_above_below_scene_collection_sync_c) -VIEW_LAYER_TEST(move_above_below_scene_collection_sync_d) -VIEW_LAYER_TEST(move_above_below_scene_collection_sync_e) -VIEW_LAYER_TEST(move_above_below_scene_collection_sync_f) -VIEW_LAYER_TEST(move_above_below_scene_collection_sync_g) -VIEW_LAYER_TEST(move_above_below_scene_collection_sync_h) -VIEW_LAYER_TEST(move_above_below_scene_collection_sync_i) -VIEW_LAYER_TEST(move_into_scene_collection_a) -VIEW_LAYER_TEST(move_into_scene_collection_b) -VIEW_LAYER_TEST(move_into_scene_collection_c) -VIEW_LAYER_TEST(move_into_scene_collection_d) -VIEW_LAYER_TEST(move_into_scene_collection_e) -VIEW_LAYER_TEST(move_into_scene_collection_f) -VIEW_LAYER_TEST(move_into_scene_collection_g) -VIEW_LAYER_TEST(move_into_scene_collection_h) -VIEW_LAYER_TEST(move_into_scene_collection_i) -VIEW_LAYER_TEST(move_into_scene_collection_j) -VIEW_LAYER_TEST(move_into_scene_collection_k) -VIEW_LAYER_TEST(move_into_scene_collection_l) -VIEW_LAYER_TEST(move_into_scene_collection_sync_a) -VIEW_LAYER_TEST(move_into_scene_collection_sync_b) -VIEW_LAYER_TEST(move_into_scene_collection_sync_c) -VIEW_LAYER_TEST(move_into_scene_collection_sync_d) -VIEW_LAYER_TEST(move_into_scene_collection_sync_e) -VIEW_LAYER_TEST(move_into_scene_collection_sync_f) -VIEW_LAYER_TEST(move_into_scene_collection_sync_g) -VIEW_LAYER_TEST(move_into_scene_collection_sync_h) -VIEW_LAYER_TEST(move_into_scene_collection_sync_i) -VIEW_LAYER_TEST(move_into_scene_collection_sync_j) -VIEW_LAYER_TEST(move_into_scene_collection_sync_k) -VIEW_LAYER_TEST(move_into_scene_collection_sync_l) -VIEW_LAYER_TEST(move_above_below_layer_collection_a) -VIEW_LAYER_TEST(move_above_below_layer_collection_b) -VIEW_LAYER_TEST(move_above_below_layer_collection_c) -VIEW_LAYER_TEST(move_above_below_layer_collection_d) -VIEW_LAYER_TEST(move_above_below_layer_collection_e) -VIEW_LAYER_TEST(move_above_below_layer_collection_f) -VIEW_LAYER_TEST(move_above_below_layer_collection_g) -VIEW_LAYER_TEST(move_above_below_layer_collection_h) -VIEW_LAYER_TEST(move_above_below_layer_collection_i) -VIEW_LAYER_TEST(move_above_below_layer_collection_j) -VIEW_LAYER_TEST(move_above_below_layer_collection_k) -VIEW_LAYER_TEST(move_above_below_layer_collection_l) -VIEW_LAYER_TEST(move_into_layer_collection_a) -VIEW_LAYER_TEST(move_into_layer_collection_b) -VIEW_LAYER_TEST(move_into_layer_collection_c) -VIEW_LAYER_TEST(move_into_layer_collection_d) -VIEW_LAYER_TEST(move_into_layer_collection_e) -VIEW_LAYER_TEST(move_into_layer_collection_f) -VIEW_LAYER_TEST(move_into_layer_collection_g) -VIEW_LAYER_TEST(move_into_layer_collection_h) -VIEW_LAYER_TEST(move_into_layer_collection_i) -VIEW_LAYER_TEST(move_into_layer_collection_j) -VIEW_LAYER_TEST(layer_linking) -VIEW_LAYER_TEST(layer_syncing) -VIEW_LAYER_TEST(scene_collection_delete) -VIEW_LAYER_TEST(scene_copy_a) -VIEW_LAYER_TEST(scene_copy_b) -VIEW_LAYER_TEST(scene_copy_c) -VIEW_LAYER_TEST(scene_copy_d) -VIEW_LAYER_TEST(scene_copy_e) -VIEW_LAYER_TEST(scene_copy_f) -VIEW_LAYER_TEST(scene_delete) -VIEW_LAYER_TEST(scene_objects) -VIEW_LAYER_TEST(scene_write_read) -VIEW_LAYER_TEST(view_layer_rename) +view_layer_test(active_collection) +view_layer_test(background_set) +view_layer_test(collection_new_sync) +view_layer_test(collection_rename_a) +view_layer_test(collection_rename_b) +# view_layer_test(evaluation_render_settings_a) +# view_layer_test(evaluation_render_settings_b) +# view_layer_test(evaluation_render_settings_c) +# view_layer_test(evaluation_render_settings_d) +# view_layer_test(evaluation_render_settings_e) +# view_layer_test(evaluation_render_settings_f) +# view_layer_test(evaluation_render_settings_g) +# view_layer_test(evaluation_render_settings_h) +# view_layer_test(evaluation_render_settings_i) +view_layer_test(evaluation_visibility_a) +view_layer_test(evaluation_visibility_b) +view_layer_test(evaluation_visibility_c) +view_layer_test(evaluation_visibility_d) +view_layer_test(evaluation_visibility_e) +view_layer_test(evaluation_visibility_f) +view_layer_test(evaluation_visibility_g) +view_layer_test(evaluation_visibility_h) +view_layer_test(evaluation_visibility_i) +view_layer_test(evaluation_visibility_j) +view_layer_test(evaluation_selectability_a) +view_layer_test(evaluation_selectability_b) +view_layer_test(evaluation_selectability_c) +view_layer_test(evaluation_selectability_d) +view_layer_test(evaluation_selectability_e) +view_layer_test(evaluation_selectability_f) +view_layer_test(group_a) +view_layer_test(group_b) +view_layer_test(group_c) +view_layer_test(group_d) +view_layer_test(group_e) +view_layer_test(object_add_cylinder) +view_layer_test(object_add_empty) +view_layer_test(object_add_torus) +view_layer_test(object_add_no_collection_cylinder) +view_layer_test(object_add_no_collection_empty) +view_layer_test(object_add_no_collection_torus) +view_layer_test(object_copy) +view_layer_test(object_delete_a) +view_layer_test(object_delete_b) +view_layer_test(object_link_a) +view_layer_test(object_link_b) +view_layer_test(object_link_c) +view_layer_test(operator_context) +view_layer_test(make_single_user) +view_layer_test(move_above_below_scene_collection_a) +view_layer_test(move_above_below_scene_collection_b) +view_layer_test(move_above_below_scene_collection_c) +view_layer_test(move_above_below_scene_collection_d) +view_layer_test(move_above_below_scene_collection_e) +view_layer_test(move_above_below_scene_collection_f) +view_layer_test(move_above_below_scene_collection_g) +view_layer_test(move_above_below_scene_collection_h) +view_layer_test(move_above_below_scene_collection_i) +view_layer_test(move_above_below_scene_collection_sync_a) +view_layer_test(move_above_below_scene_collection_sync_b) +view_layer_test(move_above_below_scene_collection_sync_c) +view_layer_test(move_above_below_scene_collection_sync_d) +view_layer_test(move_above_below_scene_collection_sync_e) +view_layer_test(move_above_below_scene_collection_sync_f) +view_layer_test(move_above_below_scene_collection_sync_g) +view_layer_test(move_above_below_scene_collection_sync_h) +view_layer_test(move_above_below_scene_collection_sync_i) +view_layer_test(move_into_scene_collection_a) +view_layer_test(move_into_scene_collection_b) +view_layer_test(move_into_scene_collection_c) +view_layer_test(move_into_scene_collection_d) +view_layer_test(move_into_scene_collection_e) +view_layer_test(move_into_scene_collection_f) +view_layer_test(move_into_scene_collection_g) +view_layer_test(move_into_scene_collection_h) +view_layer_test(move_into_scene_collection_i) +view_layer_test(move_into_scene_collection_j) +view_layer_test(move_into_scene_collection_k) +view_layer_test(move_into_scene_collection_l) +view_layer_test(move_into_scene_collection_sync_a) +view_layer_test(move_into_scene_collection_sync_b) +view_layer_test(move_into_scene_collection_sync_c) +view_layer_test(move_into_scene_collection_sync_d) +view_layer_test(move_into_scene_collection_sync_e) +view_layer_test(move_into_scene_collection_sync_f) +view_layer_test(move_into_scene_collection_sync_g) +view_layer_test(move_into_scene_collection_sync_h) +view_layer_test(move_into_scene_collection_sync_i) +view_layer_test(move_into_scene_collection_sync_j) +view_layer_test(move_into_scene_collection_sync_k) +view_layer_test(move_into_scene_collection_sync_l) +view_layer_test(move_above_below_layer_collection_a) +view_layer_test(move_above_below_layer_collection_b) +view_layer_test(move_above_below_layer_collection_c) +view_layer_test(move_above_below_layer_collection_d) +view_layer_test(move_above_below_layer_collection_e) +view_layer_test(move_above_below_layer_collection_f) +view_layer_test(move_above_below_layer_collection_g) +view_layer_test(move_above_below_layer_collection_h) +view_layer_test(move_above_below_layer_collection_i) +view_layer_test(move_above_below_layer_collection_j) +view_layer_test(move_above_below_layer_collection_k) +view_layer_test(move_above_below_layer_collection_l) +view_layer_test(move_into_layer_collection_a) +view_layer_test(move_into_layer_collection_b) +view_layer_test(move_into_layer_collection_c) +view_layer_test(move_into_layer_collection_d) +view_layer_test(move_into_layer_collection_e) +view_layer_test(move_into_layer_collection_f) +view_layer_test(move_into_layer_collection_g) +view_layer_test(move_into_layer_collection_h) +view_layer_test(move_into_layer_collection_i) +view_layer_test(move_into_layer_collection_j) +view_layer_test(layer_linking) +view_layer_test(layer_syncing) +view_layer_test(scene_collection_delete) +view_layer_test(scene_copy_a) +view_layer_test(scene_copy_b) +view_layer_test(scene_copy_c) +view_layer_test(scene_copy_d) +view_layer_test(scene_copy_e) +view_layer_test(scene_copy_f) +view_layer_test(scene_delete) +view_layer_test(scene_objects) +view_layer_test(scene_write_read) +view_layer_test(view_layer_rename) |