Merge pull request #5175 from modocache/cmake-reflection-test-macos-host-android

[stdlib] Only add Apple reflection test targets

Author: modocache

CMakeLists.txt

@@ -419,6 +419,12 @@ include_directories(BEFORE
 #  endif()
 set(SWIFT_DARWIN_VARIANTS "^(macosx|iphoneos|iphonesimulator|appletvos|appletvsimulator|watchos|watchsimulator)")
 
+# A convenient list to match Darwin SDKs. Example:
+#  if("${SWIFT_HOST_VARIANT_SDK}" IN_LIST SWIFT_APPLE_PLATFORMS)
+#    ...
+#  endif()
+set(SWIFT_APPLE_PLATFORMS "IOS" "IOS_SIMULATOR" "TVOS" "TVOS_SIMULATOR" "WATCHOS" "WATCHOS_SIMULATOR" "OSX")
+
 # Configuration flags passed to all of our invocations of gyb.  Try to
 # avoid making up new variable names here if you can find a CMake
 # variable that will do the job.

cmake/modules/AddSwift.cmake

@@ -1250,7 +1250,7 @@ function(add_swift_library name)
     set(SWIFTLIB_TARGET_SDKS ${SWIFT_SDKS})
   endif()
   list_replace(SWIFTLIB_TARGET_SDKS ALL_POSIX_PLATFORMS "ALL_APPLE_PLATFORMS;ANDROID;CYGWIN;FREEBSD;LINUX")
-  list_replace(SWIFTLIB_TARGET_SDKS ALL_APPLE_PLATFORMS "IOS;IOS_SIMULATOR;TVOS;TVOS_SIMULATOR;WATCHOS;WATCHOS_SIMULATOR;OSX")
+  list_replace(SWIFTLIB_TARGET_SDKS ALL_APPLE_PLATFORMS "${SWIFT_APPLE_PLATFORMS}")
 
   # All Swift code depends on the standard library, except for the standard
   # library itself.

stdlib/private/SwiftReflectionTest/CMakeLists.txt

@@ -3,14 +3,17 @@ if (SWIFT_INCLUDE_TESTS)
   add_swift_library(swiftSwiftReflectionTest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
     SwiftReflectionTest.swift
     SWIFT_MODULE_DEPENDS Darwin
+    TARGET_SDKS ALL_APPLE_PLATFORMS
     INSTALL_IN_COMPONENT stdlib-experimental)
 
   foreach(SDK ${SWIFT_SDKS})
-    foreach(ARCH ${SWIFT_SDK_${SDK}_ARCHITECTURES})
-      set(VARIANT_SUFFIX "-${SWIFT_SDK_${SDK}_LIB_SUBDIR}-${ARCH}")
-      add_dependencies(
-        "swiftSwiftReflectionTest${VARIANT_SUFFIX}"
-        "swift-reflection-test${VARIANT_SUFFIX}")
-    endforeach()
+    if("${SDK}" IN_LIST SWIFT_APPLE_PLATFORMS)
+      foreach(ARCH ${SWIFT_SDK_${SDK}_ARCHITECTURES})
+        set(VARIANT_SUFFIX "-${SWIFT_SDK_${SDK}_LIB_SUBDIR}-${ARCH}")
+        add_dependencies(
+          "swiftSwiftReflectionTest${VARIANT_SUFFIX}"
+          "swift-reflection-test${VARIANT_SUFFIX}")
+      endforeach()
+    endif()
   endforeach()
 endif()