summaryrefslogtreecommitdiffstats
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
commit5ba5270eb99945788e3881a088221a51141cf3e4 (patch)
tree07e886df06a85c5acdfb0beaea8a65e506732070
parentccc31a173e65e49f7817d79140ece6d1aae2109b (diff)
downloadbcm5719-llvm-5ba5270eb99945788e3881a088221a51141cf3e4.tar.gz
bcm5719-llvm-5ba5270eb99945788e3881a088221a51141cf3e4.zip
[ClangConfig] Store all of the targets exported in the variable CLANG_EXPORTED_TARGETS.
llvm-svn: 274180
-rw-r--r--clang/cmake/modules/CMakeLists.txt2
-rw-r--r--clang/cmake/modules/ClangConfig.cmake.in1
2 files changed, 2 insertions, 1 deletions
diff --git a/clang/cmake/modules/CMakeLists.txt b/clang/cmake/modules/CMakeLists.txt
index 9c4b4bff72a..3cc808a46b9 100644
--- a/clang/cmake/modules/CMakeLists.txt
+++ b/clang/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/clang/cmake/modules/ClangConfig.cmake.in b/clang/cmake/modules/ClangConfig.cmake.in
index 2095e5d282b..38c6c03a1c9 100644
--- a/clang/cmake/modules/ClangConfig.cmake.in
+++ b/clang/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.
OpenPOWER on IntegriCloud