From 5f2049bfe39f0ca07720260f04b74e745dda6e05 Mon Sep 17 00:00:00 2001 From: Vassil Vassilev Date: Sat, 2 Apr 2022 21:44:35 +0000 Subject: [PATCH] Do not install {Clang,Cling}Config.cmake in the project lib dir. This should fix the clad builds and unpollute the ROOTSYS/lib. --- interpreter/cling/cmake/modules/CMakeLists.txt | 2 +- interpreter/llvm/src/tools/clang/cmake/modules/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interpreter/cling/cmake/modules/CMakeLists.txt b/interpreter/cling/cmake/modules/CMakeLists.txt index 0d39dc175e6aa4..444575e5d73e93 100644 --- a/interpreter/cling/cmake/modules/CMakeLists.txt +++ b/interpreter/cling/cmake/modules/CMakeLists.txt @@ -2,7 +2,7 @@ # link against them. LLVM calls its version of this file LLVMExports.cmake, but # the usual CMake convention seems to be ${Project}Targets.cmake. set(CLING_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/cling) -set(cling_cmake_builddir "${CMAKE_BINARY_DIR}/${CLING_INSTALL_PACKAGE_DIR}") +set(cling_cmake_builddir "${LLVM_BINARY_DIR}/${CLING_INSTALL_PACKAGE_DIR}") # Keep this in sync with llvm/cmake/CMakeLists.txt! set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) diff --git a/interpreter/llvm/src/tools/clang/cmake/modules/CMakeLists.txt b/interpreter/llvm/src/tools/clang/cmake/modules/CMakeLists.txt index 561665d58cad92..c8f1dc414a751d 100644 --- a/interpreter/llvm/src/tools/clang/cmake/modules/CMakeLists.txt +++ b/interpreter/llvm/src/tools/clang/cmake/modules/CMakeLists.txt @@ -4,7 +4,7 @@ include(LLVMDistributionSupport) # link against them. LLVM calls its version of this file LLVMExports.cmake, but # the usual CMake convention seems to be ${Project}Targets.cmake. set(CLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/clang) -set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}") +set(clang_cmake_builddir "${LLVM_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}") # Keep this in sync with llvm/cmake/CMakeLists.txt! set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)