diff --git a/.gitmodules b/.gitmodules index 3e35e19c..396b208b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,8 +12,8 @@ url = https://github.com/syoyo/tinyexr.git [submodule "src/compute"] path = src/compute - url = git@github.com:LuisaGroup/LuisaCompute-coroutine.git - branch = refactor-api + url = https://github.com/LuisaGroup/LuisaCompute-coroutine.git + branch = next [submodule "src/ext/json"] path = src/ext/json url = https://github.com/nlohmann/json.git diff --git a/src/compute b/src/compute index c93cc73b..1161b00a 160000 --- a/src/compute +++ b/src/compute @@ -1 +1 @@ -Subproject commit c93cc73b9e34d729054cf154a34e0bfd684afa65 +Subproject commit 1161b00aff97d2540257e956336e16cd655573e2 diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index 7f71681a..38ee899b 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -30,6 +30,15 @@ target_link_libraries(luisa-render-util PUBLIC luisa::compute luisa-render-include luisa-render-ext) + +# work around the clang bug: https://github.com/Homebrew/homebrew-core/issues/169820 +if (APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND + CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 18) + cmake_path(GET CMAKE_CXX_COMPILER PARENT_PATH CLANG_BIN_PATH) + cmake_path(GET CLANG_BIN_PATH PARENT_PATH CLANG_ROOT_PATH) + target_link_libraries(luisa-compute-core PUBLIC "-L${CLANG_ROOT_PATH}/lib/c++") +endif () + set_target_properties(luisa-render-util PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON UNITY_BUILD ${LUISA_RENDER_ENABLE_UNITY_BUILD})