build: reorder SDK configuration messages (NFC)

This just reorders the printed order of the messages to be grouped
better.  This will be further augmented in the next set of changes which
improve the cross-compilation setup that we have currently to allow for
foreign environments better.

Author: compnerd

cmake/modules/SwiftConfigureSDK.cmake

@@ -11,16 +11,35 @@ include(SwiftAndroidSupport)
 # Report the given SDK to the user.
 function(_report_sdk prefix)
   message(STATUS "${SWIFT_SDK_${prefix}_NAME} SDK:")
+  message(STATUS "  Object File Format: ${SWIFT_SDK_${prefix}_OBJECT_FORMAT}")
+  message(STATUS "  Swift Standard Library Path: ${SWIFT_SDK_${prefix}_LIB_SUBDIR}")
+
   if("${prefix}" STREQUAL "WINDOWS")
     message(STATUS "  UCRT Version: ${UCRTVersion}")
-    message(STATUS "  UCRT SDK Dir: ${UniversalCRTSdkDir}")
-    message(STATUS "  VC Dir: ${VCToolsInstallDir}")
+    message(STATUS "  UCRT SDK Path: ${UniversalCRTSdkDir}")
+    message(STATUS "  VC Path: ${VCToolsInstallDir}")
     if("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
       message(STATUS "  ${CMAKE_BUILD_TYPE} VC++ CRT: MDd")
     else()
       message(STATUS "  ${CMAKE_BUILD_TYPE} VC++ CRT: MD")
     endif()
+  endif()
+  if(prefix IN_LIST SWIFT_APPLE_PLATFORMS)
+    message(STATUS "  Version: ${SWIFT_SDK_${prefix}_VERSION}")
+    message(STATUS "  Build number: ${SWIFT_SDK_${prefix}_BUILD_NUMBER}")
+    message(STATUS "  Deployment version: ${SWIFT_SDK_${prefix}_DEPLOYMENT_VERSION}")
+    message(STATUS "  Version min name: ${SWIFT_SDK_${prefix}_VERSION_MIN_NAME}")
+    message(STATUS "  Triple name: ${SWIFT_SDK_${prefix}_TRIPLE_NAME}")
+  endif()
+  if(SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES)
+    message(STATUS "  Module Architectures: ${SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES}")
+  endif()
 
+  message(STATUS "  Architectures: ${SWIFT_SDK_${prefix}_ARCHITECTURES}")
+  foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
+    message(STATUS "  ${arch} triple: ${SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE}")
+  endforeach()
+  if("${prefix}" STREQUAL "WINDOWS")
     foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
       swift_windows_include_for_arch(${arch} ${arch}_INCLUDE)
       swift_windows_lib_for_arch(${arch} ${arch}_LIB)
@@ -40,36 +59,17 @@ function(_report_sdk prefix)
       message(STATUS "  ${arch} Path: ${SWIFT_SDK_${prefix}_ARCH_${arch}_PATH}")
     endforeach()
   endif()
-  if(prefix IN_LIST SWIFT_APPLE_PLATFORMS)
-    message(STATUS "  Version: ${SWIFT_SDK_${prefix}_VERSION}")
-    message(STATUS "  Build number: ${SWIFT_SDK_${prefix}_BUILD_NUMBER}")
-    message(STATUS "  Deployment version: ${SWIFT_SDK_${prefix}_DEPLOYMENT_VERSION}")
-  endif()
-  message(STATUS "  Library subdir: ${SWIFT_SDK_${prefix}_LIB_SUBDIR}")
-  if(prefix IN_LIST SWIFT_APPLE_PLATFORMS)
-    message(STATUS "  Version min name: ${SWIFT_SDK_${prefix}_VERSION_MIN_NAME}")
-    message(STATUS "  Triple name: ${SWIFT_SDK_${prefix}_TRIPLE_NAME}")
-  endif()
-  message(STATUS "  Architectures: ${SWIFT_SDK_${prefix}_ARCHITECTURES}")
-  if(SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES)
-    message(STATUS "  Module Architectures: ${SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES}")
-  endif()
+
   if(NOT prefix IN_LIST SWIFT_APPLE_PLATFORMS)
     if(SWIFT_BUILD_STDLIB)
       foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
-        message(STATUS "  ICU i18n INCLUDE (${arch}): ${SWIFT_${prefix}_${arch}_ICU_I18N_INCLUDE}")
-        message(STATUS "  ICU i18n LIB (${arch}): ${SWIFT_${prefix}_${arch}_ICU_I18N}")
-        message(STATUS "  ICU unicode INCLUDE (${arch}): ${SWIFT_${prefix}_${arch}_ICU_UC_INCLUDE}")
-        message(STATUS "  ICU unicode LIB (${arch}): ${SWIFT_${prefix}_${arch}_ICU_UC}")
+        message(STATUS "  ${arch} ICU i18n INCLUDE: ${SWIFT_${prefix}_${arch}_ICU_I18N_INCLUDE}")
+        message(STATUS "  ${arch} ICU i18n LIB: ${SWIFT_${prefix}_${arch}_ICU_I18N}")
+        message(STATUS "  ${arch} ICU unicode INCLUDE: ${SWIFT_${prefix}_${arch}_ICU_UC_INCLUDE}")
+        message(STATUS "  ${arch} ICU unicode LIB: ${SWIFT_${prefix}_${arch}_ICU_UC}")
       endforeach()
     endif()
   endif()
-  message(STATUS "  Object Format: ${SWIFT_SDK_${prefix}_OBJECT_FORMAT}")
-
-  foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
-    message(STATUS
-        "  Triple for ${arch} is ${SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE}")
-  endforeach()
 
   message(STATUS "")
 endfunction()