summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorMichael Gottesman <mgottesman@apple.com>2016-06-29 21:59:23 +0000
committerMichael Gottesman <mgottesman@apple.com>2016-06-29 21:59:23 +0000
commit5a588f187eea527417e687b40eba7d6d2abc50ba (patch)
treed0c6897d19671bbaafbdfee2bc0dee3afc99f95a /cmake
parentc07f1963bcc44e0c227b29d7c1dc2c1673d5f056 (diff)
[ClangConfig] Store all of the targets exported in the variable CLANG_EXPORTED_TARGETS.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@274180 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
-rw-r--r--cmake/modules/CMakeLists.txt2
-rw-r--r--cmake/modules/ClangConfig.cmake.in1
2 files changed, 2 insertions, 1 deletions
diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
index 9c4b4bff72..3cc808a46b 100644
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -28,7 +28,7 @@ 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_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
diff --git a/cmake/modules/ClangConfig.cmake.in b/cmake/modules/ClangConfig.cmake.in
index 2095e5d282..38c6c03a1c 100644
--- a/cmake/modules/ClangConfig.cmake.in
+++ b/cmake/modules/ClangConfig.cmake.in
@@ -8,6 +8,7 @@ find_package(LLVM REQUIRED CONFIG)
@CLANG_CONFIG_CODE@
+set(CLANG_EXPORTED_TARGETS "@CLANG_EXPORTS@")
set(CLANG_CMAKE_DIR "@CLANG_CONFIG_CMAKE_DIR@")
# Provide all our library targets to users.