Merge pull request #73870 from kubamracek/embedded-libraries-cmake

[embedded] Add a embedded-libraries CMake target to simplify the test dependencies

Author: kubamracek

stdlib/public/CMakeLists.txt

@@ -167,6 +167,10 @@ elseif(BOOTSTRAPPING_MODE STREQUAL "OFF")
   set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB FALSE)
 endif()
 
+if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
+  add_custom_target(embedded-libraries ALL)
+endif()
+
 set(EMBEDDED_STDLIB_TARGET_TRIPLES)
 
 if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB_CROSS_COMPILING)

stdlib/public/Concurrency/CMakeLists.txt

@@ -186,7 +186,8 @@ elseif(BOOTSTRAPPING_MODE STREQUAL "OFF")
   set(SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENCY FALSE)
 endif()
 if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENCY)
-  add_custom_target(embedded-concurrency ALL)
+  add_custom_target(embedded-concurrency)
+  add_dependencies(embedded-libraries embedded-concurrency)
 
   set(SWIFT_ENABLE_REFLECTION OFF)
   set(SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT OFF)

stdlib/public/Platform/CMakeLists.txt

@@ -81,7 +81,8 @@ add_swift_target_library(swiftDarwin ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
 if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
   set(SWIFT_ENABLE_REFLECTION OFF)
 
-  add_custom_target(embedded-darwin ALL)
+  add_custom_target(embedded-darwin)
+  add_dependencies(embedded-libraries embedded-darwin)
   foreach(entry ${EMBEDDED_STDLIB_TARGET_TRIPLES})
     string(REGEX REPLACE "[ \t]+" ";" list "${entry}")
     list(GET list 0 arch)

stdlib/public/Synchronization/CMakeLists.txt

@@ -134,7 +134,8 @@ add_swift_target_library(swiftSynchronization ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES
 # i.e. there is no .o or .a file produced (no binary code is actually produced)
 # and only users of a library are going to actually compile any needed code.
 if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
-  add_custom_target(embedded-synchronization ALL)
+  add_custom_target(embedded-synchronization)
+  add_dependencies(embedded-libraries embedded-synchronization)
 
   foreach(entry ${EMBEDDED_STDLIB_TARGET_TRIPLES})
     string(REGEX REPLACE "[ \t]+" ";" list "${entry}")

stdlib/public/Volatile/CMakeLists.txt

@@ -22,7 +22,8 @@ add_swift_target_library(swift_Volatile ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_S
 )
 
 if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
-  add_custom_target(embedded-volatile ALL)
+  add_custom_target(embedded-volatile)
+  add_dependencies(embedded-libraries embedded-volatile)
   foreach(entry ${EMBEDDED_STDLIB_TARGET_TRIPLES})
     string(REGEX REPLACE "[ \t]+" ";" list "${entry}")
     list(GET list 0 arch)

stdlib/public/core/CMakeLists.txt

@@ -413,7 +413,8 @@ add_swift_target_library(swiftCore
 # i.e. there is no .o or .a file produced (no binary code is actually produced)
 # and only users of a library are going to actually compile any needed code.
 if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
-  add_custom_target(embedded-stdlib ALL)
+  add_custom_target(embedded-stdlib)
+  add_dependencies(embedded-libraries embedded-stdlib)
 
   set(SWIFT_ENABLE_REFLECTION OFF)
   set(SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT OFF)

stdlib/public/stubs/Unicode/CMakeLists.txt

@@ -1,7 +1,8 @@
 
 # Embedded Swift Unicode library
 if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
-  add_custom_target(embedded-unicode ALL)
+  add_custom_target(embedded-unicode)
+  add_dependencies(embedded-libraries embedded-unicode)
 
   foreach(entry ${EMBEDDED_STDLIB_TARGET_TRIPLES})
     string(REGEX REPLACE "[ \t]+" ";" list "${entry}")

test/CMakeLists.txt

@@ -320,22 +320,8 @@ foreach(SDK ${SWIFT_SDKS})
         endif()
       endif()
 
-      if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
-        if(TARGET "embedded-stdlib")
-          list(APPEND test_dependencies "embedded-stdlib")
-        endif()
-       if(TARGET "embedded-darwin")
-          list(APPEND test_dependencies "embedded-darwin")
-        endif()
-        if(TARGET "embedded-concurrency")
-          list(APPEND test_dependencies "embedded-concurrency")
-        endif()
-        if(TARGET "embedded-synchronization")
-          list(APPEND test_dependencies "embedded-synchronization")
-        endif()
-        if(TARGET "embedded-volatile")
-          list(APPEND test_dependencies "embedded-volatile")
-        endif()
+      if(TARGET "embedded-libraries")
+        list(APPEND test_dependencies "embedded-libraries")
       endif()
 
       if(NOT "${COVERAGE_DB}" STREQUAL "")