Skip to content

Commit e6418f9

Browse files
committed
---
yaml --- r: 341245 b: refs/heads/rxwei-patch-1 c: 74e7ea3 h: refs/heads/master i: 341243: 4a2aa6b
1 parent 16a76ee commit e6418f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1191
-2281
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
10151015
refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
10161016
refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
10171017
refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
1018-
refs/heads/rxwei-patch-1: 4da49fcfeee3e33c6da14d94b7f7e2c5cec6d3f1
1018+
refs/heads/rxwei-patch-1: 74e7ea3a947b07c4c5a70744b50cfd68916f3613
10191019
refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
10201020
refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
10211021
refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/cmake/modules/SwiftConfigureSDK.cmake

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,35 @@ include(SwiftAndroidSupport)
1111
# Report the given SDK to the user.
1212
function(_report_sdk prefix)
1313
message(STATUS "${SWIFT_SDK_${prefix}_NAME} SDK:")
14+
message(STATUS " Object File Format: ${SWIFT_SDK_${prefix}_OBJECT_FORMAT}")
15+
message(STATUS " Swift Standard Library Path: ${SWIFT_SDK_${prefix}_LIB_SUBDIR}")
16+
1417
if("${prefix}" STREQUAL "WINDOWS")
1518
message(STATUS " UCRT Version: ${UCRTVersion}")
16-
message(STATUS " UCRT SDK Dir: ${UniversalCRTSdkDir}")
17-
message(STATUS " VC Dir: ${VCToolsInstallDir}")
19+
message(STATUS " UCRT SDK Path: ${UniversalCRTSdkDir}")
20+
message(STATUS " VC Path: ${VCToolsInstallDir}")
1821
if("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
1922
message(STATUS " ${CMAKE_BUILD_TYPE} VC++ CRT: MDd")
2023
else()
2124
message(STATUS " ${CMAKE_BUILD_TYPE} VC++ CRT: MD")
2225
endif()
26+
endif()
27+
if(prefix IN_LIST SWIFT_APPLE_PLATFORMS)
28+
message(STATUS " Version: ${SWIFT_SDK_${prefix}_VERSION}")
29+
message(STATUS " Build number: ${SWIFT_SDK_${prefix}_BUILD_NUMBER}")
30+
message(STATUS " Deployment version: ${SWIFT_SDK_${prefix}_DEPLOYMENT_VERSION}")
31+
message(STATUS " Version min name: ${SWIFT_SDK_${prefix}_VERSION_MIN_NAME}")
32+
message(STATUS " Triple name: ${SWIFT_SDK_${prefix}_TRIPLE_NAME}")
33+
endif()
34+
if(SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES)
35+
message(STATUS " Module Architectures: ${SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES}")
36+
endif()
2337

38+
message(STATUS " Architectures: ${SWIFT_SDK_${prefix}_ARCHITECTURES}")
39+
foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
40+
message(STATUS " ${arch} triple: ${SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE}")
41+
endforeach()
42+
if("${prefix}" STREQUAL "WINDOWS")
2443
foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
2544
swift_windows_include_for_arch(${arch} ${arch}_INCLUDE)
2645
swift_windows_lib_for_arch(${arch} ${arch}_LIB)
@@ -40,36 +59,17 @@ function(_report_sdk prefix)
4059
message(STATUS " ${arch} Path: ${SWIFT_SDK_${prefix}_ARCH_${arch}_PATH}")
4160
endforeach()
4261
endif()
43-
if(prefix IN_LIST SWIFT_APPLE_PLATFORMS)
44-
message(STATUS " Version: ${SWIFT_SDK_${prefix}_VERSION}")
45-
message(STATUS " Build number: ${SWIFT_SDK_${prefix}_BUILD_NUMBER}")
46-
message(STATUS " Deployment version: ${SWIFT_SDK_${prefix}_DEPLOYMENT_VERSION}")
47-
endif()
48-
message(STATUS " Library subdir: ${SWIFT_SDK_${prefix}_LIB_SUBDIR}")
49-
if(prefix IN_LIST SWIFT_APPLE_PLATFORMS)
50-
message(STATUS " Version min name: ${SWIFT_SDK_${prefix}_VERSION_MIN_NAME}")
51-
message(STATUS " Triple name: ${SWIFT_SDK_${prefix}_TRIPLE_NAME}")
52-
endif()
53-
message(STATUS " Architectures: ${SWIFT_SDK_${prefix}_ARCHITECTURES}")
54-
if(SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES)
55-
message(STATUS " Module Architectures: ${SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES}")
56-
endif()
62+
5763
if(NOT prefix IN_LIST SWIFT_APPLE_PLATFORMS)
5864
if(SWIFT_BUILD_STDLIB)
5965
foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
60-
message(STATUS " ICU i18n INCLUDE (${arch}): ${SWIFT_${prefix}_${arch}_ICU_I18N_INCLUDE}")
61-
message(STATUS " ICU i18n LIB (${arch}): ${SWIFT_${prefix}_${arch}_ICU_I18N}")
62-
message(STATUS " ICU unicode INCLUDE (${arch}): ${SWIFT_${prefix}_${arch}_ICU_UC_INCLUDE}")
63-
message(STATUS " ICU unicode LIB (${arch}): ${SWIFT_${prefix}_${arch}_ICU_UC}")
66+
message(STATUS " ${arch} ICU i18n INCLUDE: ${SWIFT_${prefix}_${arch}_ICU_I18N_INCLUDE}")
67+
message(STATUS " ${arch} ICU i18n LIB: ${SWIFT_${prefix}_${arch}_ICU_I18N}")
68+
message(STATUS " ${arch} ICU unicode INCLUDE: ${SWIFT_${prefix}_${arch}_ICU_UC_INCLUDE}")
69+
message(STATUS " ${arch} ICU unicode LIB: ${SWIFT_${prefix}_${arch}_ICU_UC}")
6470
endforeach()
6571
endif()
6672
endif()
67-
message(STATUS " Object Format: ${SWIFT_SDK_${prefix}_OBJECT_FORMAT}")
68-
69-
foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
70-
message(STATUS
71-
" Triple for ${arch} is ${SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE}")
72-
endforeach()
7373

7474
message(STATUS "")
7575
endfunction()

0 commit comments

Comments
 (0)