From 1fe137864ebe28e4e9d292506a962057dd6b8bb0 Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Sun, 6 Sep 2026 22:20:42 -0700 Subject: [PATCH] build: Fix name and install destination of llvm_macros.cmake Fixes 1771 Primarily, this was about llvm_macros.cmake installing in the same location where we put the exported cmake config files. But I also realized, maybe it's not good to have exported cmake files that aren't prefixed with "OSL_" like the others, so I renamed it, too. I will only have that in 1.16, so it will not break people in release branches. Signed-off-by: Larry Gritz --- CMakeLists.txt | 5 +++-- src/cmake/{llvm_macros.cmake => OSL_llvm_macros.cmake} | 0 2 files changed, 3 insertions(+), 2 deletions(-) rename src/cmake/{llvm_macros.cmake => OSL_llvm_macros.cmake} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c482264ec..79996aefc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -212,7 +212,7 @@ include (pythonutils) include (externalpackages) include (flexbison) include (cuda_macros) -include (llvm_macros) +include (OSL_llvm_macros) # Include all our testing apparatus and utils, but not if it's a subproject if (${PROJECT_NAME}_BUILD_TESTS AND PROJECT_IS_TOP_LEVEL) @@ -325,7 +325,8 @@ configure_package_config_file ("${PROJECT_SOURCE_DIR}/src/cmake/Config.cmake.in" install (FILES "${OSL_PROJECT_CONFIG}" "${OSL_VERSION_CONFIG}" DESTINATION "${OSL_CONFIG_INSTALL_DIR}") -install (FILES src/cmake/llvm_macros.cmake DESTINATION cmake) +install (FILES src/cmake/OSL_llvm_macros.cmake + DESTINATION "${OSL_CONFIG_INSTALL_DIR}") set (PERMISSION_FLAGS OWNER_EXECUTE OWNER_READ OWNER_WRITE GROUP_EXECUTE GROUP_READ diff --git a/src/cmake/llvm_macros.cmake b/src/cmake/OSL_llvm_macros.cmake similarity index 100% rename from src/cmake/llvm_macros.cmake rename to src/cmake/OSL_llvm_macros.cmake