From b449a3589f01d333fb115ca67cf1a9f18070c107 Mon Sep 17 00:00:00 2001 From: CCP ChargeBack <35330827+ccp-chargeback@users.noreply.github.com> Date: Thu, 13 Nov 2025 14:47:43 +0000 Subject: [PATCH] Change install location and name to carbon-resources Install location changes: - From: share/resources/resources.cmake - To: share/carbon-resources/carbon-resources.cmake Updated version info to 3.1.2 --- CMakeLists.txt | 12 +++++++----- ...urcesConfig.cmake => carbon-resourcesConfig.cmake | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) rename resourcesConfig.cmake => carbon-resourcesConfig.cmake (95%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ad8c19..dbe3af7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright © 2025 CCP ehf. cmake_minimum_required(VERSION 3.30.1) -project(resources VERSION 3.1.1) +project(resources VERSION 3.1.2) include(cmake/CcpGlobalSettings.cmake) include(cmake/CcpTargetConfigurations.cmake) @@ -157,11 +157,13 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) install( EXPORT resourcesTarget - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/resources - FILE resources.cmake) + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/carbon-resources + FILE carbon-resources.cmake + ) install( - FILES resourcesConfig.cmake - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/resources) + FILES carbon-resourcesConfig.cmake + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/carbon-resources + ) endif () endif () diff --git a/resourcesConfig.cmake b/carbon-resourcesConfig.cmake similarity index 95% rename from resourcesConfig.cmake rename to carbon-resourcesConfig.cmake index 1583248..ebf9747 100644 --- a/resourcesConfig.cmake +++ b/carbon-resourcesConfig.cmake @@ -1,7 +1,7 @@ include(CMakeFindDependencyMacro) # ${CMAKE_CURRENT_LIST_DIR}/project_name.cmake is generated automatically by cmake as part of the install step -include(${CMAKE_CURRENT_LIST_DIR}/resources.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/carbon-resources.cmake) # Please specify all of this projects transitive dependencies here # In order for a consuming cmake project system to locate any transitive dependencies of this project, they must be