diff --git a/CMakeLists.txt b/CMakeLists.txt index b054a67e..179a5d99 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -536,16 +536,16 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang") endif() include(ExternalProject) -ExternalProject_Add(Torch - PREFIX Torch +ExternalProject_Add(TorchExternal + PREFIX TorchExternal SOURCE_DIR ${CMAKE_SOURCE_DIR}/tools/Torch CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/Torch ) -ExternalProject_Get_Property(Torch install_dir) +ExternalProject_Get_Property(TorchExternal install_dir) set(TORCH_EXECUTABLE ${install_dir}/src/Torch-build/$/torch) add_custom_target( ExtractAssets - DEPENDS Torch + DEPENDS TorchExternal WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${TORCH_EXECUTABLE} header -o baserom.us.uncompressed.z64 COMMAND ${TORCH_EXECUTABLE} otr baserom.us.uncompressed.z64 diff --git a/tools/Torch b/tools/Torch index 339f9c48..ad2a8122 160000 --- a/tools/Torch +++ b/tools/Torch @@ -1 +1 @@ -Subproject commit 339f9c485a2dd1d418307ffceef1f56de5aa02ff +Subproject commit ad2a81221bb596caeaff156848c8f5476a7a72b6