]> granicus.if.org Git - clang/commitdiff
[ClangConfig] Store all of the targets exported in the variable CLANG_EXPORTED_TARGETS.
authorMichael Gottesman <mgottesman@apple.com>
Wed, 29 Jun 2016 21:59:23 +0000 (21:59 +0000)
committerMichael Gottesman <mgottesman@apple.com>
Wed, 29 Jun 2016 21:59:23 +0000 (21:59 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@274180 91177308-0d34-0410-b5e6-96231b3b80d8

cmake/modules/CMakeLists.txt
cmake/modules/ClangConfig.cmake.in

index 9c4b4bff72a9ad07c8493dc856cab313171ef9ad..3cc808a46b95812133718db72064a4564aa44d64 100644 (file)
@@ -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
index 2095e5d282be066a6169266556551b76309153a3..38c6c03a1c96f80304bd7996e73af49002fde70d 100644 (file)
@@ -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.