[cmake] Expand $(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) from all LLVM/Clang imported target locations.

Normally when building in Xcode, Xcode will assume that LLVM/Clang use the same
configuration as Swift and will try to pull in the sources from that
configuration's build directory.

This is incorrect when we are compiling a Release LLVM with a Debug Swift. This
commit uses our escaping functionality from 0a48857 and the new imported targets
to fix this issue.

rdar://27062396

Author: gottesmm

CMakeLists.txt

@@ -384,12 +384,6 @@ if(NOT EXISTS "${CLANG_MAIN_INCLUDE_DIR}/clang/AST/Decl.h")
   message(FATAL_ERROR "Clang is missing from llvm/tools subdirectory.")
 endif()
 
-# This could be computed using ${CMAKE_CFG_INTDIR} if we want to link Swift
-# against a matching LLVM build configuration.  However, we usually want to be
-# flexible and allow linking a debug Swift against optimized LLVM.
-set(LLVM_RUNTIME_OUTPUT_INTDIR "${LLVM_BINARY_DIR}")
-set(LLVM_LIBRARY_OUTPUT_INTDIR "${LLVM_LIBRARY_DIR}")
-
 set(SWIFT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(SWIFT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 

cmake/modules/SwiftSharedCMakeConfig.cmake

@@ -40,6 +40,29 @@ function(escape_llvm_path_for_xcode path outvar)
   set(${outvar} "${path}" PARENT_SCOPE)
 endfunction()
 
+# What this function does is go through each of the passed in imported targets
+# from LLVM/Clang and changes them to use the appropriate fully expanded paths.
+#
+# TODO: This function needs a better name.
+function(fix_imported_target_locations_for_xcode targets)
+  foreach(t ${targets})
+    if (NOT TARGET ${t})
+      message(FATAL_ERROR "${t} is not a target?!")
+    endif()
+
+    get_target_property(TARGET_TYPE ${t} TYPE)
+
+    # We only want to do this for static libraries for now.
+    if (NOT ${TARGET_TYPE} STREQUAL "STATIC_LIBRARY")
+      continue()
+    endif()
+
+    set_target_properties(${t} PROPERTIES
+      IMPORTED_LOCATION_DEBUG "${LLVM_LIBRARY_OUTPUT_INTDIR}/lib${t}.a"
+      IMPORTED_LOCATION_RELEASE "${LLVM_LIBRARY_OUTPUT_INTDIR}/lib${t}.a")
+  endforeach()
+endfunction()
+
 macro(swift_common_standalone_build_config_llvm product is_cross_compiling)
   option(LLVM_ENABLE_WARNINGS "Enable compiler warnings." ON)
 
@@ -92,6 +115,16 @@ macro(swift_common_standalone_build_config_llvm product is_cross_compiling)
   precondition(LLVM_LIBRARY_DIRS)
   escape_llvm_path_for_xcode("${LLVM_LIBRARY_DIRS}" LLVM_LIBRARY_DIRS)
 
+  # This could be computed using ${CMAKE_CFG_INTDIR} if we want to link Swift
+  # against a matching LLVM build configuration.  However, we usually want to be
+  # flexible and allow linking a debug Swift against optimized LLVM.
+  set(LLVM_RUNTIME_OUTPUT_INTDIR "${LLVM_BINARY_DIR}")
+  set(LLVM_LIBRARY_OUTPUT_INTDIR "${LLVM_LIBRARY_DIR}")
+
+  if (XCODE)
+    fix_imported_target_locations_for_xcode("${LLVM_EXPORTED_TARGETS}")
+  endif()
+
   if(NOT ${is_cross_compiling})
     set(${product}_NATIVE_LLVM_TOOLS_PATH "${LLVM_TOOLS_BINARY_DIR}")
   endif()
@@ -181,6 +214,10 @@ macro(swift_common_standalone_build_config_clang product is_cross_compiling)
 
   set(CLANG_MAIN_INCLUDE_DIR "${CLANG_MAIN_SRC_DIR}/include")
 
+  if (XCODE)
+    fix_imported_target_locations_for_xcode("${CLANG_EXPORTED_TARGETS}")
+  endif()
+
   include_directories("${CLANG_BUILD_INCLUDE_DIR}"
                       "${CLANG_MAIN_INCLUDE_DIR}")
 endmacro()