Merge pull request #2394 from compnerd/swift-is-not-C

build: remove CFLAGS from `add_swift_library`

Author: compnerd

CMakeLists.txt

@@ -271,8 +271,6 @@ add_swift_library(Foundation
                     Foundation/XMLParser.swift
                   TARGET
                     ${CMAKE_C_COMPILER_TARGET}
-                  CFLAGS
-                    -F${CMAKE_CURRENT_BINARY_DIR}
                   LINK_FLAGS
                     ${CoreFoundation_LIBRARIES}
                     ${ICU_UC_LIBRARY} ${ICU_I18N_LIBRARY}
@@ -290,6 +288,7 @@ add_swift_library(Foundation
                     $<$<PLATFORM_ID:Windows>:-lpathcch>
                     $<$<PLATFORM_ID:Windows>:$<TARGET_OBJECTS:CoreFoundationResources>>
                   SWIFT_FLAGS
+                    -Xcc -F${CMAKE_CURRENT_BINARY_DIR}
                     -DDEPLOYMENT_RUNTIME_SWIFT
                     $<$<BOOL:FOUNDATION_ENABLE_LIBDISPATCH>:-DDEPLOYMENT_ENABLE_LIBDISPATCH>
                     -I;${ICU_INCLUDE_DIR}
@@ -341,9 +340,6 @@ add_swift_library(FoundationNetworking
                   Foundation/URLSession/URLSessionTask.swift
                   TARGET
                     ${CMAKE_C_COMPILER_TARGET}
-                  CFLAGS
-                    ${MSVCRT_C_FLAGS}
-                    -F${CMAKE_CURRENT_BINARY_DIR}
                   LINK_FLAGS
                     ${MSVCRT_LINK_FLAGS}
                     -L${CMAKE_CURRENT_BINARY_DIR}
@@ -358,6 +354,7 @@ add_swift_library(FoundationNetworking
                   SWIFT_FLAGS
                     -DDEPLOYMENT_RUNTIME_SWIFT
                     -DNS_BUILDING_FOUNDATION_NETWORKING
+                    -Xcc -F${CMAKE_CURRENT_BINARY_DIR}
                     ${deployment_enable_libdispatch}
                     -I;${CMAKE_CURRENT_BINARY_DIR}/swift
                     ${libdispatch_cflags}
@@ -388,15 +385,14 @@ add_swift_executable(plutil
                        Tools/plutil/main.swift
                      TARGET
                        ${CMAKE_C_COMPILER_TARGET}
-                     CFLAGS
-                       -F${CMAKE_CURRENT_BINARY_DIR}
                      LINK_FLAGS
                        ${libdispatch_ldflags}
                        -L${CMAKE_CURRENT_BINARY_DIR}
                        -lFoundation
                        ${Foundation_INTERFACE_LIBRARIES}
                        ${plutil_rpath}
                      SWIFT_FLAGS
+                       -Xcc -F${CMAKE_CURRENT_BINARY_DIR}
                        -DDEPLOYMENT_RUNTIME_SWIFT
                        -I;${CMAKE_CURRENT_BINARY_DIR}/swift
                        -I;${ICU_INCLUDE_DIR}
@@ -413,8 +409,6 @@ if(ENABLE_TESTING)
   add_swift_executable(xdgTestHelper
                        TARGET
                          ${CMAKE_C_COMPILER_TARGET}
-                       CFLAGS
-                         -F${CMAKE_CURRENT_BINARY_DIR}
                        LINK_FLAGS
                          ${libdispatch_ldflags}
                          -L${CMAKE_CURRENT_BINARY_DIR}
@@ -424,6 +418,7 @@ if(ENABLE_TESTING)
                        SOURCES
                          TestFoundation/xdgTestHelper/main.swift
                        SWIFT_FLAGS
+                         -Xcc -F${CMAKE_CURRENT_BINARY_DIR}
                          -I;${CMAKE_CURRENT_BINARY_DIR}/swift
                          -I;${ICU_INCLUDE_DIR}
                          ${libdispatch_cflags}
@@ -534,8 +529,6 @@ if(ENABLE_TESTING)
                          TestFoundation/TestXMLParser.swift
                        TARGET
                          ${CMAKE_C_COMPILER_TARGET}
-                       CFLAGS
-                         -F${CMAKE_CURRENT_BINARY_DIR}
                        LINK_FLAGS
                          ${libdispatch_ldflags}
                          -L${CMAKE_CURRENT_BINARY_DIR}
@@ -571,6 +564,7 @@ if(ENABLE_TESTING)
                          ${CMAKE_SOURCE_DIR}/TestFoundation/Resources/TestFileWithZeros.txt
                          ${CMAKE_SOURCE_DIR}/TestFoundation/Fixtures
                        SWIFT_FLAGS
+                         -Xcc -F${CMAKE_CURRENT_BINARY_DIR}
                          -I;${CMAKE_CURRENT_BINARY_DIR}/swift
                          -I;${FOUNDATION_PATH_TO_XCTEST_BUILD}/swift
                          -I;${ICU_INCLUDE_DIR}

cmake/modules/SwiftSupport.cmake

@@ -36,7 +36,7 @@ endfunction()
 function(add_swift_target target)
   set(options LIBRARY;SHARED;STATIC)
   set(single_value_options MODULE_NAME;MODULE_LINK_NAME;MODULE_PATH;MODULE_CACHE_PATH;OUTPUT;TARGET)
-  set(multiple_value_options CFLAGS;DEPENDS;LINK_FLAGS;RESOURCES;SOURCES;SWIFT_FLAGS)
+  set(multiple_value_options DEPENDS;LINK_FLAGS;RESOURCES;SOURCES;SWIFT_FLAGS)
 
   cmake_parse_arguments(AST "${options}" "${single_value_options}" "${multiple_value_options}" ${ARGN})
 
@@ -76,11 +76,6 @@ function(add_swift_target target)
       list(APPEND compile_flags ${flag})
     endforeach()
   endif()
-  if(AST_CFLAGS)
-    foreach(flag ${AST_CFLAGS})
-      list(APPEND compile_flags -Xcc;${flag})
-    endforeach()
-  endif()
   if(AST_LINK_FLAGS)
     foreach(flag ${AST_LINK_FLAGS})
       list(APPEND link_flags ${flag})