[cmake] Update SwiftSupport.cmake to match Foundations's

Also, pass the explicit target to the Swift library creation, so one can
cross compile.

Author: drodriguez

CMakeLists.txt

@@ -88,6 +88,8 @@ add_swift_library(XCTest
                     Sources/XCTest/Public/Asynchronous/XCTWaiter.swift
                     Sources/XCTest/Public/Asynchronous/XCTestCase+Asynchronous.swift
                     Sources/XCTest/Public/Asynchronous/XCTestExpectation.swift
+                  TARGET
+                    ${CMAKE_C_COMPILER_TARGET}
                   SWIFT_FLAGS
                     $<$<NOT:$<CONFIG:Debug>>:-O>
 

cmake/modules/SwiftSupport.cmake

@@ -1,5 +1,37 @@
 
 include(CMakeParseArguments)
+include(ProcessorCount)
+
+# Creates an output file map give a target and its list of sources at
+# output_path
+#
+# Usage:
+#   create_output_file_map(target sources output_path)
+function(create_output_file_map target sources output_path)
+  set(output_list)
+  set(output_file_map "{\n")
+  foreach(source ${sources})
+    get_filename_component(name ${source} NAME)
+
+    set(obj ${CMAKE_CURRENT_BINARY_DIR}/${target}.dir/${name}${CMAKE_C_OUTPUT_EXTENSION})
+    set(deps ${CMAKE_CURRENT_BINARY_DIR}/${target}.dir/${name}.d)
+    set(swiftdeps ${CMAKE_CURRENT_BINARY_DIR}/${target}.dir/${name}.swiftdeps)
+    set(dia ${CMAKE_CURRENT_BINARY_DIR}/${target}.dir/${name}.dia)
+    set(output_entry "\"${source}\": {\n\
+    \"object\": \"${obj}\",\n\
+    \"dependencies\": \"${deps}\",\n\
+    \"swift-dependencies\": \"${swiftdeps}\",\n\
+    \"diagnostics\": \"${dia}\"\n\
+},\n")
+    string(APPEND output_file_map ${output_entry})
+  endforeach()
+  set(master_deps ${CMAKE_CURRENT_BINARY_DIR}/${target}.swiftdeps)
+  string(APPEND output_file_map "\"\": {\n\
+  \"swift-dependencies\": \"${master_deps}\"\n\
+  }\n")
+  string(APPEND output_file_map "}\n")
+  file(WRITE ${output_path} ${output_file_map})
+endfunction()
 
 function(add_swift_target target)
   set(options LIBRARY;SHARED;STATIC)
@@ -9,8 +41,13 @@ function(add_swift_target target)
   cmake_parse_arguments(AST "${options}" "${single_value_options}" "${multiple_value_options}" ${ARGN})
 
   set(compile_flags ${CMAKE_SWIFT_FLAGS})
-  set(link_flags)
+  set(link_flags ${CMAKE_SWIFT_LINK_FLAGS})
 
+  list(APPEND compile_flags -incremental)
+  ProcessorCount(CPU_COUNT)
+  if(NOT CPU_COUNT EQUAL 0)
+    list(APPEND compile_flags -j;${CPU_COUNT})
+  endif()
   if(AST_TARGET)
     list(APPEND compile_flags -target;${AST_TARGET})
     list(APPEND link_flags -target;${AST_TARGET})
@@ -26,6 +63,11 @@ function(add_swift_target target)
   if(AST_MODULE_CACHE_PATH)
     list(APPEND compile_flags -module-cache-path;${AST_MODULE_CACHE_PATH})
   endif()
+  if(AST_MODULE_PATH)
+      get_filename_component(module_location ${AST_MODULE_PATH} PATH)
+      file(MAKE_DIRECTORY "${module_location}")
+      list(APPEND compile_flags "-emit-module-path;${AST_MODULE_PATH}")
+  endif()
   if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
     list(APPEND compile_flags -g)
   endif()
@@ -75,82 +117,45 @@ function(add_swift_target target)
   endif()
 
   set(sources)
+  set(rsp_text)
   foreach(source ${AST_SOURCES})
     get_filename_component(location ${source} PATH)
     if(IS_ABSOLUTE ${location})
       list(APPEND sources ${source})
+      string(APPEND rsp_text "${source} ")
     else()
       list(APPEND sources ${CMAKE_CURRENT_SOURCE_DIR}/${source})
+      string(APPEND rsp_text "${CMAKE_CURRENT_SOURCE_DIR}/${source} ")
     endif()
   endforeach()
 
-  set(objs)
-  set(mods)
-  set(docs)
-  set(i 0)
-  foreach(source ${sources})
-    get_filename_component(name ${source} NAME)
-
-    set(obj ${CMAKE_CURRENT_BINARY_DIR}/${target}.dir/${name}${CMAKE_C_OUTPUT_EXTENSION})
-    set(mod ${CMAKE_CURRENT_BINARY_DIR}/${target}.dir/${name}.swiftmodule)
-    set(doc ${CMAKE_CURRENT_BINARY_DIR}/${target}.dir/${name}.swiftdoc)
-
-    set(all_sources ${sources})
-    list(INSERT all_sources ${i} -primary-file)
-
-    add_custom_command(OUTPUT
-                         ${obj}
-                         ${mod}
-                         ${doc}
-                       DEPENDS
-                         ${source}
-                         ${AST_DEPENDS}
-                       COMMAND
-                         ${CMAKE_SWIFT_COMPILER} -frontend ${compile_flags} -emit-module-path ${mod} -emit-module-doc-path ${doc} -o ${obj} -c ${all_sources})
-
-    list(APPEND objs ${obj})
-    list(APPEND mods ${mod})
-    list(APPEND docs ${doc})
+  set(output_map_path ${CMAKE_CURRENT_BINARY_DIR}/${target}.dir/output-file-map.json)
+  create_output_file_map(${target} "${sources}" ${output_map_path})
+  list(APPEND compile_flags -output-file-map;${output_map_path})
 
-    math(EXPR i "${i}+1")
-  endforeach()
+  string(LENGTH sources source_length)
+  set(rsp_file ${CMAKE_CURRENT_BINARY_DIR}/${target}.dir/${target}.rsp)
+  file(WRITE ${rsp_file} ${rsp_text})
 
   if(AST_LIBRARY)
-    get_filename_component(module_directory ${AST_MODULE_PATH} DIRECTORY)
-
-    set(module ${AST_MODULE_PATH})
-    set(documentation ${module_directory}/${AST_MODULE_NAME}.swiftdoc)
-
-    add_custom_command(OUTPUT
-                         ${module}
-                         ${documentation}
-                       DEPENDS
-                         ${mods}
-                         ${docs}
-                         ${AST_DEPENDS}
-                       COMMAND
-                         ${CMAKE_SWIFT_COMPILER} -frontend ${compile_flags} -sil-merge-partial-modules -emit-module ${mods} -o ${module} -emit-module-doc-path ${documentation})
-  endif()
-
-  if(AST_LIBRARY)
-    set(emit_library -emit-library)
+      set(emit_library -emit-library)
   endif()
   if(NOT AST_LIBRARY OR library_kind STREQUAL SHARED)
     add_custom_command(OUTPUT
                          ${AST_OUTPUT}
                        DEPENDS
-                         ${objs}
+                         ${sources}
                          ${AST_DEPENDS}
                        COMMAND
-                         ${CMAKE_SWIFT_COMPILER} ${emit_library} ${link_flags} -o ${AST_OUTPUT} ${objs})
+                         ${CMAKE_SWIFT_COMPILER} ${emit_library} ${compile_flags} ${link_flags} -o ${AST_OUTPUT} @${rsp_file})
     add_custom_target(${target}
                       ALL
                       DEPENDS
                          ${AST_OUTPUT}
                          ${module}
                          ${documentation})
   else()
