From 687755496406634ef90044760f6c73d36dad5003 Mon Sep 17 00:00:00 2001 From: Filipp Pavlov Date: Tue, 21 Jul 2026 10:46:43 +0000 Subject: [PATCH] Rename .cmake files when installing to monolith. They need to match whatever was there before --- trinity/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/trinity/CMakeLists.txt b/trinity/CMakeLists.txt index 9d8822d1e..dc0e9c6e0 100644 --- a/trinity/CMakeLists.txt +++ b/trinity/CMakeLists.txt @@ -1846,7 +1846,7 @@ else() endif() # utility function that sets properties shared between all trinity targets -function(set_shared_trinity_properties target package_name) +function(set_shared_trinity_properties target) target_link_libraries(${target} PUBLIC @@ -1935,11 +1935,11 @@ function(set_shared_trinity_properties target package_name) configure_ccp_vendor_config_file( TARGET ${target} - DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake" + DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/${target}Config.cmake" DEPENDENCIES "" ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake DESTINATION .) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${target}Config.cmake DESTINATION .) else () # VCPKG install mode # Install rule to ensure that our runtime and linker files are in the vcpkg structure @@ -1981,7 +1981,7 @@ if(WIN32) ) target_link_libraries(${TRINITY_STUB_TARGET_NAME} PRIVATE TrinityAL_stub) - set_shared_trinity_properties(${TRINITY_STUB_TARGET_NAME} carbon-trinity-stub) + set_shared_trinity_properties(${TRINITY_STUB_TARGET_NAME}) endif() if(WIN32) @@ -1997,7 +1997,7 @@ if(WIN32) ) #find_package(nvidia-aftermath CONFIG REQUIRED)#Required for dx11 target_link_libraries(${TRINITY_DX11_TARGET_NAME} PRIVATE TrinityAL_dx11) - set_shared_trinity_properties(${TRINITY_DX11_TARGET_NAME} carbon-trinity-dx11) + set_shared_trinity_properties(${TRINITY_DX11_TARGET_NAME}) endif() if (BUILD_DX12) @@ -2011,7 +2011,7 @@ if(WIN32) TRINITYNAME=_trinity_dx12 ) target_link_libraries(${TRINITY_DX12_TARGET_NAME} PRIVATE TrinityAL_dx12 ) - set_shared_trinity_properties(${TRINITY_DX12_TARGET_NAME} carbon-trinity-dx12) + set_shared_trinity_properties(${TRINITY_DX12_TARGET_NAME}) endif() elseif(APPLE) @@ -2026,7 +2026,7 @@ elseif(APPLE) TRINITY_PLATFORM=TRINITY_METAL TRINITYNAME=_trinity_metal ) - set_shared_trinity_properties(${TRINITY_METAL_TARGET_NAME} carbon-trinity-metal) + set_shared_trinity_properties(${TRINITY_METAL_TARGET_NAME}) target_link_libraries(${TRINITY_METAL_TARGET_NAME} PRIVATE TrinityAL_metal