Skip to content

Rename .cmake files when installing to monolith. They need to match whatever was there before #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filipppavlov merged 1 commit into from
Jul 21, 2026
Merged

Rename .cmake files when installing to monolith. They need to match whatever was there before #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions trinity/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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
Expand Down