diff options
| author | Michael Gottesman <mgottesman@apple.com> | 2016-06-29 21:59:19 +0000 |
|---|---|---|
| committer | Michael Gottesman <mgottesman@apple.com> | 2016-06-29 21:59:19 +0000 |
| commit | 497e97ffe3a722d487ffeba3b8dc4c6c059fc6a2 (patch) | |
| tree | 490cbe51769aef5dea2410ff17c615e8695baa8a | |
| parent | 1b87cd397495641be9b56ebe3a3e33e14ebea6c4 (diff) | |
| download | bcm5719-llvm-497e97ffe3a722d487ffeba3b8dc4c6c059fc6a2.tar.gz bcm5719-llvm-497e97ffe3a722d487ffeba3b8dc4c6c059fc6a2.zip | |
[ClangConfig] Instead of hard coding the ClangTargets location to /ClangTargets.cmake, follow LLVM's example and use a pre-computed cmake variable @CLANG_CONFIG_EXPORTS_FILE@.
This just makes ClangConfig more consistent with LLVMConfig.
llvm-svn: 274178
| -rw-r--r-- | clang/cmake/modules/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | clang/cmake/modules/ClangConfig.cmake.in | 6 |
2 files changed, 19 insertions, 1 deletions
diff --git a/clang/cmake/modules/CMakeLists.txt b/clang/cmake/modules/CMakeLists.txt index 86ab001d2c3..6b655b07969 100644 --- a/clang/cmake/modules/CMakeLists.txt +++ b/clang/cmake/modules/CMakeLists.txt @@ -8,12 +8,26 @@ get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS) export(TARGETS ${CLANG_EXPORTS} FILE ${clang_cmake_builddir}/ClangTargets.cmake) # Generate ClangConfig.cmake for the build tree. +set(CLANG_CONFIG_CMAKE_DIR "${clang_cmake_builddir}") +set(CLANG_CONFIG_EXPORTS_FILE "${clang_cmake_builddir}/ClangTargets.cmake") configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/ClangConfig.cmake.in ${clang_cmake_builddir}/ClangConfig.cmake @ONLY) # Generate ClangConfig.cmake for the install tree. +set(CLANG_CONFIG_CODE " +# Compute the installation prefix from this LLVMConfig.cmake file location. +get_filename_component(CLANG_INSTALL_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)") +# Construct the proper number of get_filename_component(... PATH) +# calls to compute the installation prefix. +string(REGEX REPLACE "/" ";" _count "${CLANG_INSTALL_PACKAGE_DIR}") +foreach(p ${_count}) + set(CLANG_CONFIG_CODE "${CLANG_CONFIG_CODE} +get_filename_component(CLANG_INSTALL_PREFIX \"\${CLANG_INSTALL_PREFIX}\" PATH)") +endforeach(p) +set(CLANG_CONFIG_CMAKE_DIR "\${CLANG_INSTALL_PREFIX}/\${CLANG_INSTALL_PACKAGE_DIR}") +set(CLANG_CONFIG_EXPORTS_FILE "\${CLANG_CMAKE_DIR}/ClangTargets.cmake") configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/ClangConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/ClangConfig.cmake diff --git a/clang/cmake/modules/ClangConfig.cmake.in b/clang/cmake/modules/ClangConfig.cmake.in index d30a277d222..2095e5d282b 100644 --- a/clang/cmake/modules/ClangConfig.cmake.in +++ b/clang/cmake/modules/ClangConfig.cmake.in @@ -6,5 +6,9 @@ find_package(LLVM REQUIRED CONFIG) +@CLANG_CONFIG_CODE@ + +set(CLANG_CMAKE_DIR "@CLANG_CONFIG_CMAKE_DIR@") + # Provide all our library targets to users. -include("${CMAKE_CURRENT_LIST_DIR}/ClangTargets.cmake") +include("@CLANG_CONFIG_EXPORTS_FILE@") |
