Commit: 9b9f8053ce2ac8063d43d1131e1244cfc17b408b Author: Brecht Van Lommel Date: Mon Dec 5 23:33:59 2022 +0100 Branches: tmp-vfx-platform-2023 https://developer.blender.org/rB9b9f8053ce2ac8063d43d1131e1244cfc17b408b
Cleanup: whitespace =================================================================== M build_files/cmake/platform/platform_apple.cmake M build_files/cmake/platform/platform_unix.cmake M intern/cycles/kernel/osl/shaders/CMakeLists.txt =================================================================== diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index a8ce4db943e..f7351f482bb 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -327,7 +327,7 @@ if(WITH_LLVM) if(WITH_CLANG) find_package(Clang) if(NOT CLANG_FOUND) - message(FATAL_ERROR "Clang not found.") + message(FATAL_ERROR "Clang not found.") endif() endif() diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 03ad1308143..260fa2e58b2 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -210,7 +210,7 @@ if(WITH_SDL) ) # unset(SDLMAIN_LIBRARY CACHE) set_and_warn_library_found("SDL" SDL_FOUND WITH_SDL) - endif() + endif() endif() # Codecs @@ -487,18 +487,18 @@ if(WITH_LLVM) set_and_warn_library_found("LLVM" LLVM_FOUND WITH_LLVM) if(LLVM_FOUND) - if(WITH_CLANG) - find_package_wrapper(Clang) + if(WITH_CLANG) + find_package_wrapper(Clang) set_and_warn_library_found("Clang" CLANG_FOUND WITH_CLANG) - endif() + endif() - # Symbol conflicts with same UTF library used by OpenCollada - if(EXISTS ${LIBDIR}) - if(WITH_OPENCOLLADA AND (${LLVM_VERSION} VERSION_LESS "4.0.0")) - list(REMOVE_ITEM OPENCOLLADA_LIBRARIES ${OPENCOLLADA_UTF_LIBRARY}) + # Symbol conflicts with same UTF library used by OpenCollada + if(EXISTS ${LIBDIR}) + if(WITH_OPENCOLLADA AND (${LLVM_VERSION} VERSION_LESS "4.0.0")) + list(REMOVE_ITEM OPENCOLLADA_LIBRARIES ${OPENCOLLADA_UTF_LIBRARY}) + endif() endif() endif() - endif() endif() if(WITH_OPENSUBDIV) @@ -655,11 +655,11 @@ if(WITH_GHOST_WAYLAND) endif() if(_use_system_wayland) - pkg_check_modules(wayland-client wayland-client>=1.12) - pkg_check_modules(wayland-egl wayland-egl) - pkg_check_modules(wayland-scanner wayland-scanner) - pkg_check_modules(wayland-cursor wayland-cursor) - pkg_check_modules(wayland-protocols wayland-protocols>=1.15) + pkg_check_modules(wayland-client wayland-client>=1.12) + pkg_check_modules(wayland-egl wayland-egl) + pkg_check_modules(wayland-scanner wayland-scanner) + pkg_check_modules(wayland-cursor wayland-cursor) + pkg_check_modules(wayland-protocols wayland-protocols>=1.15) pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) else() # CentOS 7 packages have too old a version, a newer version exist in the diff --git a/intern/cycles/kernel/osl/shaders/CMakeLists.txt b/intern/cycles/kernel/osl/shaders/CMakeLists.txt index 0b5d11fc480..bfd203416cb 100644 --- a/intern/cycles/kernel/osl/shaders/CMakeLists.txt +++ b/intern/cycles/kernel/osl/shaders/CMakeLists.txt @@ -126,6 +126,7 @@ set(SRC_OSL_HEADERS set(SRC_OSO ) + # TODO, add a module to compile OSL foreach(_file ${SRC_OSL}) set(_OSL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${_file}) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs