diff --git a/.gitmodules b/.gitmodules index 52446c6f..cbb10383 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,7 +13,7 @@ [submodule "src/compute"] path = src/compute url = https://github.com/LuisaGroup/LuisaCompute.git - branch = next + branch = stable [submodule "src/ext/json"] path = src/ext/json url = https://github.com/nlohmann/json.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 387fd3da..6cca4e20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,25 +35,7 @@ endif () option(LUISA_RENDER_BUILD_TESTS "Build tests for LuisaRender" ${LUISA_RENDER_MASTER_PROJECT}) option(LUISA_RENDER_ENABLE_UNITY_BUILD "Enable unity build to speed up compilation" OFF) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") -set(CMAKE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") - -get_cmake_property(LUISA_RENDERIS_MULTI_CONFIG GENERATOR_IS_MULTI_CONFIG) -if (LUISA_RENDERIS_MULTI_CONFIG) - foreach (config ${CMAKE_CONFIGURATION_TYPES}) - string(TOUPPER ${config} CONFIG_UPPER) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CONFIG_UPPER} "${CMAKE_BINARY_DIR}/bin/${config}") - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CONFIG_UPPER} "${CMAKE_BINARY_DIR}/bin/${config}") - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONFIG_UPPER} "${CMAKE_BINARY_DIR}/lib/${config}") - set(CMAKE_PDB_OUTPUT_DIRECTORY_${CONFIG_UPPER} "${CMAKE_BINARY_DIR}/lib/${config}") - endforeach () -else () - if (NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Release") - endif () -endif () +include(src/compute/scripts/setup_output_dirs.cmake) # rpath set(CMAKE_MACOSX_RPATH ON) diff --git a/src/compute b/src/compute index f3154848..ab9a3c8c 160000 --- a/src/compute +++ b/src/compute @@ -1 +1 @@ -Subproject commit f31548488c914ecb345154b54742592cf8250ae8 +Subproject commit ab9a3c8cc9bac7e6e307717319193618a74cb3a0