[cmake] Combine apply_xcode_substitutions and escape_llvm_path_for_xcode into a better escape_path_for_xcode that can be reused across cmake.

Author: gottesmm

cmake/modules/AddSwift.cmake

@@ -678,7 +678,7 @@ function(_add_swift_library_single target name)
 
     foreach(config ${CMAKE_CONFIGURATION_TYPES})
       string(TOUPPER ${config} config_upper)
-      apply_xcode_substitutions("${config}" "${SWIFTLIB_DIR}" config_lib_dir)
+      escape_path_for_xcode("${config}" "${SWIFTLIB_DIR}" config_lib_dir)
       set_target_properties(${target} PROPERTIES
         LIBRARY_OUTPUT_DIRECTORY_${config_upper} ${config_lib_dir}/${SWIFTLIB_SINGLE_SUBDIR}
         ARCHIVE_OUTPUT_DIRECTORY_${config_upper} ${config_lib_dir}/${SWIFTLIB_SINGLE_SUBDIR})
@@ -732,7 +732,7 @@ function(_add_swift_library_single target name)
 
     foreach(config ${CMAKE_CONFIGURATION_TYPES})
       string(TOUPPER ${config} config_upper)
-      apply_xcode_substitutions(
+      escape_path_for_xcode(
           "${config}" "${SWIFTSTATICLIB_DIR}" config_lib_dir)
       set_target_properties(${target_static} PROPERTIES
         LIBRARY_OUTPUT_DIRECTORY_${config_upper} ${config_lib_dir}/${SWIFTLIB_SINGLE_SUBDIR}

cmake/modules/SwiftSharedCMakeConfig.cmake

@@ -57,14 +57,14 @@ macro(swift_common_standalone_build_config_llvm product is_cross_compiling)
   mark_as_advanced(LLVM_ENABLE_ASSERTIONS)
 
   precondition(LLVM_TOOLS_BINARY_DIR)
-  escape_llvm_path_for_xcode("${LLVM_TOOLS_BINARY_DIR}" LLVM_TOOLS_BINARY_DIR)
+  escape_path_for_xcode("${LLVM_BUILD_TYPE}" "${LLVM_TOOLS_BINARY_DIR}" LLVM_TOOLS_BINARY_DIR)
   precondition_translate_flag(LLVM_BUILD_LIBRARY_DIR LLVM_LIBRARY_DIR)
-  escape_llvm_path_for_xcode("${LLVM_LIBRARY_DIR}" LLVM_LIBRARY_DIR)
+  escape_path_for_xcode("${LLVM_BUILD_TYPE}" "${LLVM_LIBRARY_DIR}" LLVM_LIBRARY_DIR)
   precondition_translate_flag(LLVM_BUILD_MAIN_INCLUDE_DIR LLVM_MAIN_INCLUDE_DIR)
   precondition_translate_flag(LLVM_BUILD_BINARY_DIR LLVM_BINARY_DIR)
   precondition_translate_flag(LLVM_BUILD_MAIN_SRC_DIR LLVM_MAIN_SRC_DIR)
   precondition(LLVM_LIBRARY_DIRS)
-  escape_llvm_path_for_xcode("${LLVM_LIBRARY_DIRS}" LLVM_LIBRARY_DIRS)
+  escape_path_for_xcode("${LLVM_BUILD_TYPE}" "${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
@@ -102,7 +102,7 @@ macro(swift_common_standalone_build_config_llvm product is_cross_compiling)
     "Version number that will be placed into the libclang library , in the form XX.YY")
 
   foreach (INCLUDE_DIR ${LLVM_INCLUDE_DIRS})
-    escape_llvm_path_for_xcode("${INCLUDE_DIR}" INCLUDE_DIR)
+    escape_path_for_xcode("${LLVM_BUILD_TYPE}" "${INCLUDE_DIR}" INCLUDE_DIR)
     include_directories(${INCLUDE_DIR})
   endforeach ()
 

cmake/modules/SwiftXcodeSupport.cmake

@@ -1,15 +1,6 @@
 # This file contains cmake configuration specifically related to support for the
 # Xcode generator in CMake.
 
-function(apply_xcode_substitutions config path result_var_name)
-  # Hack to deal with the fact that paths contain the build-time
-  # variables. Note that this fix is Xcode-specific.
-  string(REPLACE "$(CONFIGURATION)" "${config}" result "${path}")
-  string(REPLACE "$(EFFECTIVE_PLATFORM_NAME)" "" result "${result}")
-
-  set("${result_var_name}" "${result}" PARENT_SCOPE)
-endfunction()
-
 function(get_effective_platform_for_triple triple output)
   string(FIND "${triple}" "macos" IS_MACOS)
   if (IS_MACOS)
@@ -19,23 +10,19 @@ function(get_effective_platform_for_triple triple output)
   message(FATAL_ERROR "Not supported")
 endfunction()
 
-# Eliminate $(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) from a path.
-#
-# We do not support compiling llvm with an Xcode setting beyond the one that was
-# used with build-script. This allows us to remove those paths. Right now,
-# nothing here is tested for cross compiling with Xcode, but it is in principal
-# possible.
-function(escape_llvm_path_for_xcode path outvar)
-  # First check if we are using Xcode. If not, return early.
+function(escape_path_for_xcode config path result_var_name)
+  # If we are not using the Xcode generator, be defensive and early exit.
   if (NOT XCODE)
-    set(${outvar} "${path}" PARENT_SCOPE)
+    set(${result_var_name} "${path}" PARENT_SCOPE)
     return()
   endif()
 
   get_effective_platform_for_triple("${SWIFT_HOST_TRIPLE}" SWIFT_EFFECTIVE_PLATFORM_NAME)
-  string(REPLACE "$(CONFIGURATION)" "${LLVM_BUILD_TYPE}" path "${path}")
-  string(REPLACE "$(EFFECTIVE_PLATFORM_NAME)" "${SWIFT_EFFECTIVE_PLATFORM_NAME}" path "${path}")
-  set(${outvar} "${path}" PARENT_SCOPE)
+  # Hack to deal with the fact that paths contain the build-time
+  # variables. Note that this fix is Xcode-specific.
+  string(REPLACE "$(CONFIGURATION)" "${config}" result "${path}")
+  string(REPLACE "$(EFFECTIVE_PLATFORM_NAME)" "${SWIFT_EFFECTIVE_PLATFORM_NAME}" result "${result}")
+  set("${result_var_name}" "${result}" PARENT_SCOPE)
 endfunction()
 
 function(get_imported_library_prefix outvar target prefix)