Foundation: restructure Foundation

Author: compnerd

CMakeLists.txt

@@ -22,6 +22,7 @@ if(CMAKE_VERSION VERSION_LESS 3.16.0)
     set(CMAKE_SHARED_LIBRARY_RUNTIME_Swift_FLAG "-Xlinker -rpath -Xlinker ")
     set(CMAKE_SHARED_LIBRARY_RUNTIME_Swift_FLAG_SEP ":")
   endif()
+  set(CMAKE_LINK_LIBRARY_FLAG "-l")
 endif()
 
 option(BUILD_SHARED_LIBS "build shared libraries" ON)
@@ -45,7 +46,6 @@ target_include_directories(CoreFoundation PRIVATE
   ${CMAKE_CURRENT_BINARY_DIR}/CoreFoundation.framework/Headers)
 
 add_subdirectory(uuid)
-add_subdirectory(Foundation)
 add_subdirectory(Sources)
 add_subdirectory(Tools)
 if(ENABLE_TESTING)

Foundation.xcodeproj/project.pbxproj

@@ -1,2 +1,3 @@
+add_subdirectory(Foundation)
 add_subdirectory(FoundationNetworking)
 add_subdirectory(FoundationXML)

Sources/CMakeLists.txt

@@ -1,8 +1,3 @@
-
-if(CMAKE_VERSION VERSION_LESS 3.16)
-  set(CMAKE_LINK_LIBRARY_FLAG "-l")
-endif()
-
 add_library(Foundation
   AffineTransform.swift
   Array.swift
@@ -140,30 +135,29 @@ target_compile_definitions(Foundation PRIVATE
   DEPLOYMENT_RUNTIME_SWIFT)
 target_compile_options(Foundation PUBLIC
   "SHELL:-Xcc -F${CMAKE_BINARY_DIR}")
-if(CMAKE_SYSTEM_NAME STREQUAL Windows AND CMAKE_VERSION VERSION_LESS 3.16)
-  # Work around for CMake 15 which doesn't link in the resource file
-  # target properly
-  add_dependencies(Foundation CoreFoundationResources)
-  target_link_options(Foundation PRIVATE $<TARGET_OBJECTS:CoreFoundationResources>)
-endif()
-if(ENABLE_TESTING)
-  target_compile_options(Foundation PRIVATE
-    -enable-testing)
-endif()
+target_compile_options(Foundation PRIVATE
+  $<$<BOOL:${ENABLE_TESTING}>:-enable-testing>)
 target_link_libraries(Foundation PRIVATE
   CoreFoundation
   uuid)
 target_link_libraries(Foundation PUBLIC
   swiftDispatch)
-
 # TODO(compnerd) properly propogate `BUILD_RPATH` to the target using CMake
 if(NOT CMAKE_SYSTEM_NAME STREQUAL Windows AND NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
   target_link_options(Foundation PRIVATE
     "SHELL:-Xlinker -rpath -Xlinker $<TARGET_FILE_DIR:swiftDispatch>")
 endif()
 if(CMAKE_SYSTEM_NAME STREQUAL Windows)
-  target_link_libraries(Foundation PRIVATE
-    CoreFoundationResources)
+  if(CMAKE_VERSION VERSION_LESS 3.16)
+    # Work around for CMake 3.15 which doesn't link in the resource file
+    # target properly
+    add_dependencies(Foundation CoreFoundationResources)
+    target_link_options(Foundation PRIVATE
+      $<TARGET_OBJECTS:CoreFoundationResources>)
+  else()
+    target_link_libraries(Foundation PRIVATE
+      CoreFoundationResources)
+  endif()
   target_link_libraries(Foundation PRIVATE
     Ole32
     Shell32
@@ -174,15 +168,13 @@ set_target_properties(Foundation PROPERTIES
   Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/swift)
 
-
-set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS
-  Foundation)
-get_swift_host_arch(swift_arch)
+set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS Foundation)
 install(TARGETS Foundation
   ARCHIVE DESTINATION lib/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>
   LIBRARY DESTINATION lib/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>
   RUNTIME DESTINATION bin)
+get_swift_host_arch(swift_arch)
 install(FILES
-  ${CMAKE_BINARY_DIR}/swift/Foundation.swiftdoc
-  ${CMAKE_BINARY_DIR}/swift/Foundation.swiftmodule
+  $<TARGET_PROPERTY:Foundation,Swift_MODULE_DIRECTORY>/Foundation.swiftdoc
+  $<TARGET_PROPERTY:Foundation,Swift_MODULE_DIRECTORY>/Foundation.swiftmodule
   DESTINATION lib/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>/${swift_arch})

Foundation/AffineTransform.swift renamed to Sources/Foundation/AffineTransform.swift

@@ -5,7 +5,7 @@ add_executable(TestFoundation
   main.swift
   HTTPServer.swift
   FTPServer.swift
-  ../Foundation/ProgressFraction.swift
+  ../Sources/Foundation/ProgressFraction.swift
   Utilities.swift
   FixtureValues.swift)