From 33e38c605fe43ab1cb2022f7cc479bc92c432191 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 3 Jan 2025 13:23:38 +1100 Subject: [PATCH] Cleanup: correct indentation for CMake files, strip trailing space --- CMakeLists.txt | 12 +- .../build_environment/cmake/boost.cmake | 2 +- .../build_environment/cmake/dpcpp.cmake | 26 +-- .../build_environment/cmake/freetype.cmake | 24 +-- build_files/build_environment/cmake/gmp.cmake | 6 +- .../build_environment/cmake/openpgl.cmake | 2 +- .../build_environment/cmake/setup_msys2.cmake | 18 +-- .../build_environment/cmake/x265.cmake | 8 +- .../patches/cmake/modules/FindIlmBase.cmake | 20 +-- .../patches/cmake/modules/FindLogC4Plus.cmake | 2 +- .../patches/cmake/modules/FindOpenEXR.cmake | 10 +- .../patches/cmake/modules/FindTBB.cmake | 2 +- build_files/cmake/Modules/FindBlosc.cmake | 4 +- build_files/cmake/Modules/FindClang.cmake | 4 +- build_files/cmake/Modules/FindEmbree.cmake | 4 +- build_files/cmake/Modules/FindEpoxy.cmake | 2 +- build_files/cmake/Modules/FindFFmpeg.cmake | 2 +- build_files/cmake/Modules/FindFftw3.cmake | 8 +- build_files/cmake/Modules/FindFribidi.cmake | 2 +- build_files/cmake/Modules/FindGMP.cmake | 6 +- build_files/cmake/Modules/FindHIP.cmake | 4 +- build_files/cmake/Modules/FindHarfbuzz.cmake | 2 +- build_files/cmake/Modules/FindIcuLinux.cmake | 28 ++-- build_files/cmake/Modules/FindJack.cmake | 2 +- build_files/cmake/Modules/FindJeMalloc.cmake | 4 +- build_files/cmake/Modules/FindLLVM.cmake | 2 +- build_files/cmake/Modules/FindLZO.cmake | 2 +- build_files/cmake/Modules/FindOSL.cmake | 2 +- .../cmake/Modules/FindOpenCOLLADA.cmake | 8 +- .../cmake/Modules/FindOpenColorIO.cmake | 6 +- build_files/cmake/Modules/FindOpenEXR.cmake | 4 +- .../cmake/Modules/FindOpenImageDenoise.cmake | 8 +- .../cmake/Modules/FindOpenImageIO.cmake | 6 +- build_files/cmake/Modules/FindOpenJPEG.cmake | 4 +- .../cmake/Modules/FindOpenSubdiv.cmake | 4 +- build_files/cmake/Modules/FindPCRE.cmake | 4 +- build_files/cmake/Modules/FindPotrace.cmake | 4 +- build_files/cmake/Modules/FindPugiXML.cmake | 2 +- build_files/cmake/Modules/FindPulse.cmake | 2 +- build_files/cmake/Modules/FindSDL2.cmake | 2 +- build_files/cmake/Modules/FindSndFile.cmake | 2 +- build_files/cmake/Modules/FindSpacenav.cmake | 4 +- build_files/cmake/Modules/FindTBB.cmake | 4 +- build_files/cmake/Modules/FindWebP.cmake | 2 +- build_files/cmake/Modules/FindXML2.cmake | 4 +- .../cmake/Modules/FindXR_OpenXR_SDK.cmake | 2 +- build_files/cmake/Modules/FindZstd.cmake | 4 +- build_files/cmake/Modules/Findsse2neon.cmake | 2 +- build_files/cmake/macros.cmake | 6 +- .../cmake/platform/platform_apple.cmake | 2 +- .../cmake/platform/platform_apple_xcode.cmake | 30 ++-- .../cmake/platform/platform_unix.cmake | 4 +- build_files/cmake/testing.cmake | 6 +- intern/audaspace/CMakeLists.txt | 27 ++-- intern/cycles/app/CMakeLists.txt | 6 +- intern/cycles/kernel/CMakeLists.txt | 153 ++++++++++-------- source/blender/compositor/CMakeLists.txt | 2 +- source/blender/gpu/CMakeLists.txt | 2 +- source/creator/CMakeLists.txt | 22 +-- tests/python/CMakeLists.txt | 20 +-- 60 files changed, 293 insertions(+), 275 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f22b8b4826..2f3eb360d73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -920,7 +920,7 @@ if(POLICY CMP0119) option(WITH_GPU_SHADER_CPP_COMPILATION "\ Compiler shaders using C++. \ Allows testing Metal compilation on other platform and enable C++ IDE support for shader code" - OFF + OFF ) mark_as_advanced(WITH_GPU_SHADER_CPP_COMPILATION) else() @@ -1008,7 +1008,7 @@ set_and_warn_incompatible(WITH_COMPILER_ASAN_EXTERN WITH_MEM_VALGRIND OFF) option(WITH_COMPILER_CODE_COVERAGE "\ Build and link with code coverage support (only for Debug targets)." -OFF + OFF ) mark_as_advanced(WITH_COMPILER_CODE_COVERAGE) @@ -2246,8 +2246,8 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") C_WARN_CLANG_CL_NAN_INFINITY_DISABLED -Wno-nan-infinity-disabled ) - add_check_cxx_compiler_flags( - CXX_WARNINGS + add_check_cxx_compiler_flags( + CXX_WARNINGS CXX_WARN_CLANG_CL_W3 /W3 CXX_WARN_CLANG_CL_C++98_COMPAT -Wno-c++98-compat # 352692 CXX_WARN_CLANG_CL_OLD_STYLE_CAST -Wno-old-style-cast # 178608 @@ -2566,8 +2566,8 @@ if(WITH_COMPILER_SHORT_FILE_MACRO) if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP) if(APPLE) if(XCODE AND ${XCODE_VERSION} VERSION_LESS 12.0) - # Developers may have say LLVM Clang-10.0.1 toolchain (which supports the flag) - # with Xcode-11 (the Clang of which doesn't support the flag). + # Developers may have say LLVM Clang-10.0.1 toolchain (which supports the flag) + # with Xcode-11 (the Clang of which doesn't support the flag). message( WARNING "-fmacro-prefix-map flag is NOT supported by Clang shipped with Xcode-${XCODE_VERSION}." diff --git a/build_files/build_environment/cmake/boost.cmake b/build_files/build_environment/cmake/boost.cmake index 6f139593d48..0dbe5726b36 100644 --- a/build_files/build_environment/cmake/boost.cmake +++ b/build_files/build_environment/cmake/boost.cmake @@ -20,7 +20,7 @@ if(WIN32) ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ - ) + ) if(BUILD_MODE STREQUAL Release) set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && diff --git a/build_files/build_environment/cmake/dpcpp.cmake b/build_files/build_environment/cmake/dpcpp.cmake index 34a0b3a5e04..5f30b46df37 100644 --- a/build_files/build_environment/cmake/dpcpp.cmake +++ b/build_files/build_environment/cmake/dpcpp.cmake @@ -133,19 +133,19 @@ add_dependencies( if(WIN32) if(BUILD_MODE STREQUAL Release) ExternalProject_Add_Step(external_dpcpp after_install - COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/dpcpp ${HARVEST_TARGET}/dpcpp - COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/clang-cl.exe - COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/clang-cpp.exe - COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/clang.exe - COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/ld.lld.exe - COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/ld64.lld.exe - COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/lld.exe - COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/lld-link.exe - COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/wasm-ld.exe - COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/pi_unified_runtime.dll - COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/ur_adapter_level_zero.dll - COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/ur_loader.dll - DEPENDEES install + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/dpcpp ${HARVEST_TARGET}/dpcpp + COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/clang-cl.exe + COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/clang-cpp.exe + COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/clang.exe + COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/ld.lld.exe + COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/ld64.lld.exe + COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/lld.exe + COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/lld-link.exe + COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/wasm-ld.exe + COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/pi_unified_runtime.dll + COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/ur_adapter_level_zero.dll + COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/ur_loader.dll + DEPENDEES install ) endif() else() diff --git a/build_files/build_environment/cmake/freetype.cmake b/build_files/build_environment/cmake/freetype.cmake index d2524936fe0..b3e70dd3ccb 100644 --- a/build_files/build_environment/cmake/freetype.cmake +++ b/build_files/build_environment/cmake/freetype.cmake @@ -14,7 +14,7 @@ set(FREETYPE_EXTRA_ARGS -DPC_BROTLIDEC_LIBDIR=${LIBDIR}/brotli/lib -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY} -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include - ) +) ExternalProject_Add(external_freetype URL file://${PACKAGE_DIR}/${FREETYPE_FILE} @@ -38,19 +38,19 @@ add_dependencies( if(WIN32) if(BUILD_MODE STREQUAL Release) - ExternalProject_Add_Step(external_freetype after_install - COMMAND ${CMAKE_COMMAND} -E copy_directory - ${LIBDIR}/freetype - ${HARVEST_TARGET}/freetype + ExternalProject_Add_Step(external_freetype after_install + COMMAND ${CMAKE_COMMAND} -E copy_directory + ${LIBDIR}/freetype + ${HARVEST_TARGET}/freetype - # `harfbuzz` *NEEDS* to find `freetype.lib` and will not be convinced to take - # alternative names so just give it what it wants. - COMMAND ${CMAKE_COMMAND} -E copy - ${LIBDIR}/freetype/lib/freetype2st.lib - ${LIBDIR}/freetype/lib/freetype.lib + # `harfbuzz` *NEEDS* to find `freetype.lib` and will not be convinced to take + # alternative names so just give it what it wants. + COMMAND ${CMAKE_COMMAND} -E copy + ${LIBDIR}/freetype/lib/freetype2st.lib + ${LIBDIR}/freetype/lib/freetype.lib - DEPENDEES install - ) + DEPENDEES install + ) endif() else() harvest(external_freetype freetype/include freetype/include "*.h") diff --git a/build_files/build_environment/cmake/gmp.cmake b/build_files/build_environment/cmake/gmp.cmake index 830767efe58..0e7ab3d5138 100644 --- a/build_files/build_environment/cmake/gmp.cmake +++ b/build_files/build_environment/cmake/gmp.cmake @@ -150,9 +150,9 @@ if(WIN32) ) ExternalProject_Add_Step(external_gmpxx after_install - COMMAND ${CMAKE_COMMAND} -E copy_directory - ${LIBDIR}/gmpxx/ - ${HARVEST_TARGET}/gmp + COMMAND ${CMAKE_COMMAND} -E copy_directory + ${LIBDIR}/gmpxx/ + ${HARVEST_TARGET}/gmp DEPENDEES install ) diff --git a/build_files/build_environment/cmake/openpgl.cmake b/build_files/build_environment/cmake/openpgl.cmake index 26f12ad0cc0..7829d4d2aaa 100644 --- a/build_files/build_environment/cmake/openpgl.cmake +++ b/build_files/build_environment/cmake/openpgl.cmake @@ -48,7 +48,7 @@ if(WIN32) DEPENDEES install ) else() - ExternalProject_Add_Step(external_openpgl after_install + ExternalProject_Add_Step(external_openpgl after_install COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openpgl/lib/openpgl_d.lib ${HARVEST_TARGET}/openpgl/lib/openpgl_d.lib diff --git a/build_files/build_environment/cmake/setup_msys2.cmake b/build_files/build_environment/cmake/setup_msys2.cmake index 310c8d3b289..d10531c8d88 100644 --- a/build_files/build_environment/cmake/setup_msys2.cmake +++ b/build_files/build_environment/cmake/setup_msys2.cmake @@ -11,7 +11,7 @@ ################################################################################################## macro(download_package package_name) - # this will + # this will # 1 - download the required package from either the upstream location or blender mirror depending on MSYS2_USE_UPSTREAM_PACKAGES # 2 - Set a global variable [package_name]_FILE to point to the downloaded file # 3 - Verify the hash if FORCE_CHECK_HASH is on @@ -22,13 +22,13 @@ macro(download_package package_name) set(_final_filename "${DOWNLOAD_DIR}/${_file_name}") set(MSYS2_${package_name}_FILE ${_final_filename}) if(NOT EXISTS "${_final_filename}") - if(MSYS2_USE_UPSTREAM_PACKAGES) - set(_final_url ${URI}) - else() - set(_final_url "https://projects.blender.org/blender/lib-windows_x64/media/branch/build_environment/${_file_name}") - endif() - message("Downloading ${_final_filename} from ${_final_url}") - file( + if(MSYS2_USE_UPSTREAM_PACKAGES) + set(_final_url ${URI}) + else() + set(_final_url "https://projects.blender.org/blender/lib-windows_x64/media/branch/build_environment/${_file_name}") + endif() + message("Downloading ${_final_filename} from ${_final_url}") + file( DOWNLOAD ${_final_url} ${_final_filename} TIMEOUT 1800 # seconds EXPECTED_HASH SHA1=${HASH} @@ -53,7 +53,7 @@ macro(download_package package_name) endmacro() # Note we use URL here rather than URI as the deps checker will check all *_URI vars for package/license/homepage requirements -# since none of this will end up on end users systems the requirements are not as strict +# since none of this will end up on end users systems the requirements are not as strict set(MSYS2_BASE_URL https://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20221028.tar.xz) set(MSYS2_BASE_HASH 545cc6a4c36bb98058f2b2945c5d06de523516db) diff --git a/build_files/build_environment/cmake/x265.cmake b/build_files/build_environment/cmake/x265.cmake index 3ad5aa7d561..22cfdad5d44 100644 --- a/build_files/build_environment/cmake/x265.cmake +++ b/build_files/build_environment/cmake/x265.cmake @@ -55,10 +55,10 @@ set(X265_10_EXTRA_ARGS # 8 bit build flags set(X265_EXTRA_ARGS - -DENABLE_SHARED=OFF - -DEXTRA_LIB=${LIBDIR}/x265_12/lib/${LIB_PREFIX}x265${LIB_SUFFIX}${LIBEXT}^^${LIBDIR}/x265_10/lib/${LIB_PREFIX}x265${LIB_SUFFIX}${LIBEXT} - -DLINKED_10BIT=ON - -DLINKED_12BIT=ON + -DENABLE_SHARED=OFF + -DEXTRA_LIB=${LIBDIR}/x265_12/lib/${LIB_PREFIX}x265${LIB_SUFFIX}${LIBEXT}^^${LIBDIR}/x265_10/lib/${LIB_PREFIX}x265${LIB_SUFFIX}${LIBEXT} + -DLINKED_10BIT=ON + -DLINKED_12BIT=ON ) if(UNIX) diff --git a/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake b/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake index 0b737bfb890..8daa6cfb188 100644 --- a/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake +++ b/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake @@ -195,16 +195,16 @@ if(ILMBASE_CUSTOM) set(IlmBase_Libraries ${ILMBASE_CUSTOM_LIBRARIES}) separate_arguments(IlmBase_Libraries) else() -# elseif(${ILMBASE_VERSION} VERSION_LESS "2.1") + # elseif(${ILMBASE_VERSION} VERSION_LESS "2.1") set(IlmBase_Libraries Half Iex Imath IlmThread) -# else() - # string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _ilmbase_libs_ver ${ILMBASE_VERSION}) - # set(IlmBase_Libraries - # Half - # Iex-${_ilmbase_libs_ver} - # Imath-${_ilmbase_libs_ver} - # IlmThread-${_ilmbase_libs_ver} - # ) + # else() + # string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _ilmbase_libs_ver ${ILMBASE_VERSION}) + # set(IlmBase_Libraries + # Half + # Iex-${_ilmbase_libs_ver} + # Imath-${_ilmbase_libs_ver} + # IlmThread-${_ilmbase_libs_ver} + # ) endif() @@ -252,7 +252,7 @@ if(ILMBASE_FOUND) FIND_PACKAGE_MESSAGE(ILMBASE "Found IlmBase: ${ILMBASE_LIBRARIES}" "[${ILMBASE_INCLUDE_DIR}][${ILMBASE_LIBRARIES}][${ILMBASE_CURRENT_STATE}]" - ) + ) endif() endif() diff --git a/build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake b/build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake index 8b9c0029842..d223bdf3356 100644 --- a/build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake +++ b/build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake @@ -41,7 +41,7 @@ FIND_LIBRARY(LOGC4PLUS_LIBRARY ${_logc4plus_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set LOGC4PLUS_FOUND to TRUE if # all listed variables are TRUE diff --git a/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake b/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake index d047db11e0b..d144973df8d 100644 --- a/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake +++ b/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake @@ -191,11 +191,11 @@ if(OPENEXR_CUSTOM) endif() set(OpenEXR_Library ${OPENEXR_CUSTOM_LIBRARY}) else() -# elseif(${OPENEXR_VERSION} VERSION_LESS "2.1") + # elseif(${OPENEXR_VERSION} VERSION_LESS "2.1") set(OpenEXR_Library IlmImf) -# else() -# string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION}) -# set(OpenEXR_Library IlmImf-${_openexr_libs_ver}) + # else() + # string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION}) + # set(OpenEXR_Library IlmImf-${_openexr_libs_ver}) endif() # Locate the OpenEXR library @@ -230,7 +230,7 @@ if(OPENEXR_FOUND) FIND_PACKAGE_MESSAGE(OPENEXR "Found OpenEXR: ${OPENEXR_LIBRARIES}" "[${OPENEXR_INCLUDE_DIR}][${OPENEXR_LIBRARIES}][${OPENEXR_CURRENT_STATE}]" - ) + ) endif() endif() diff --git a/build_files/build_environment/patches/cmake/modules/FindTBB.cmake b/build_files/build_environment/patches/cmake/modules/FindTBB.cmake index 6dec5ccd047..9a520b08106 100644 --- a/build_files/build_environment/patches/cmake/modules/FindTBB.cmake +++ b/build_files/build_environment/patches/cmake/modules/FindTBB.cmake @@ -41,7 +41,7 @@ FIND_LIBRARY(TBB_LIBRARY ${_tbb_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set TBB_FOUND to TRUE if # all listed variables are TRUE diff --git a/build_files/cmake/Modules/FindBlosc.cmake b/build_files/cmake/Modules/FindBlosc.cmake index 99552b8938d..713737fd6cb 100644 --- a/build_files/cmake/Modules/FindBlosc.cmake +++ b/build_files/cmake/Modules/FindBlosc.cmake @@ -45,13 +45,13 @@ find_library(BLOSC_LIBRARY ${_blosc_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set BLOSC_FOUND to TRUE if # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Blosc DEFAULT_MSG - BLOSC_LIBRARY BLOSC_INCLUDE_DIR) + BLOSC_LIBRARY BLOSC_INCLUDE_DIR) if(BLOSC_FOUND) set(BLOSC_LIBRARIES ${BLOSC_LIBRARY}) diff --git a/build_files/cmake/Modules/FindClang.cmake b/build_files/cmake/Modules/FindClang.cmake index 063bbaa97f7..39f604ca4b7 100644 --- a/build_files/cmake/Modules/FindClang.cmake +++ b/build_files/cmake/Modules/FindClang.cmake @@ -98,7 +98,7 @@ foreach(COMPONENT ${_clang_FIND_COMPONENTS}) ${_clang_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) + ) if(CLANG_${UPPERCOMPONENT}_LIBRARY) list(APPEND _clang_LIBRARIES "${CLANG_${UPPERCOMPONENT}_LIBRARY}") endif() @@ -109,7 +109,7 @@ endforeach() # all listed variables are TRUE. include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Clang DEFAULT_MSG - _clang_LIBRARIES CLANG_INCLUDE_DIR) + _clang_LIBRARIES CLANG_INCLUDE_DIR) if(CLANG_FOUND) set(CLANG_LIBRARIES ${_clang_LIBRARIES}) diff --git a/build_files/cmake/Modules/FindEmbree.cmake b/build_files/cmake/Modules/FindEmbree.cmake index 8d64e09e0f9..d5faf89db6f 100644 --- a/build_files/cmake/Modules/FindEmbree.cmake +++ b/build_files/cmake/Modules/FindEmbree.cmake @@ -104,7 +104,7 @@ foreach(COMPONENT ${_embree_FIND_COMPONENTS}) ${_embree_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) + ) list(APPEND _embree_LIBRARIES "${EMBREE_${UPPERCOMPONENT}_LIBRARY}") endforeach() @@ -112,7 +112,7 @@ endforeach() # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Embree DEFAULT_MSG - _embree_LIBRARIES EMBREE_INCLUDE_DIR) + _embree_LIBRARIES EMBREE_INCLUDE_DIR) if(EMBREE_FOUND) set(EMBREE_LIBRARIES ${_embree_LIBRARIES}) diff --git a/build_files/cmake/Modules/FindEpoxy.cmake b/build_files/cmake/Modules/FindEpoxy.cmake index 13f3312635c..f154b6136c0 100644 --- a/build_files/cmake/Modules/FindEpoxy.cmake +++ b/build_files/cmake/Modules/FindEpoxy.cmake @@ -40,7 +40,7 @@ find_library(Epoxy_LIBRARY # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Epoxy DEFAULT_MSG - Epoxy_LIBRARY Epoxy_INCLUDE_DIR) + Epoxy_LIBRARY Epoxy_INCLUDE_DIR) if(Epoxy_FOUND) set(Epoxy_INCLUDE_DIRS ${Epoxy_INCLUDE_DIR}) diff --git a/build_files/cmake/Modules/FindFFmpeg.cmake b/build_files/cmake/Modules/FindFFmpeg.cmake index dd0e7865689..5c74e962ed5 100644 --- a/build_files/cmake/Modules/FindFFmpeg.cmake +++ b/build_files/cmake/Modules/FindFFmpeg.cmake @@ -73,7 +73,7 @@ unset(_upper_COMPONENT) # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(FFmpeg DEFAULT_MSG - _ffmpeg_LIBRARIES _ffmpeg_INCLUDE_DIR) + _ffmpeg_LIBRARIES _ffmpeg_INCLUDE_DIR) if(FFMPEG_FOUND) set(FFMPEG_LIBRARIES ${_ffmpeg_LIBRARIES}) diff --git a/build_files/cmake/Modules/FindFftw3.cmake b/build_files/cmake/Modules/FindFftw3.cmake index 3a13d35f368..33c47ee9cd5 100644 --- a/build_files/cmake/Modules/FindFftw3.cmake +++ b/build_files/cmake/Modules/FindFftw3.cmake @@ -49,7 +49,7 @@ find_library(FFTW3_LIBRARY_F ${_fftw3_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) find_library(FFTW3_LIBRARY_THREADS_F NAMES @@ -58,7 +58,7 @@ find_library(FFTW3_LIBRARY_THREADS_F ${_fftw3_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) find_library(FFTW3_LIBRARY_D NAMES @@ -67,7 +67,7 @@ find_library(FFTW3_LIBRARY_D ${_fftw3_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) list(APPEND _FFTW3_LIBRARIES "${FFTW3_LIBRARY_F}") list(APPEND _FFTW3_LIBRARIES "${FFTW3_LIBRARY_D}") @@ -79,7 +79,7 @@ endif() # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Fftw3 DEFAULT_MSG - _FFTW3_LIBRARIES FFTW3_INCLUDE_DIR) + _FFTW3_LIBRARIES FFTW3_INCLUDE_DIR) if(FFTW3_FOUND) set(FFTW3_LIBRARIES ${_FFTW3_LIBRARIES}) diff --git a/build_files/cmake/Modules/FindFribidi.cmake b/build_files/cmake/Modules/FindFribidi.cmake index 4ec4475a938..3339333e5ea 100644 --- a/build_files/cmake/Modules/FindFribidi.cmake +++ b/build_files/cmake/Modules/FindFribidi.cmake @@ -38,7 +38,7 @@ find_library(LIBFRIBIDI_LIBRARY ${_fribidi_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set FRIBIDI_FOUND to TRUE if # all listed variables are TRUE diff --git a/build_files/cmake/Modules/FindGMP.cmake b/build_files/cmake/Modules/FindGMP.cmake index 3ab770dadea..79d193dbaf4 100644 --- a/build_files/cmake/Modules/FindGMP.cmake +++ b/build_files/cmake/Modules/FindGMP.cmake @@ -54,7 +54,7 @@ find_library(GMP_LIBRARY ${_gmp_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) find_library(GMPXX_LIBRARY NAMES @@ -63,7 +63,7 @@ find_library(GMPXX_LIBRARY ${_gmp_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) if(GMP_INCLUDE_DIR) set(_version_regex "^#define[ \t]+__GNU_MP_VERSION[ \t]+\"([^\"]+)\".*") @@ -78,7 +78,7 @@ endif() # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GMP DEFAULT_MSG - GMP_LIBRARY GMPXX_LIBRARY GMP_INCLUDE_DIR GMPXX_INCLUDE_DIR) + GMP_LIBRARY GMPXX_LIBRARY GMP_INCLUDE_DIR GMPXX_INCLUDE_DIR) if(GMP_FOUND) set(GMP_LIBRARIES ${GMPXX_LIBRARY} ${GMP_LIBRARY}) diff --git a/build_files/cmake/Modules/FindHIP.cmake b/build_files/cmake/Modules/FindHIP.cmake index e3fcce599a4..8e0ab8c7bd8 100644 --- a/build_files/cmake/Modules/FindHIP.cmake +++ b/build_files/cmake/Modules/FindHIP.cmake @@ -106,8 +106,8 @@ endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(HIP - REQUIRED_VARS HIP_HIPCC_EXECUTABLE - VERSION_VAR HIP_VERSION) + REQUIRED_VARS HIP_HIPCC_EXECUTABLE + VERSION_VAR HIP_VERSION) mark_as_advanced( HIP_HIPCC_EXECUTABLE diff --git a/build_files/cmake/Modules/FindHarfbuzz.cmake b/build_files/cmake/Modules/FindHarfbuzz.cmake index b9450623bc6..8521162a856 100644 --- a/build_files/cmake/Modules/FindHarfbuzz.cmake +++ b/build_files/cmake/Modules/FindHarfbuzz.cmake @@ -38,7 +38,7 @@ find_library(LIBHARFBUZZ_LIBRARY ${_harfbuzz_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set HARFBUZZ_FOUND to TRUE if # all listed variables are TRUE diff --git a/build_files/cmake/Modules/FindIcuLinux.cmake b/build_files/cmake/Modules/FindIcuLinux.cmake index 20ed1fc0e00..29619d51bcd 100644 --- a/build_files/cmake/Modules/FindIcuLinux.cmake +++ b/build_files/cmake/Modules/FindIcuLinux.cmake @@ -48,7 +48,7 @@ find_library(ICU_LIBRARY_DATA ${_icu_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) find_library(ICU_LIBRARY_I18N NAMES @@ -57,7 +57,7 @@ find_library(ICU_LIBRARY_I18N ${_icu_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) find_library(ICU_LIBRARY_IO NAMES @@ -66,7 +66,7 @@ find_library(ICU_LIBRARY_IO ${_icu_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) find_library(ICU_LIBRARY_LE NAMES @@ -75,7 +75,7 @@ find_library(ICU_LIBRARY_LE ${_icu_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) find_library(ICU_LIBRARY_LX NAMES @@ -84,7 +84,7 @@ find_library(ICU_LIBRARY_LX ${_icu_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) find_library(ICU_LIBRARY_TU NAMES @@ -93,7 +93,7 @@ find_library(ICU_LIBRARY_TU ${_icu_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) find_library(ICU_LIBRARY_UC NAMES @@ -102,7 +102,7 @@ find_library(ICU_LIBRARY_UC ${_icu_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # Restore the original find library ordering if(Boost_USE_STATIC_LIBS) @@ -113,13 +113,13 @@ endif() # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Icu DEFAULT_MSG - ICU_LIBRARY_DATA - ICU_LIBRARY_I18N - ICU_LIBRARY_IO - ICU_LIBRARY_LE - ICU_LIBRARY_LX - ICU_LIBRARY_TU - ICU_LIBRARY_UC + ICU_LIBRARY_DATA + ICU_LIBRARY_I18N + ICU_LIBRARY_IO + ICU_LIBRARY_LE + ICU_LIBRARY_LX + ICU_LIBRARY_TU + ICU_LIBRARY_UC ) if(ICU_FOUND) diff --git a/build_files/cmake/Modules/FindJack.cmake b/build_files/cmake/Modules/FindJack.cmake index 9fea649ac87..99f1f6b37c8 100644 --- a/build_files/cmake/Modules/FindJack.cmake +++ b/build_files/cmake/Modules/FindJack.cmake @@ -44,7 +44,7 @@ find_library(JACK_LIBRARY ${_jack_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set JACK_FOUND to TRUE if # all listed variables are TRUE diff --git a/build_files/cmake/Modules/FindJeMalloc.cmake b/build_files/cmake/Modules/FindJeMalloc.cmake index 0c8b1232d8e..afadf6c13a8 100644 --- a/build_files/cmake/Modules/FindJeMalloc.cmake +++ b/build_files/cmake/Modules/FindJeMalloc.cmake @@ -45,7 +45,7 @@ find_library(JEMALLOC_LIBRARY ${_jemalloc_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) if(JEMALLOC_INCLUDE_DIR) set(_version_regex "^#define[ \t]+JEMALLOC_VERSION[ \t]+\"([^\"]+)\".*") @@ -60,7 +60,7 @@ endif() # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(JeMalloc DEFAULT_MSG - JEMALLOC_LIBRARY JEMALLOC_INCLUDE_DIR) + JEMALLOC_LIBRARY JEMALLOC_INCLUDE_DIR) if(JEMALLOC_FOUND) set(JEMALLOC_LIBRARIES ${JEMALLOC_LIBRARY}) diff --git a/build_files/cmake/Modules/FindLLVM.cmake b/build_files/cmake/Modules/FindLLVM.cmake index 4c7cc5f1c1f..5d783826cd2 100644 --- a/build_files/cmake/Modules/FindLLVM.cmake +++ b/build_files/cmake/Modules/FindLLVM.cmake @@ -85,7 +85,7 @@ endif() # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(LLVM DEFAULT_MSG - LLVM_LIBRARY) + LLVM_LIBRARY) mark_as_advanced( LLVM_LIBRARY diff --git a/build_files/cmake/Modules/FindLZO.cmake b/build_files/cmake/Modules/FindLZO.cmake index 73d1689bb41..4a59a1231c5 100644 --- a/build_files/cmake/Modules/FindLZO.cmake +++ b/build_files/cmake/Modules/FindLZO.cmake @@ -42,7 +42,7 @@ find_library(LZO_LIBRARY ${_lzo_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set LZO_FOUND to TRUE if # all listed variables are TRUE diff --git a/build_files/cmake/Modules/FindOSL.cmake b/build_files/cmake/Modules/FindOSL.cmake index e06ed9d2aab..3651fd5d052 100644 --- a/build_files/cmake/Modules/FindOSL.cmake +++ b/build_files/cmake/Modules/FindOSL.cmake @@ -62,7 +62,7 @@ foreach(COMPONENT ${_osl_FIND_COMPONENTS}) ${_osl_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) + ) endforeach() # Note linking order matters, and oslnoise existence depends on version. diff --git a/build_files/cmake/Modules/FindOpenCOLLADA.cmake b/build_files/cmake/Modules/FindOpenCOLLADA.cmake index fc0b58c6fc7..cda851309ed 100644 --- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake +++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake @@ -76,7 +76,7 @@ foreach(COMPONENT ${_opencollada_FIND_INCLUDES}) include/${COMPONENT} HINTS ${_opencollada_SEARCH_DIRS} - ) + ) mark_as_advanced(OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR) list(APPEND _opencollada_INCLUDES "${OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR}") endforeach() @@ -95,7 +95,7 @@ foreach(COMPONENT ${_opencollada_FIND_COMPONENTS}) lib64 lib # Ubuntu ppa needs this. lib64/opencollada lib/opencollada - ) + ) mark_as_advanced(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY) list(APPEND _opencollada_LIBRARIES "${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}") endforeach() @@ -112,7 +112,7 @@ foreach(COMPONENT ${_opencollada_FIND_STATIC_COMPONENTS}) lib64 lib # Ubuntu ppa needs this. lib64/opencollada lib/opencollada - ) + ) mark_as_advanced(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY) if(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY) list(APPEND _opencollada_LIBRARIES "${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}") @@ -124,7 +124,7 @@ endforeach() # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(OpenCOLLADA DEFAULT_MSG - _opencollada_LIBRARIES _opencollada_INCLUDES) + _opencollada_LIBRARIES _opencollada_INCLUDES) if(OPENCOLLADA_FOUND) diff --git a/build_files/cmake/Modules/FindOpenColorIO.cmake b/build_files/cmake/Modules/FindOpenColorIO.cmake index ebf52b07b3d..87d726a25fb 100644 --- a/build_files/cmake/Modules/FindOpenColorIO.cmake +++ b/build_files/cmake/Modules/FindOpenColorIO.cmake @@ -57,7 +57,7 @@ foreach(COMPONENT ${_opencolorio_FIND_COMPONENTS}) ${_opencolorio_SEARCH_DIRS} PATH_SUFFIXES lib64 lib lib64/static lib/static - ) + ) if(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY) list(APPEND _opencolorio_LIBRARIES "${OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY}") endif() @@ -79,8 +79,8 @@ endif() # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(OpenColorIO - REQUIRED_VARS _opencolorio_LIBRARIES OPENCOLORIO_INCLUDE_DIR - VERSION_VAR OPENCOLORIO_VERSION) + REQUIRED_VARS _opencolorio_LIBRARIES OPENCOLORIO_INCLUDE_DIR + VERSION_VAR OPENCOLORIO_VERSION) if(OPENCOLORIO_FOUND) set(OPENCOLORIO_LIBRARIES ${_opencolorio_LIBRARIES}) diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake b/build_files/cmake/Modules/FindOpenEXR.cmake index a6310298a45..462c1623881 100644 --- a/build_files/cmake/Modules/FindOpenEXR.cmake +++ b/build_files/cmake/Modules/FindOpenEXR.cmake @@ -117,7 +117,7 @@ foreach(COMPONENT ${_openexr_FIND_COMPONENTS}) ${_openexr_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) + ) list(APPEND _openexr_LIBRARIES "${OPENEXR_${UPPERCOMPONENT}_LIBRARY}") endforeach() @@ -163,7 +163,7 @@ if(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0") ${_openexr_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) + ) list(APPEND _openexr_LIBRARIES "${IMATH_LIBRARY}") # In cmake version 3.21 and up, we can instead use the NO_CACHE option for diff --git a/build_files/cmake/Modules/FindOpenImageDenoise.cmake b/build_files/cmake/Modules/FindOpenImageDenoise.cmake index a7e2251a11d..02ee7d93dc2 100644 --- a/build_files/cmake/Modules/FindOpenImageDenoise.cmake +++ b/build_files/cmake/Modules/FindOpenImageDenoise.cmake @@ -66,7 +66,7 @@ foreach(COMPONENT ${_openimagedenoise_FIND_COMPONENTS}) ${_openimagedenoise_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) + ) list(APPEND _openimagedenoise_LIBRARIES "${OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY}") endforeach() @@ -80,7 +80,7 @@ foreach(COMPONENT ${_openimagedenoise_FIND_STATIC_COMPONENTS}) ${_openimagedenoise_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) + ) mark_as_advanced(OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY) if(OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY) list(APPEND _openimagedenoise_LIBRARIES "${OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY}") @@ -94,13 +94,13 @@ find_library(OPENIMAGEDENOISE_LIBRARY ${_openimagedenoise_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set OPENIMAGEDENOISE_FOUND to TRUE if # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(OpenImageDenoise DEFAULT_MSG - OPENIMAGEDENOISE_LIBRARY OPENIMAGEDENOISE_INCLUDE_DIR) + OPENIMAGEDENOISE_LIBRARY OPENIMAGEDENOISE_INCLUDE_DIR) if(OPENIMAGEDENOISE_FOUND) set(OPENIMAGEDENOISE_LIBRARIES ${_openimagedenoise_LIBRARIES}) diff --git a/build_files/cmake/Modules/FindOpenImageIO.cmake b/build_files/cmake/Modules/FindOpenImageIO.cmake index 56a355ddcca..ac74db028d2 100644 --- a/build_files/cmake/Modules/FindOpenImageIO.cmake +++ b/build_files/cmake/Modules/FindOpenImageIO.cmake @@ -47,7 +47,7 @@ find_library(OPENIMAGEIO_LIBRARY ${_openimageio_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) set(_openimageio_LIBRARIES ${OPENIMAGEIO_LIBRARY}) @@ -83,7 +83,7 @@ if(_openimageio_util_define) ${_openimageio_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) + ) list(APPEND _openimageio_LIBRARIES ${OPENIMAGEIO_UTIL_LIBRARY}) endif() @@ -97,7 +97,7 @@ unset(_openimageio_util_define) # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(OpenImageIO DEFAULT_MSG - _openimageio_LIBRARIES OPENIMAGEIO_INCLUDE_DIR) + _openimageio_LIBRARIES OPENIMAGEIO_INCLUDE_DIR) if(OPENIMAGEIO_FOUND) set(OPENIMAGEIO_LIBRARIES ${_openimageio_LIBRARIES}) diff --git a/build_files/cmake/Modules/FindOpenJPEG.cmake b/build_files/cmake/Modules/FindOpenJPEG.cmake index cab875f4cbe..cdc8ce6f87a 100644 --- a/build_files/cmake/Modules/FindOpenJPEG.cmake +++ b/build_files/cmake/Modules/FindOpenJPEG.cmake @@ -55,13 +55,13 @@ find_library(OPENJPEG_LIBRARY ${_openjpeg_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set OPENJPEG_FOUND to TRUE if # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(OpenJPEG DEFAULT_MSG - OPENJPEG_LIBRARY OPENJPEG_INCLUDE_DIR) + OPENJPEG_LIBRARY OPENJPEG_INCLUDE_DIR) if(OPENJPEG_FOUND) set(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY}) diff --git a/build_files/cmake/Modules/FindOpenSubdiv.cmake b/build_files/cmake/Modules/FindOpenSubdiv.cmake index 4ce8ff210c8..109cfd1f3bc 100644 --- a/build_files/cmake/Modules/FindOpenSubdiv.cmake +++ b/build_files/cmake/Modules/FindOpenSubdiv.cmake @@ -52,7 +52,7 @@ foreach(COMPONENT ${_opensubdiv_FIND_COMPONENTS}) ${_opensubdiv_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) + ) list(APPEND _opensubdiv_LIBRARIES "${OPENSUBDIV_${UPPERCOMPONENT}_LIBRARY}") endforeach() @@ -71,7 +71,7 @@ endmacro() # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(OpenSubdiv DEFAULT_MSG - _opensubdiv_LIBRARIES OPENSUBDIV_INCLUDE_DIR) + _opensubdiv_LIBRARIES OPENSUBDIV_INCLUDE_DIR) if(OPENSUBDIV_FOUND) set(OPENSUBDIV_LIBRARIES ${_opensubdiv_LIBRARIES}) diff --git a/build_files/cmake/Modules/FindPCRE.cmake b/build_files/cmake/Modules/FindPCRE.cmake index ede119b230f..4451c2148e2 100644 --- a/build_files/cmake/Modules/FindPCRE.cmake +++ b/build_files/cmake/Modules/FindPCRE.cmake @@ -42,13 +42,13 @@ find_library(PCRE_LIBRARY ${_pcre_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(PCRE DEFAULT_MSG - PCRE_LIBRARY PCRE_INCLUDE_DIR) + PCRE_LIBRARY PCRE_INCLUDE_DIR) # With 'make deps' precompiled libs, opencollada ships with a copy of libpcre # but not the headers, ${PCRE_LIBRARY} will be valid in this case diff --git a/build_files/cmake/Modules/FindPotrace.cmake b/build_files/cmake/Modules/FindPotrace.cmake index d80c3c96e95..94a7c104a6b 100644 --- a/build_files/cmake/Modules/FindPotrace.cmake +++ b/build_files/cmake/Modules/FindPotrace.cmake @@ -47,13 +47,13 @@ find_library(POTRACE_LIBRARY ${_potrace_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set POTRACE_FOUND to TRUE if # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Potrace DEFAULT_MSG - POTRACE_LIBRARY POTRACE_INCLUDE_DIR) + POTRACE_LIBRARY POTRACE_INCLUDE_DIR) if(POTRACE_FOUND) set(POTRACE_LIBRARIES ${POTRACE_LIBRARY}) diff --git a/build_files/cmake/Modules/FindPugiXML.cmake b/build_files/cmake/Modules/FindPugiXML.cmake index 21f00240217..adbbcabb5b7 100644 --- a/build_files/cmake/Modules/FindPugiXML.cmake +++ b/build_files/cmake/Modules/FindPugiXML.cmake @@ -45,7 +45,7 @@ find_library(PUGIXML_LIBRARY ${_pugixml_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set PUGIXML_FOUND to TRUE if # all listed variables are TRUE diff --git a/build_files/cmake/Modules/FindPulse.cmake b/build_files/cmake/Modules/FindPulse.cmake index 2719697d653..27ff1fa39cc 100644 --- a/build_files/cmake/Modules/FindPulse.cmake +++ b/build_files/cmake/Modules/FindPulse.cmake @@ -42,7 +42,7 @@ find_library(LIBPULSE_LIBRARY ${_pulse_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set PULSE_FOUND to TRUE if # all listed variables are TRUE diff --git a/build_files/cmake/Modules/FindSDL2.cmake b/build_files/cmake/Modules/FindSDL2.cmake index af2ecdcfb84..fcb1157686f 100644 --- a/build_files/cmake/Modules/FindSDL2.cmake +++ b/build_files/cmake/Modules/FindSDL2.cmake @@ -43,7 +43,7 @@ find_library(SDL2_LIBRARY ${_sdl2_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set SDL2_FOUND to TRUE if # all listed variables are TRUE diff --git a/build_files/cmake/Modules/FindSndFile.cmake b/build_files/cmake/Modules/FindSndFile.cmake index eab90db049e..35f489a87ad 100644 --- a/build_files/cmake/Modules/FindSndFile.cmake +++ b/build_files/cmake/Modules/FindSndFile.cmake @@ -42,7 +42,7 @@ find_library(LIBSNDFILE_LIBRARY ${_sndfile_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set SNDFILE_FOUND to TRUE if # all listed variables are TRUE diff --git a/build_files/cmake/Modules/FindSpacenav.cmake b/build_files/cmake/Modules/FindSpacenav.cmake index 3f2857ac19a..301ab8c9ee0 100644 --- a/build_files/cmake/Modules/FindSpacenav.cmake +++ b/build_files/cmake/Modules/FindSpacenav.cmake @@ -44,13 +44,13 @@ find_library(SPACENAV_LIBRARY ${_spacenav_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set SPACENAV_FOUND to TRUE if # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Spacenav DEFAULT_MSG - SPACENAV_LIBRARY SPACENAV_INCLUDE_DIR) + SPACENAV_LIBRARY SPACENAV_INCLUDE_DIR) if(SPACENAV_FOUND) set(SPACENAV_LIBRARIES ${SPACENAV_LIBRARY}) diff --git a/build_files/cmake/Modules/FindTBB.cmake b/build_files/cmake/Modules/FindTBB.cmake index 7c26bd22a77..d4d43ad28ae 100644 --- a/build_files/cmake/Modules/FindTBB.cmake +++ b/build_files/cmake/Modules/FindTBB.cmake @@ -45,13 +45,13 @@ find_library(TBB_LIBRARY ${_tbb_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set TBB_FOUND to TRUE if # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(TBB DEFAULT_MSG - TBB_LIBRARY TBB_INCLUDE_DIR) + TBB_LIBRARY TBB_INCLUDE_DIR) if(TBB_FOUND) set(TBB_LIBRARIES ${TBB_LIBRARY}) diff --git a/build_files/cmake/Modules/FindWebP.cmake b/build_files/cmake/Modules/FindWebP.cmake index ea4051acebf..0a2a75a33b9 100644 --- a/build_files/cmake/Modules/FindWebP.cmake +++ b/build_files/cmake/Modules/FindWebP.cmake @@ -56,7 +56,7 @@ foreach(COMPONENT ${_webp_FIND_COMPONENTS}) ${_webp_SEARCH_DIRS} PATH_SUFFIXES lib64 lib lib/static - ) + ) if(WEBP_${UPPERCOMPONENT}_LIBRARY) list(APPEND _webp_LIBRARIES "${WEBP_${UPPERCOMPONENT}_LIBRARY}") endif() diff --git a/build_files/cmake/Modules/FindXML2.cmake b/build_files/cmake/Modules/FindXML2.cmake index a17fb181974..a3ff9391a8b 100644 --- a/build_files/cmake/Modules/FindXML2.cmake +++ b/build_files/cmake/Modules/FindXML2.cmake @@ -42,13 +42,13 @@ find_library(XML2_LIBRARY ${_xml2_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set XML2_FOUND to TRUE if # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(XML2 DEFAULT_MSG - XML2_LIBRARY XML2_INCLUDE_DIR) + XML2_LIBRARY XML2_INCLUDE_DIR) if(XML2_FOUND) set(XML2_LIBRARIES ${XML2_LIBRARY}) diff --git a/build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake b/build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake index fdc63cff543..c7cbd68cb22 100644 --- a/build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake +++ b/build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake @@ -59,7 +59,7 @@ find_library(XR_OPENXR_SDK_LOADER_LIBRARY # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(XR_OpenXR_SDK DEFAULT_MSG - XR_OPENXR_SDK_LOADER_LIBRARY XR_OPENXR_SDK_INCLUDE_DIR) + XR_OPENXR_SDK_LOADER_LIBRARY XR_OPENXR_SDK_INCLUDE_DIR) if(XR_OPENXR_SDK_FOUND) set(XR_OPENXR_SDK_LIBRARIES ${XR_OPENXR_SDK_LOADER_LIBRARY}) diff --git a/build_files/cmake/Modules/FindZstd.cmake b/build_files/cmake/Modules/FindZstd.cmake index ef7394dee4f..0da9da91062 100644 --- a/build_files/cmake/Modules/FindZstd.cmake +++ b/build_files/cmake/Modules/FindZstd.cmake @@ -44,13 +44,13 @@ find_library(ZSTD_LIBRARY ${_zstd_SEARCH_DIRS} PATH_SUFFIXES lib64 lib - ) +) # handle the QUIETLY and REQUIRED arguments and set ZSTD_FOUND to TRUE if # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Zstd DEFAULT_MSG - ZSTD_LIBRARY ZSTD_INCLUDE_DIR) + ZSTD_LIBRARY ZSTD_INCLUDE_DIR) if(ZSTD_FOUND) set(ZSTD_LIBRARIES ${ZSTD_LIBRARY}) diff --git a/build_files/cmake/Modules/Findsse2neon.cmake b/build_files/cmake/Modules/Findsse2neon.cmake index 80ad9725066..5872d040eab 100644 --- a/build_files/cmake/Modules/Findsse2neon.cmake +++ b/build_files/cmake/Modules/Findsse2neon.cmake @@ -37,7 +37,7 @@ find_path(SSE2NEON_INCLUDE_DIR # all listed variables are TRUE include(FindPackageHandleStandardArgs) find_package_handle_standard_args(sse2neon DEFAULT_MSG - SSE2NEON_INCLUDE_DIR) + SSE2NEON_INCLUDE_DIR) if(SSE2NEON_FOUND) set(SSE2NEON_INCLUDE_DIRS ${SSE2NEON_INCLUDE_DIR}) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 18b054dc334..bb5e66d75d1 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -439,7 +439,7 @@ function(blender_add_lib__impl # Not for system includes because they can resolve to the same path # list_assert_duplicates("${includes_sys}") - # blenders dependency loops are longer than cmake expects and we need additional loops to + # blenders dependency loops are longer than cmake expects and we need additional loops to # properly link. set_property(TARGET ${name} APPEND PROPERTY LINK_INTERFACE_MULTIPLICITY 3) endfunction() @@ -1486,8 +1486,8 @@ macro(windows_process_platform_bundled_libraries library_deps) set(next_library_mode "${library_upper}") else() windows_install_shared_manifest( - FILES ${library} - ${next_library_mode} + FILES ${library} + ${next_library_mode} ) set(next_library_mode "ALL") endif() diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 1dbc4034e35..5f30dc5316d 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -5,7 +5,7 @@ # Libraries configuration for Apple. macro(find_package_wrapper) -# do nothing, just satisfy the macro + # do nothing, just satisfy the macro endmacro() function(print_found_status diff --git a/build_files/cmake/platform/platform_apple_xcode.cmake b/build_files/cmake/platform/platform_apple_xcode.cmake index 3b1688e0ba2..44780e5c6de 100644 --- a/build_files/cmake/platform/platform_apple_xcode.cmake +++ b/build_files/cmake/platform/platform_apple_xcode.cmake @@ -16,8 +16,9 @@ endif() # Detect developer directory. Depending on configuration this may be either # an Xcode or Command Line Tools installation. execute_process( - COMMAND xcode-select --print-path - OUTPUT_VARIABLE XCODE_DEVELOPER_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) + COMMAND xcode-select --print-path + OUTPUT_VARIABLE XCODE_DEVELOPER_DIR OUTPUT_STRIP_TRAILING_WHITESPACE +) # Detect Xcode version. It is provided by the Xcode generator but not # Unix Makefiles or Ninja. @@ -55,9 +56,10 @@ if(XCODE_VERSION) # Detect SDK version to use if(NOT DEFINED OSX_SYSTEM) execute_process( - COMMAND xcodebuild -version -sdk macosx SDKVersion - OUTPUT_VARIABLE OSX_SYSTEM - OUTPUT_STRIP_TRAILING_WHITESPACE) + COMMAND xcodebuild -version -sdk macosx SDKVersion + OUTPUT_VARIABLE OSX_SYSTEM + OUTPUT_STRIP_TRAILING_WHITESPACE + ) endif() message(STATUS "Detected OS X ${OSX_SYSTEM} and Xcode ${XCODE_VERSION} at ${XCODE_DEVELOPER_DIR}") @@ -65,11 +67,12 @@ if(XCODE_VERSION) else() # If no Xcode version found, try detecting command line tools. execute_process( - COMMAND pkgutil --pkg-info=com.apple.pkg.CLTools_Executables - OUTPUT_VARIABLE _cltools_pkg_info - OUTPUT_STRIP_TRAILING_WHITESPACE - RESULT_VARIABLE _cltools_pkg_info_result - ERROR_QUIET) + COMMAND pkgutil --pkg-info=com.apple.pkg.CLTools_Executables + OUTPUT_VARIABLE _cltools_pkg_info + OUTPUT_STRIP_TRAILING_WHITESPACE + RESULT_VARIABLE _cltools_pkg_info_result + ERROR_QUIET + ) if(_cltools_pkg_info_result EQUAL 0) # Extract version. @@ -80,9 +83,10 @@ else() # Detect SDK version to use. if(NOT DEFINED OSX_SYSTEM) execute_process( - COMMAND xcrun --sdk macosx --show-sdk-version - OUTPUT_VARIABLE OSX_SYSTEM - OUTPUT_STRIP_TRAILING_WHITESPACE) + COMMAND xcrun --sdk macosx --show-sdk-version + OUTPUT_VARIABLE OSX_SYSTEM + OUTPUT_STRIP_TRAILING_WHITESPACE + ) endif() message(STATUS "Detected OS X ${OSX_SYSTEM} and Command Line Tools ${XCODE_VERSION} at ${XCODE_DEVELOPER_DIR}") diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 6d9ebffd62c..c4a3a7f4b43 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -1019,7 +1019,7 @@ if(CMAKE_COMPILER_IS_GNUCC) unset(LD_VERSION) endif() -# CLang is the same as GCC for now. + # CLang is the same as GCC for now. elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -ffp-contract=off") @@ -1065,7 +1065,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") unset(LLD_BIN) endif() -# Intel C++ Compiler + # Intel C++ Compiler elseif(CMAKE_C_COMPILER_ID STREQUAL "Intel") # think these next two are broken find_program(XIAR xiar) diff --git a/build_files/cmake/testing.cmake b/build_files/cmake/testing.cmake index edbaff561f8..4b7af30c59b 100644 --- a/build_files/cmake/testing.cmake +++ b/build_files/cmake/testing.cmake @@ -229,7 +229,7 @@ function(blender_add_test_suite_lib ) blender_add_lib__impl(${name}_tests - "${sources};${common_sources}" "${includes}" "${includes_sys}" "${library_deps}") + "${sources};${common_sources}" "${includes}" "${includes_sys}" "${library_deps}") target_compile_definitions(${name}_tests PRIVATE ${GFLAGS_DEFINES}) target_compile_definitions(${name}_tests PRIVATE ${GLOG_DEFINES}) @@ -330,7 +330,7 @@ function(blender_add_test_suite_executable "${library_deps}" ADD_CTESTS TRUE DISCOVER_TESTS TRUE - ) + ) else() foreach(source ${sources}) get_filename_component(_source_ext ${source} LAST_EXT) @@ -351,7 +351,7 @@ function(blender_add_test_suite_executable "${library_deps}" ADD_CTESTS TRUE DISCOVER_TESTS FALSE - ) + ) # Work-around run-time dynamic loader error # symbol not found in flat namespace '_PyBaseObject_Type' diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index fe75065fecf..34957eab95b 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -7,19 +7,20 @@ remove_strict_flags() if(CMAKE_COMPILER_IS_GNUCC) remove_cc_flag("-Wunused-macros") endif() - set(INC - . - ) - set(INC_SYS - ${AUDASPACE_C_INCLUDE_DIRS} - ${AUDASPACE_PY_INCLUDE_DIRS} - ) +set(INC + . +) - set(SRC - intern/AUD_Set.cpp - intern/AUD_Set.h - ) +set(INC_SYS + ${AUDASPACE_C_INCLUDE_DIRS} + ${AUDASPACE_PY_INCLUDE_DIRS} +) + +set(SRC + intern/AUD_Set.cpp + intern/AUD_Set.h +) set(LIB ) @@ -48,8 +49,8 @@ if(WITH_PYTHON AND WITH_PYTHON_NUMPY) intern/AUD_PyInit.h ) list(APPEND LIB - ${PYTHON_LINKFLAGS} - ${PYTHON_LIBRARIES} + ${PYTHON_LINKFLAGS} + ${PYTHON_LIBRARIES} ) if(NOT WITH_SYSTEM_AUDASPACE) list(APPEND LIB diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index 1128be9272b..56adc1cc251 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -115,9 +115,9 @@ if(WITH_CYCLES_STANDALONE) " -framework GameController" ) set_property( - TARGET cycles - APPEND PROPERTY LINK_FLAGS - "${_cycles_sdl_frameworks}" + TARGET cycles + APPEND PROPERTY LINK_FLAGS + "${_cycles_sdl_frameworks}" ) endif() endif() diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 22c43347398..2816064303b 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -462,7 +462,7 @@ else() endif() if(UNIX AND NOT APPLE) - set(cycles_kernel_runtime_lib_target_path ${cycles_kernel_runtime_lib_target_path}/lib) + set(cycles_kernel_runtime_lib_target_path ${cycles_kernel_runtime_lib_target_path}/lib) endif() # CUDA module @@ -549,11 +549,12 @@ if(WITH_CYCLES_CUDA_BINARIES) endif() set(_cuda_nvcc_args - -arch=${arch} - ${CUDA_NVCC_FLAGS} - --${format} - ${CMAKE_CURRENT_SOURCE_DIR}${cuda_kernel_src} - ${cuda_flags}) + -arch=${arch} + ${CUDA_NVCC_FLAGS} + --${format} + ${CMAKE_CURRENT_SOURCE_DIR}${cuda_kernel_src} + ${cuda_flags} + ) if(WITH_COMPILER_CCACHE AND CCACHE_PROGRAM) add_custom_command( @@ -826,10 +827,11 @@ if(WITH_CYCLES_DEVICE_HIPRT) if(WITH_CYCLES_HIP_BINARIES) set(hiprt_sources device/hiprt/kernel.cpp - ${SRC_KERNEL_HEADERS} - ${SRC_KERNEL_DEVICE_GPU_HEADERS} - ${SRC_KERNEL_DEVICE_HIPRT_HEADERS} - ${SRC_UTIL_HEADERS}) + ${SRC_KERNEL_HEADERS} + ${SRC_KERNEL_DEVICE_GPU_HEADERS} + ${SRC_KERNEL_DEVICE_HIPRT_HEADERS} + ${SRC_UTIL_HEADERS} + ) set(cycles_bitcode_file ${CMAKE_CURRENT_BINARY_DIR}/kernel_rt_gfx.bc) set(sdk_bitcode_file ${CMAKE_CURRENT_BINARY_DIR}/hiprt${HIPRT_VERSION}_${HIP_VERSION_SHORT}_amd_lib.bc) @@ -858,69 +860,76 @@ if(WITH_CYCLES_DEVICE_HIPRT) -ffast-math -o ${sdk_bitcode_file}) - set(hiprt_compile_flags_cycles_bc - ${hiprt_compile_flags} - ${target_gpus} - ${HIP_HIPCC_FLAGS} - ${CMAKE_CURRENT_SOURCE_DIR}${hiprt_kernel_src} - ${flags} - -D CCL_NAMESPACE_BEGIN= - -D CCL_NAMESPACE_END= - -D HIPCC - -D __HIPRT__ - -std=c++17 - -fgpu-rdc - -c - --gpu-bundle-output - -parallel-jobs=${HIPRT_COMPILER_PARALLEL_JOBS} - -emit-llvm - -I ${CMAKE_CURRENT_SOURCE_DIR}/.. - -I ${CMAKE_CURRENT_SOURCE_DIR}/device/hiprt - -I ${HIPRT_INCLUDE_DIR} - -Wno-parentheses-equality - -Wno-unused-value - -ffast-math - -o ${cycles_bitcode_file}) + set(hiprt_compile_flags_cycles_bc + ${hiprt_compile_flags} + ${target_gpus} + ${HIP_HIPCC_FLAGS} + ${CMAKE_CURRENT_SOURCE_DIR}${hiprt_kernel_src} + ${flags} + -D CCL_NAMESPACE_BEGIN= + -D CCL_NAMESPACE_END= + -D HIPCC + -D __HIPRT__ + -std=c++17 + -fgpu-rdc + -c + --gpu-bundle-output + -parallel-jobs=${HIPRT_COMPILER_PARALLEL_JOBS} + -emit-llvm + -I ${CMAKE_CURRENT_SOURCE_DIR}/.. + -I ${CMAKE_CURRENT_SOURCE_DIR}/device/hiprt + -I ${HIPRT_INCLUDE_DIR} + -Wno-parentheses-equality + -Wno-unused-value + -ffast-math + -o ${cycles_bitcode_file} + ) - add_custom_command( - OUTPUT ${cycles_bitcode_file} - COMMAND ${hiprt_compile_command} ${hiprt_compile_flags_cycles_bc} - DEPENDS ${kernel_sources}) + add_custom_command( + OUTPUT ${cycles_bitcode_file} + COMMAND ${hiprt_compile_command} ${hiprt_compile_flags_cycles_bc} + DEPENDS ${kernel_sources} + ) - add_custom_command( - OUTPUT ${sdk_bitcode_file} - COMMAND ${hiprt_compile_command} ${hiprt_compile_flags_sdk_bc} - DEPENDS ${HIPRT_INCLUDE_DIR}/hiprt/impl/hiprt_kernels_bitcode.h) + add_custom_command( + OUTPUT ${sdk_bitcode_file} + COMMAND ${hiprt_compile_command} ${hiprt_compile_flags_sdk_bc} + DEPENDS ${HIPRT_INCLUDE_DIR}/hiprt/impl/hiprt_kernels_bitcode.h + ) - if(WIN32) - set(hiprt_link_command ${CMAKE_COMMAND}) - set(hiprt_link_flags -E env "HIP_PATH=${HIP_ROOT_DIR}" - ${HIP_LINKER_EXECUTABLE}) - else() - set(hiprt_link_command ${HIP_LINKER_EXECUTABLE}) - set(hiprt_link_flags) - endif() + if(WIN32) + set(hiprt_link_command ${CMAKE_COMMAND}) + set(hiprt_link_flags -E env "HIP_PATH=${HIP_ROOT_DIR}" + ${HIP_LINKER_EXECUTABLE} + ) + else() + set(hiprt_link_command ${HIP_LINKER_EXECUTABLE}) + set(hiprt_link_flags) + endif() - set(hiprt_link_flags - ${hiprt_link_flags} - ${target_gpus} - -fgpu-rdc - --hip-link - --cuda-device-only - -parallel-jobs=${HIPRT_COMPILER_PARALLEL_JOBS} - ${cycles_bitcode_file} - ${sdk_bitcode_file} - -o ${hiprt_file}) + set(hiprt_link_flags + ${hiprt_link_flags} + ${target_gpus} + -fgpu-rdc + --hip-link + --cuda-device-only + -parallel-jobs=${HIPRT_COMPILER_PARALLEL_JOBS} + ${cycles_bitcode_file} + ${sdk_bitcode_file} + -o ${hiprt_file} + ) add_custom_command( OUTPUT ${hiprt_file} COMMAND ${hiprt_link_command} ${hiprt_link_flags} - DEPENDS ${cycles_bitcode_file} ${sdk_bitcode_file}) + DEPENDS ${cycles_bitcode_file} ${sdk_bitcode_file} + ) add_custom_command( OUTPUT ${hiprt_file_compressed} COMMAND "$" ${hiprt_file} ${hiprt_file_compressed} - DEPENDS ${hiprt_file}) + DEPENDS ${hiprt_file} + ) delayed_install("${CMAKE_CURRENT_BINARY_DIR}" "${hiprt_file_compressed}" ${CYCLES_INSTALL_PATH}/lib) endif() @@ -980,7 +989,8 @@ if(WITH_CYCLES_DEVICE_OPTIX AND WITH_CYCLES_CUDA_BINARIES) ${cuda_flags} ${input} WORKING_DIRECTORY - "${CMAKE_CURRENT_SOURCE_DIR}") + "${CMAKE_CURRENT_SOURCE_DIR}" + ) add_custom_command( OUTPUT ${output_compressed} @@ -1293,15 +1303,16 @@ if(WITH_CYCLES_DEVICE_ONEAPI) string(REPLACE " " ";" sycl_compiler_flags_Debug_str ${sycl_compiler_flags_Debug_str}) add_custom_command( OUTPUT ${cycles_kernel_oneapi_lib} - COMMAND ${CMAKE_COMMAND} -E env - "LD_LIBRARY_PATH=${sycl_compiler_root}/../lib:${OCLOC_INSTALL_DIR}/lib:${IGC_INSTALL_DIR}/lib" - # `$ENV{PATH}` is for compiler to find `ld`. - "PATH=${OCLOC_INSTALL_DIR}/bin:${sycl_compiler_root}:$ENV{PATH}" - ${SYCL_COMPILER} - "$<$:${sycl_compiler_flags_Release_str}>" - "$<$:${sycl_compiler_flags_RelWithDebInfo_str}>" - "$<$:${sycl_compiler_flags_Debug_str}>" - "$<$:${sycl_compiler_flags_Release_str}>" + COMMAND + ${CMAKE_COMMAND} -E env + "LD_LIBRARY_PATH=${sycl_compiler_root}/../lib:${OCLOC_INSTALL_DIR}/lib:${IGC_INSTALL_DIR}/lib" + # `$ENV{PATH}` is for compiler to find `ld`. + "PATH=${OCLOC_INSTALL_DIR}/bin:${sycl_compiler_root}:$ENV{PATH}" + ${SYCL_COMPILER} + "$<$:${sycl_compiler_flags_Release_str}>" + "$<$:${sycl_compiler_flags_RelWithDebInfo_str}>" + "$<$:${sycl_compiler_flags_Debug_str}>" + "$<$:${sycl_compiler_flags_Release_str}>" COMMAND_EXPAND_LISTS DEPENDS ${cycles_oneapi_kernel_sources}) endif() diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index 0bcfa035a99..5d7b13a7bbb 100644 --- a/source/blender/compositor/CMakeLists.txt +++ b/source/blender/compositor/CMakeLists.txt @@ -41,7 +41,7 @@ set(SRC COM_simple_operation.hh COM_static_cache_manager.hh COM_texture_pool.hh - COM_utilities.hh + COM_utilities.hh intern/COM_compositor.cc intern/compile_state.cc diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index d2f0b80d01e..12496e209ab 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -752,7 +752,7 @@ target_link_libraries(bf_gpu PUBLIC ) if(WITH_OPENGL_BACKEND AND UNIX) -target_link_libraries(bf_gpu PUBLIC rt) + target_link_libraries(bf_gpu PUBLIC rt) endif() if(WITH_OPENCOLORIO) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 56776164814..8b2d7659f5a 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -271,7 +271,7 @@ if(WITH_BUILDINFO) -DBUILD_DATE=${BUILDINFO_OVERRIDE_DATE} -DBUILD_TIME=${BUILDINFO_OVERRIDE_TIME} -P ${CMAKE_SOURCE_DIR}/build_files/cmake/buildinfo.cmake - ) + ) # `buildinfo.h` is a generated file. set_source_files_properties( @@ -547,17 +547,19 @@ endif() if(WIN32) if(EXISTS ${LIBDIR}/osl/bin/oslquery.dll) # 4.1+ windows_install_shared_manifest( - FILES ${LIBDIR}/osl/bin/oslquery.dll - ${LIBDIR}/osl/bin/oslcomp.dll - ${LIBDIR}/osl/bin/oslexec.dll - ${LIBDIR}/osl/bin/oslnoise.dll + FILES + ${LIBDIR}/osl/bin/oslquery.dll + ${LIBDIR}/osl/bin/oslcomp.dll + ${LIBDIR}/osl/bin/oslexec.dll + ${LIBDIR}/osl/bin/oslnoise.dll RELEASE ) windows_install_shared_manifest( - FILES ${LIBDIR}/osl/bin/oslquery_d.dll - ${LIBDIR}/osl/bin/oslcomp_d.dll - ${LIBDIR}/osl/bin/oslexec_d.dll - ${LIBDIR}/osl/bin/oslnoise_d.dll + FILES + ${LIBDIR}/osl/bin/oslquery_d.dll + ${LIBDIR}/osl/bin/oslcomp_d.dll + ${LIBDIR}/osl/bin/oslexec_d.dll + ${LIBDIR}/osl/bin/oslnoise_d.dll DEBUG ) endif() @@ -1692,7 +1694,7 @@ if(DEFINED TARGETDIR_TEXT) install( DIRECTORY ${CMAKE_SOURCE_DIR}/release/license DESTINATION "${TARGETDIR_TEXT}" -) + ) endif() # Create a system extensions directory (users or administrators may populate this). diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index 1d22f093d3c..c5fde04d8ca 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -889,7 +889,7 @@ if(WITH_CYCLES OR WITH_GPU_RENDER_TESTS) ) endforeach() endif() - unset(_gpu_render_tests_arguments) + unset(_gpu_render_tests_arguments) endif() endif() endif() @@ -928,15 +928,15 @@ if(WITH_GPU_COMPOSITOR_TESTS) message(WARNING "Disabling compositor tests because OIIO oiiotool does not exist") else() set(compositor_tests - color - converter - filter - input - output - vector + color + converter + filter + input + output + vector - multiple_node_setups - ) + multiple_node_setups + ) if(WITH_LIBMV) list(APPEND compositor_tests distort matte) @@ -997,7 +997,7 @@ foreach(geo_node_test ${geo_node_tests}) ${file} --python ${TEST_PYTHON_DIR}/geo_node_test.py ) - endforeach() + endforeach() else() message(STATUS "Directory named ${TEST_SRC_DIR}/modeling/geometry_nodes/${geo_node_test}/ Not Found, disabling test.") endif()