-    add_library(${target}-static STATIC ${objs})
+    add_library(${target}-static STATIC ${sources})
     if(AST_DEPENDS)
       add_dependencies(${target}-static ${AST_DEPENDS})
     endif()
@@ -177,6 +182,11 @@ function(add_swift_target target)
   endif()
 
   if(AST_RESOURCES)
+    if(CMAKE_SYSTEM_NAME STREQUAL Windows)
+      set(resources_dir ${target}.resources)
+    else()
+      set(resources_dir Resources)
+    endif()
     add_custom_command(TARGET
                          ${target}
                        POST_BUILD
@@ -185,13 +195,22 @@ function(add_swift_target target)
                        COMMAND
                          ${CMAKE_COMMAND} -E copy ${AST_OUTPUT} ${CMAKE_CURRENT_BINARY_DIR}/${target}
                        COMMAND
-                         ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${target}/Resources)
+                         ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${target}/${resources_dir})
     foreach(resource ${AST_RESOURCES})
-      add_custom_command(TARGET
-                           ${target}
-                         POST_BUILD
-                         COMMAND
-                           ${CMAKE_COMMAND} -E copy ${resource} ${CMAKE_CURRENT_BINARY_DIR}/${target}/Resources/)
+      if(IS_DIRECTORY ${resource})
+        get_filename_component(resource_basename ${resource} NAME)
+        add_custom_command(TARGET
+                             ${target}
+                           POST_BUILD
+                           COMMAND
+                             ${CMAKE_COMMAND} -E copy_directory ${resource} ${CMAKE_CURRENT_BINARY_DIR}/${target}/${resources_dir}/${resource_basename})
+      else()
+        add_custom_command(TARGET
+                             ${target}
+                           POST_BUILD
+                           COMMAND
+                             ${CMAKE_COMMAND} -E copy ${resource} ${CMAKE_CURRENT_BINARY_DIR}/${target}/${resources_dir}/)
+      endif()
     endforeach()
   else()
     add_custom_command(TARGET
@@ -219,7 +238,7 @@ function(add_swift_executable executable)
   add_swift_target(${executable} ${ARGN})
 endfunction()
 
-# Returns the current achitecture name in a variable
+# Returns the current architecture name in a variable
 #
 # Usage:
 #   get_swift_host_arch(result_var_name)
@@ -241,6 +260,8 @@ function(get_swift_host_arch result_var_name)
     set("${result_var_name}" "armv6" PARENT_SCOPE)
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")
     set("${result_var_name}" "armv7" PARENT_SCOPE)
+  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7-a")
+    set("${result_var_name}" "armv7" PARENT_SCOPE)
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
     set("${result_var_name}" "x86_64" PARENT_SCOPE)
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "IA64")