From 2ac6e26c258faec43e60ccfbe3fa1f904f2c6a89 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 17 Dec 2022 13:30:07 +1100 Subject: [PATCH] Cleanup: cmake formatting --- CMakeLists.txt | 6 ++-- .../build_environment/cmake/cve_check.cmake | 2 +- .../build_environment/cmake/download.cmake | 16 +++++----- .../build_environment/cmake/embree.cmake | 29 ++++++++++--------- build_files/build_environment/cmake/gmp.cmake | 12 ++++---- .../build_environment/cmake/opencollada.cmake | 4 +-- build_files/build_environment/cmake/usd.cmake | 5 ++-- .../buildbot/config/blender_linux.cmake | 2 +- build_files/cmake/Modules/FindOpenEXR.cmake | 2 +- build_files/cmake/have_features.cmake | 2 +- build_files/cmake/macros.cmake | 16 +++++----- .../platform/platform_old_libs_update.cmake | 2 +- .../cmake/platform/platform_unix.cmake | 2 +- .../cmake/platform/platform_win32.cmake | 10 +++---- intern/cycles/CMakeLists.txt | 2 +- intern/cycles/cmake/macros.cmake | 4 +-- intern/cycles/device/CMakeLists.txt | 2 +- intern/cycles/doc/license/CMakeLists.txt | 2 +- intern/cycles/kernel/CMakeLists.txt | 20 ++++++------- .../cycles/kernel/osl/shaders/CMakeLists.txt | 2 +- intern/ghost/CMakeLists.txt | 2 +- intern/locale/CMakeLists.txt | 2 +- source/blender/makesrna/intern/CMakeLists.txt | 2 +- source/creator/CMakeLists.txt | 2 +- 24 files changed, 76 insertions(+), 74 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c9e0de18913..62e03a003b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -576,8 +576,8 @@ endif() # OpenGL -option(WITH_OPENGL "When off limits visibility of the opengl headers to just bf_gpu and gawain (temporary option for development purposes)" ON) -option(WITH_GPU_BUILDTIME_SHADER_BUILDER "Shader builder is a developer option enabling linting on GLSL during compilation" OFF) +option(WITH_OPENGL "When off limits visibility of the opengl headers to just bf_gpu and gawain (temporary option for development purposes)" ON) +option(WITH_GPU_BUILDTIME_SHADER_BUILDER "Shader builder is a developer option enabling linting on GLSL during compilation" OFF) mark_as_advanced( WITH_OPENGL @@ -2011,7 +2011,7 @@ set(LIBDIR_STALE) if(UNIX AND NOT APPLE) # Only search for the path if it's found on the system. - if (EXISTS "../lib/linux_centos7_x86_64") + if(EXISTS "../lib/linux_centos7_x86_64") set(LIBDIR_STALE "/lib/linux_centos7_x86_64/") endif() endif() diff --git a/build_files/build_environment/cmake/cve_check.cmake b/build_files/build_environment/cmake/cve_check.cmake index 941b6b0cae9..979b5d2a794 100644 --- a/build_files/build_environment/cmake/cve_check.cmake +++ b/build_files/build_environment/cmake/cve_check.cmake @@ -24,7 +24,7 @@ set(SBOMCONTENTS) get_cmake_property(_variableNames VARIABLES) -foreach (_variableName ${_variableNames}) +foreach(_variableName ${_variableNames}) if(_variableName MATCHES "CPE$") string(REPLACE ":" ";" CPE_LIST ${${_variableName}}) string(REPLACE "_CPE" "_ID" CPE_DEPNAME ${_variableName}) diff --git a/build_files/build_environment/cmake/download.cmake b/build_files/build_environment/cmake/download.cmake index 4f8ecc7d0ce..dab4417109a 100644 --- a/build_files/build_environment/cmake/download.cmake +++ b/build_files/build_environment/cmake/download.cmake @@ -10,22 +10,22 @@ function(download_source dep) if(PACKAGE_USE_UPSTREAM_SOURCES) set(TARGET_URI ${${dep}_URI}) elseif(BLENDER_VERSION) - set(TARGET_URI https://svn.blender.org/svnroot/bf-blender/tags/blender-${BLENDER_VERSION}-release/lib/packages/${TARGET_FILE}) + set(TARGET_URI https://svn.blender.org/svnroot/bf-blender/tags/blender-${BLENDER_VERSION}-release/lib/packages/${TARGET_FILE}) else() - set(TARGET_URI https://svn.blender.org/svnroot/bf-blender/trunk/lib/packages/${TARGET_FILE}) + set(TARGET_URI https://svn.blender.org/svnroot/bf-blender/trunk/lib/packages/${TARGET_FILE}) endif() # Validate all required variables are set and give an explicit error message # rather than CMake erroring out later on with a more ambigious error. - if (NOT DEFINED TARGET_FILE) + if(NOT DEFINED TARGET_FILE) message(FATAL_ERROR "${dep}_FILE variable not set") endif() - if (NOT DEFINED TARGET_HASH) + if(NOT DEFINED TARGET_HASH) message(FATAL_ERROR "${dep}_HASH variable not set") endif() - if (NOT DEFINED TARGET_HASH_TYPE) + if(NOT DEFINED TARGET_HASH_TYPE) message(FATAL_ERROR "${dep}_HASH_TYPE variable not set") endif() - if (NOT DEFINED TARGET_URI) + if(NOT DEFINED TARGET_URI) message(FATAL_ERROR "${dep}_URI variable not set") endif() set(TARGET_FILE ${PACKAGE_DIR}/${TARGET_FILE}) @@ -43,11 +43,11 @@ function(download_source dep) if(EXISTS ${TARGET_FILE}) # Sometimes the download fails, but that is not a # fail condition for "file(DOWNLOAD" it will warn about - # a crc mismatch and just carry on, we need to explicitly + # a CRC mismatch and just carry on, we need to explicitly # catch this and remove the bogus 0 byte file so we can # retry without having to go find the file and manually # delete it. - file (SIZE ${TARGET_FILE} TARGET_SIZE) + file(SIZE ${TARGET_FILE} TARGET_SIZE) if(${TARGET_SIZE} EQUAL 0) file(REMOVE ${TARGET_FILE}) message(FATAL_ERROR "for ${TARGET_FILE} file size 0, download likely failed, deleted...") diff --git a/build_files/build_environment/cmake/embree.cmake b/build_files/build_environment/cmake/embree.cmake index 8c689cf000b..f57f710d0e6 100644 --- a/build_files/build_environment/cmake/embree.cmake +++ b/build_files/build_environment/cmake/embree.cmake @@ -15,10 +15,11 @@ set(EMBREE_EXTRA_ARGS -DTBB_ROOT=${LIBDIR}/tbb ) -if (NOT BLENDER_PLATFORM_ARM) +if(NOT BLENDER_PLATFORM_ARM) set(EMBREE_EXTRA_ARGS ${EMBREE_EXTRA_ARGS} - -DEMBREE_MAX_ISA=AVX2) + -DEMBREE_MAX_ISA=AVX2 + ) endif() if(TBB_STATIC_LIBRARY) @@ -52,17 +53,17 @@ if(WIN32) ) else() ExternalProject_Add_Step(external_embree after_install - COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree3.lib ${HARVEST_TARGET}/embree/lib/embree3_d.lib - COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_avx.lib ${HARVEST_TARGET}/embree/lib/embree_avx_d.lib - COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_avx2.lib ${HARVEST_TARGET}/embree/lib/embree_avx2_d.lib - COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_sse42.lib ${HARVEST_TARGET}/embree/lib/embree_sse42_d.lib - COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/lexers.lib ${HARVEST_TARGET}/embree/lib/lexers_d.lib - COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/math.lib ${HARVEST_TARGET}/embree/lib/math_d.lib - COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/simd.lib ${HARVEST_TARGET}/embree/lib/simd_d.lib - COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/sys.lib ${HARVEST_TARGET}/embree/lib/sys_d.lib - COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/tasking.lib ${HARVEST_TARGET}/embree/lib/tasking_d.lib - DEPENDEES install - ) - endif() + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree3.lib ${HARVEST_TARGET}/embree/lib/embree3_d.lib + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_avx.lib ${HARVEST_TARGET}/embree/lib/embree_avx_d.lib + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_avx2.lib ${HARVEST_TARGET}/embree/lib/embree_avx2_d.lib + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_sse42.lib ${HARVEST_TARGET}/embree/lib/embree_sse42_d.lib + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/lexers.lib ${HARVEST_TARGET}/embree/lib/lexers_d.lib + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/math.lib ${HARVEST_TARGET}/embree/lib/math_d.lib + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/simd.lib ${HARVEST_TARGET}/embree/lib/simd_d.lib + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/sys.lib ${HARVEST_TARGET}/embree/lib/sys_d.lib + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/tasking.lib ${HARVEST_TARGET}/embree/lib/tasking_d.lib + DEPENDEES install + ) +endif() endif() diff --git a/build_files/build_environment/cmake/gmp.cmake b/build_files/build_environment/cmake/gmp.cmake index df4d20fb934..820da4bdf7d 100644 --- a/build_files/build_environment/cmake/gmp.cmake +++ b/build_files/build_environment/cmake/gmp.cmake @@ -40,10 +40,10 @@ endif() if(BUILD_MODE STREQUAL Release AND WIN32) ExternalProject_Add_Step(external_gmp after_install - COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-3.dll.def ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def - COMMAND lib /def:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def /machine:x64 /out:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib - COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/gmp/bin/libgmp-10.dll ${HARVEST_TARGET}/gmp/lib/libgmp-10.dll - COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib ${HARVEST_TARGET}/gmp/lib/libgmp-10.lib + COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-3.dll.def ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def + COMMAND lib /def:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def /machine:x64 /out:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/gmp/bin/libgmp-10.dll ${HARVEST_TARGET}/gmp/lib/libgmp-10.dll + COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib ${HARVEST_TARGET}/gmp/lib/libgmp-10.lib COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/gmp/include ${HARVEST_TARGET}/gmp/include DEPENDEES install @@ -52,8 +52,8 @@ endif() if(BUILD_MODE STREQUAL Debug AND WIN32) ExternalProject_Add_Step(external_gmp after_install - COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-3.dll.def ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def - COMMAND lib /def:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def /machine:x64 /out:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib + COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-3.dll.def ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def + COMMAND lib /def:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def /machine:x64 /out:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib DEPENDEES install ) diff --git a/build_files/build_environment/cmake/opencollada.cmake b/build_files/build_environment/cmake/opencollada.cmake index 9e403f25181..0042a961525 100644 --- a/build_files/build_environment/cmake/opencollada.cmake +++ b/build_files/build_environment/cmake/opencollada.cmake @@ -26,9 +26,9 @@ else() -DLIBXML2_INCLUDE_DIR=${LIBDIR}/xml2/include/libxml2 ) if(BUILD_MODE STREQUAL Release) - list(APPEND OPENCOLLADA_EXTRA_ARGS -DLIBXML2_LIBRARIES=${LIBDIR}/xml2/lib/libxml2s.lib) + list(APPEND OPENCOLLADA_EXTRA_ARGS -DLIBXML2_LIBRARIES=${LIBDIR}/xml2/lib/libxml2s.lib) else() - list(APPEND OPENCOLLADA_EXTRA_ARGS -DLIBXML2_LIBRARIES=${LIBDIR}/xml2/lib/libxml2sd.lib) + list(APPEND OPENCOLLADA_EXTRA_ARGS -DLIBXML2_LIBRARIES=${LIBDIR}/xml2/lib/libxml2sd.lib) endif() set(PATCH_MAYBE_DOS2UNIX_CMD) endif() diff --git a/build_files/build_environment/cmake/usd.cmake b/build_files/build_environment/cmake/usd.cmake index 439d098a847..98c7931808f 100644 --- a/build_files/build_environment/cmake/usd.cmake +++ b/build_files/build_environment/cmake/usd.cmake @@ -34,7 +34,8 @@ elseif(UNIX) if(APPLE) set(USD_SHARED_LINKER_FLAGS "-Xlinker -undefined -Xlinker dynamic_lookup") list(APPEND USD_PLATFORM_FLAGS - -DCMAKE_SHARED_LINKER_FLAGS=${USD_SHARED_LINKER_FLAGS}) + -DCMAKE_SHARED_LINKER_FLAGS=${USD_SHARED_LINKER_FLAGS} + ) endif() endif() @@ -112,7 +113,7 @@ add_dependencies( # Since USD 21.11 the libraries are prefixed with "usd_", i.e. "libusd_m.a" became "libusd_usd_m.a". # See https://github.com/PixarAnimationStudios/USD/blob/release/CHANGELOG.md#2111---2021-11-01 if(NOT WIN32) - if (USD_VERSION VERSION_LESS 21.11) + if(USD_VERSION VERSION_LESS 21.11) set(PXR_LIB_PREFIX "") else() set(PXR_LIB_PREFIX "usd_") diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index ae7849002f7..18a1de51b2d 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -27,4 +27,4 @@ set(LIBDIR "${CMAKE_CURRENT_LIST_DIR}/../../../../lib/${LIBDIR_NAME}" CACHE STRI # Platform specific configuration, to ensure static linking against everything. # Additional linking libraries -set(CMAKE_EXE_LINKER_FLAGS "-lrt -no-pie" CACHE STRING "" FORCE) +set(CMAKE_EXE_LINKER_FLAGS "-lrt -no-pie" CACHE STRING "" FORCE) diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake b/build_files/cmake/Modules/FindOpenEXR.cmake index 1cc3e50ba92..bbc1e11539f 100644 --- a/build_files/cmake/Modules/FindOpenEXR.cmake +++ b/build_files/cmake/Modules/FindOpenEXR.cmake @@ -172,7 +172,7 @@ ENDIF() # handle the QUIETLY and REQUIRED arguments and set OPENEXR_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG +FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG _openexr_LIBRARIES OPENEXR_INCLUDE_DIR) IF(OPENEXR_FOUND) diff --git a/build_files/cmake/have_features.cmake b/build_files/cmake/have_features.cmake index dc3b61849ea..3b2fdad30b9 100644 --- a/build_files/cmake/have_features.cmake +++ b/build_files/cmake/have_features.cmake @@ -22,7 +22,7 @@ endif() # Used for: `source/blender/blenlib/intern/system.c`. # `execinfo` is not available on non-GLIBC systems (at least not on MUSL-LIBC), -# so check the presence of the header before including it and using the it for back-trace. +# so check the presence of the header before including it and using the it for back-trace. set(HAVE_EXECINFO_H OFF) if(NOT MSVC) include(CheckIncludeFiles) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 178a63fba7c..b632cb9c551 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -326,8 +326,8 @@ function(blender_add_lib__impl # NOTE: If separated libraries for debug and release are needed every library is the list are # to be prefixed explicitly. # - # Use: "optimized libfoo optimized libbar debug libfoo_d debug libbar_d" - # NOT: "optimized libfoo libbar debug libfoo_d libbar_d" + # Use: "optimized libfoo optimized libbar debug libfoo_d debug libbar_d" + # NOT: "optimized libfoo libbar debug libfoo_d libbar_d" if(NOT "${library_deps}" STREQUAL "") set(next_library_mode "") foreach(library ${library_deps}) @@ -535,7 +535,7 @@ function(setup_platform_linker_flags set_property(TARGET ${target} APPEND_STRING PROPERTY LINK_FLAGS_DEBUG " ${PLATFORM_LINKFLAGS_DEBUG}") get_target_property(target_type ${target} TYPE) - if (target_type STREQUAL "EXECUTABLE") + if(target_type STREQUAL "EXECUTABLE") set_property(TARGET ${target} APPEND_STRING PROPERTY LINK_FLAGS " ${PLATFORM_LINKFLAGS_EXECUTABLE}") endif() endfunction() @@ -1219,7 +1219,7 @@ function(print_cached_vars_containing_value set(_found) get_cmake_property(_vars VARIABLES) foreach(_var ${_vars}) - if (DEFINED CACHE{${_var}}) + if(DEFINED CACHE{${_var}}) # Skip "_" prefixed variables, these are used for internal book-keeping, # not under user control. string(FIND "${_var}" "_" _found) @@ -1256,10 +1256,10 @@ macro(openmp_delayload else() set(OPENMP_DLL_NAME "vcomp140") endif() - set_property(TARGET ${projectname} APPEND_STRING PROPERTY LINK_FLAGS_RELEASE " /DELAYLOAD:${OPENMP_DLL_NAME}.dll delayimp.lib") - set_property(TARGET ${projectname} APPEND_STRING PROPERTY LINK_FLAGS_DEBUG " /DELAYLOAD:${OPENMP_DLL_NAME}d.dll delayimp.lib") - set_property(TARGET ${projectname} APPEND_STRING PROPERTY LINK_FLAGS_RELWITHDEBINFO " /DELAYLOAD:${OPENMP_DLL_NAME}.dll delayimp.lib") - set_property(TARGET ${projectname} APPEND_STRING PROPERTY LINK_FLAGS_MINSIZEREL " /DELAYLOAD:${OPENMP_DLL_NAME}.dll delayimp.lib") + set_property(TARGET ${projectname} APPEND_STRING PROPERTY LINK_FLAGS_RELEASE " /DELAYLOAD:${OPENMP_DLL_NAME}.dll delayimp.lib") + set_property(TARGET ${projectname} APPEND_STRING PROPERTY LINK_FLAGS_DEBUG " /DELAYLOAD:${OPENMP_DLL_NAME}d.dll delayimp.lib") + set_property(TARGET ${projectname} APPEND_STRING PROPERTY LINK_FLAGS_RELWITHDEBINFO " /DELAYLOAD:${OPENMP_DLL_NAME}.dll delayimp.lib") + set_property(TARGET ${projectname} APPEND_STRING PROPERTY LINK_FLAGS_MINSIZEREL " /DELAYLOAD:${OPENMP_DLL_NAME}.dll delayimp.lib") endif() endif() endmacro() diff --git a/build_files/cmake/platform/platform_old_libs_update.cmake b/build_files/cmake/platform/platform_old_libs_update.cmake index 14f64ff0607..c51029ab570 100644 --- a/build_files/cmake/platform/platform_old_libs_update.cmake +++ b/build_files/cmake/platform/platform_old_libs_update.cmake @@ -5,7 +5,7 @@ function(unset_cache_variables pattern) get_cmake_property(_cache_variables CACHE_VARIABLES) - foreach (_cache_variable ${_cache_variables}) + foreach(_cache_variable ${_cache_variables}) if("${_cache_variable}" MATCHES "${pattern}") unset(${_cache_variable} CACHE) endif() diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index cf9226433a3..bdf39d04d32 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -789,7 +789,7 @@ if(WITH_GHOST_X11) endif() if(WITH_X11_ALPHA) - find_library(X11_Xrender_LIB Xrender ${X11_LIB_SEARCH_PATH}) + find_library(X11_Xrender_LIB Xrender ${X11_LIB_SEARCH_PATH}) mark_as_advanced(X11_Xrender_LIB) if(NOT X11_Xrender_LIB) message(FATAL_ERROR "libXrender not found. Disable WITH_X11_ALPHA if you diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index f58b9bd4676..da418a27274 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -302,7 +302,7 @@ endif() file(GLOB children RELATIVE ${LIBDIR} ${LIBDIR}/*) foreach(child ${children}) if(IS_DIRECTORY ${LIBDIR}/${child}) - list(APPEND CMAKE_PREFIX_PATH ${LIBDIR}/${child}) + list(APPEND CMAKE_PREFIX_PATH ${LIBDIR}/${child}) endif() endforeach() @@ -555,7 +555,7 @@ if(WITH_BOOST) set(BOOST_PREFIX "") # This is file new in 3.4 if it does not exist, assume we are building against 3.3 libs set(BOOST_34_TRIGGER_FILE ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_python310-${BOOST_DEBUG_POSTFIX}.lib) - if (NOT EXISTS ${BOOST_34_TRIGGER_FILE}) + if(NOT EXISTS ${BOOST_34_TRIGGER_FILE}) set(BOOST_DEBUG_POSTFIX "vc142-mt-gd-x64-${BOOST_VERSION}") set(BOOST_PREFIX "lib") endif() @@ -573,7 +573,7 @@ if(WITH_BOOST) debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_thread-${BOOST_DEBUG_POSTFIX}.lib debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_chrono-${BOOST_DEBUG_POSTFIX}.lib ) - if (EXISTS ${BOOST_34_TRIGGER_FILE}) + if(EXISTS ${BOOST_34_TRIGGER_FILE}) if(WITH_USD) set(BOOST_PYTHON_LIBRARIES debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_python310-${BOOST_DEBUG_POSTFIX}.lib @@ -624,7 +624,7 @@ endif() if(WITH_LLVM) set(LLVM_ROOT_DIR ${LIBDIR}/llvm CACHE PATH "Path to the LLVM installation") - set(LLVM_INCLUDE_DIRS ${LLVM_ROOT_DIR}/$<$:Debug>/include CACHE PATH "Path to the LLVM include directory") + set(LLVM_INCLUDE_DIRS ${LLVM_ROOT_DIR}/$<$:Debug>/include CACHE PATH "Path to the LLVM include directory") file(GLOB LLVM_LIBRARY_OPTIMIZED ${LLVM_ROOT_DIR}/lib/*.lib) if(EXISTS ${LLVM_ROOT_DIR}/debug/lib) @@ -1030,7 +1030,7 @@ if(WITH_CYCLES AND WITH_CYCLES_DEVICE_ONEAPI) ${SYCL_ROOT_DIR}/bin/pi_*.dll ) list(REMOVE_ITEM _sycl_pi_runtime_libraries_glob "${SYCL_ROOT_DIR}/bin/pi_opencl.dll") - list (APPEND _sycl_runtime_libraries ${_sycl_pi_runtime_libraries_glob}) + list(APPEND _sycl_runtime_libraries ${_sycl_pi_runtime_libraries_glob}) unset(_sycl_pi_runtime_libraries_glob) list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_sycl_runtime_libraries}) diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 22942e1fc46..53e87fc5c3a 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -298,7 +298,7 @@ if(WITH_CYCLES_DEVICE_METAL) add_definitions(-DWITH_METAL) endif() -if (WITH_CYCLES_DEVICE_ONEAPI) +if(WITH_CYCLES_DEVICE_ONEAPI) add_definitions(-DWITH_ONEAPI) endif() diff --git a/intern/cycles/cmake/macros.cmake b/intern/cycles/cmake/macros.cmake index cd6feee4a3c..d1a929f2b35 100644 --- a/intern/cycles/cmake/macros.cmake +++ b/intern/cycles/cmake/macros.cmake @@ -45,8 +45,8 @@ macro(cycles_add_library target library_deps) # NOTE: If separated libraries for debug and release ar eneeded every library is the list are # to be prefixed explicitly. # - # Use: "optimized libfoo optimized libbar debug libfoo_d debug libbar_d" - # NOT: "optimized libfoo libbar debug libfoo_d libbar_d" + # Use: "optimized libfoo optimized libbar debug libfoo_d debug libbar_d" + # NOT: "optimized libfoo libbar debug libfoo_d libbar_d" # # TODO(sergey): This is the same as Blender's side CMake. Find a way to avoid duplication # somehow in a way which allows to have Cycles standalone. diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt index 6808d8c04d7..c7e95d44d9b 100644 --- a/intern/cycles/device/CMakeLists.txt +++ b/intern/cycles/device/CMakeLists.txt @@ -162,7 +162,7 @@ if(WITH_CYCLES_DEVICE_METAL) ) endif() -if (WITH_CYCLES_DEVICE_ONEAPI) +if(WITH_CYCLES_DEVICE_ONEAPI) if(WITH_CYCLES_ONEAPI_BINARIES) set(cycles_kernel_oneapi_lib_suffix "_aot") else() diff --git a/intern/cycles/doc/license/CMakeLists.txt b/intern/cycles/doc/license/CMakeLists.txt index df49095166c..0b050b95439 100644 --- a/intern/cycles/doc/license/CMakeLists.txt +++ b/intern/cycles/doc/license/CMakeLists.txt @@ -10,4 +10,4 @@ set(LICENSES Zlib-license.txt ) -delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${LICENSES}" ${CYCLES_INSTALL_PATH}/license) +delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${LICENSES}" ${CYCLES_INSTALL_PATH}/license) diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index dd0de5120fd..a7a6c0a6007 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -728,8 +728,8 @@ if(WITH_CYCLES_DEVICE_ONEAPI) ${SRC_UTIL_HEADERS} ) - set (SYCL_OFFLINE_COMPILER_PARALLEL_JOBS 1 CACHE STRING "Number of parallel compiler instances to use for device binaries compilation (expect ~8GB peak memory usage per instance).") - if (WITH_CYCLES_ONEAPI_BINARIES) + set(SYCL_OFFLINE_COMPILER_PARALLEL_JOBS 1 CACHE STRING "Number of parallel compiler instances to use for device binaries compilation (expect ~8GB peak memory usage per instance).") + if(WITH_CYCLES_ONEAPI_BINARIES) message(STATUS "${SYCL_OFFLINE_COMPILER_PARALLEL_JOBS} instance(s) of oneAPI offline compiler will be used.") endif() # SYCL_CPP_FLAGS is a variable that the user can set to pass extra compiler options @@ -753,25 +753,25 @@ if(WITH_CYCLES_DEVICE_ONEAPI) ) # Set defaults for spir64 and spir64_gen options - if (NOT DEFINED CYCLES_ONEAPI_SYCL_OPTIONS_spir64) + if(NOT DEFINED CYCLES_ONEAPI_SYCL_OPTIONS_spir64) set(CYCLES_ONEAPI_SYCL_OPTIONS_spir64 "-options '-ze-opt-large-register-file -ze-opt-regular-grf-kernel integrator_intersect'") endif() - if (NOT DEFINED CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen) - SET (CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen "${CYCLES_ONEAPI_SYCL_OPTIONS_spir64}" CACHE STRING "Extra build options for spir64_gen target") + if(NOT DEFINED CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen) + set(CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen "${CYCLES_ONEAPI_SYCL_OPTIONS_spir64}" CACHE STRING "Extra build options for spir64_gen target") endif() # Enable zebin, a graphics binary format with improved compatibility. string(PREPEND CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen "--format zebin ") string(PREPEND CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen "-device ${CYCLES_ONEAPI_SPIR64_GEN_DEVICES} ") - if (WITH_CYCLES_ONEAPI_BINARIES) + if(WITH_CYCLES_ONEAPI_BINARIES) # AoT binaries aren't currently reused when calling sycl::build. - list (APPEND sycl_compiler_flags -DSYCL_SKIP_KERNELS_PRELOAD) + list(APPEND sycl_compiler_flags -DSYCL_SKIP_KERNELS_PRELOAD) # Iterate over all targest and their options - list (JOIN CYCLES_ONEAPI_SYCL_TARGETS "," targets_string) - list (APPEND sycl_compiler_flags -fsycl-targets=${targets_string}) + list(JOIN CYCLES_ONEAPI_SYCL_TARGETS "," targets_string) + list(APPEND sycl_compiler_flags -fsycl-targets=${targets_string}) foreach(target ${CYCLES_ONEAPI_SYCL_TARGETS}) if(DEFINED CYCLES_ONEAPI_SYCL_OPTIONS_${target}) - list (APPEND sycl_compiler_flags -Xsycl-target-backend=${target} "${CYCLES_ONEAPI_SYCL_OPTIONS_${target}}") + list(APPEND sycl_compiler_flags -Xsycl-target-backend=${target} "${CYCLES_ONEAPI_SYCL_OPTIONS_${target}}") endif() endforeach() else() diff --git a/intern/cycles/kernel/osl/shaders/CMakeLists.txt b/intern/cycles/kernel/osl/shaders/CMakeLists.txt index bfd203416cb..00336ebfb76 100644 --- a/intern/cycles/kernel/osl/shaders/CMakeLists.txt +++ b/intern/cycles/kernel/osl/shaders/CMakeLists.txt @@ -135,7 +135,7 @@ foreach(_file ${SRC_OSL}) string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} _OSO_FILE ${_OSO_FILE}) add_custom_command( OUTPUT ${_OSO_FILE} - COMMAND ${CMAKE_COMMAND} -E env ${PLATFORM_ENV_BUILD} ${OSL_COMPILER} -q -O2 -I"${CMAKE_CURRENT_SOURCE_DIR}" -I"${OSL_SHADER_DIR}" -o ${_OSO_FILE} ${_OSL_FILE} + COMMAND ${CMAKE_COMMAND} -E env ${PLATFORM_ENV_BUILD} ${OSL_COMPILER} -q -O2 -I"${CMAKE_CURRENT_SOURCE_DIR}" -I"${OSL_SHADER_DIR}" -o ${_OSO_FILE} ${_OSL_FILE} DEPENDS ${_OSL_FILE} ${SRC_OSL_HEADERS} ${OSL_COMPILER} ) list(APPEND SRC_OSO diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index 9e0b48465c6..fd706d758a3 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -129,7 +129,7 @@ list(APPEND SRC if(WITH_HEADLESS) add_definitions(-DWITH_HEADLESS) -elseif (WITH_GHOST_SDL) +elseif(WITH_GHOST_SDL) list(APPEND SRC intern/GHOST_ContextSDL.cpp intern/GHOST_DisplayManagerSDL.cpp diff --git a/intern/locale/CMakeLists.txt b/intern/locale/CMakeLists.txt index bdad0a0af79..7ba79504383 100644 --- a/intern/locale/CMakeLists.txt +++ b/intern/locale/CMakeLists.txt @@ -20,7 +20,7 @@ set(LIB if(WIN32) # This is set in platform_win32.cmake, will exist for 3.4+ library # folders which are dynamic, but not for 3.3 which will be static. - if (EXISTS ${BOOST_34_TRIGGER_FILE}) + if(EXISTS ${BOOST_34_TRIGGER_FILE}) add_definitions (-DBOOST_ALL_DYN_LINK=1) endif() endif() diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index f370d47b3f7..20439e69f35 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -412,7 +412,7 @@ endif() # `valgrind --leak-check=full --track-origins=yes` add_custom_command( OUTPUT ${GENSRC} - COMMAND "$" ${CMAKE_CURRENT_BINARY_DIR}/ ${CMAKE_CURRENT_BINARY_DIR}/../ + COMMAND "$" ${CMAKE_CURRENT_BINARY_DIR}/ ${CMAKE_CURRENT_BINARY_DIR}/../ DEPENDS makesrna ) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 47efd9a67b6..3570e9e8b4a 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -385,7 +385,7 @@ endif() # Install Targets (Generic, All Platforms) -# important to make a clean install each time, else old scripts get loaded. +# Important to make a clean install each time, else old scripts get loaded. install( CODE "file(REMOVE_RECURSE ${TARGETDIR_VER})"