@@ -970,6 +970,7 @@ jobs:
970
970
-D CMAKE_Swift_COMPILER_WORKS=YES `
971
971
-D CMAKE_Swift_FLAGS="-sdk `"${SDKROOT}`" -Xcc -D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH" `
972
972
-D CMAKE_EXE_LINKER_FLAGS="${{ inputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}" `
973
+ -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=YES `
973
974
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr `
974
975
-D CMAKE_SHARED_LINKER_FLAGS="${{ inputs.WINDOWS_CMAKE_SHARED_LINKER_FLAGS }}" `
975
976
${CMAKE_SYSTEM_NAME} `
@@ -1004,8 +1005,7 @@ jobs:
1004
1005
-D CLANG_VENDOR=compnerd.org `
1005
1006
-D CLANG_VENDOR_UTI=org.compnerd.dt `
1006
1007
-D cmark-gfm_DIR=${{ github.workspace }}/BinaryCache/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr/lib/cmake `
1007
- -D LIBXML2_INCLUDE_DIR=${{ github.workspace }}/BinaryCache/Library/libxml2-${{ inputs.libxml2_version }}/usr/include/libxml2 `
1008
- -D LIBXML2_LIBRARY=${{ github.workspace }}/BinaryCache/Library/libxml2-${{ inputs.libxml2_version }}/usr/lib/libxml2s.lib `
1008
+ -D LibXml2_DIR=${{ github.workspace }}/BinaryCache/Library/libxml2-${{ inputs.libxml2_version }}/usr/lib/Windows/${{ matrix.cpu }}/cmake/libxml2-${{ inputs.libxml2_version }} `
1009
1009
-D PACKAGE_VENDOR=compnerd.org `
1010
1010
-D SWIFT_VENDOR=compnerd.org `
1011
1011
-D LLVM_PARALLEL_LINK_JOBS=2 `
@@ -2155,6 +2155,7 @@ jobs:
2155
2155
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
2156
2156
-D CMAKE_CXX_FLAGS="${{ matrix.cxxflags }}" `
2157
2157
-D CMAKE_EXE_LINKER_FLAGS="${{ inputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}" `
2158
+ -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=YES `
2158
2159
-D CMAKE_MT=mt `
2159
2160
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/${{ matrix.os }}.platform/Developer/SDKs/${{ matrix.os }}.sdk/usr `
2160
2161
-D CMAKE_Swift_COMPILER=${SWIFTC} `
@@ -2179,9 +2180,7 @@ jobs:
2179
2180
-D _SwiftFoundation_SourceDIR=$SWIFT_FOUNDATION_SOURCE_DIR `
2180
2181
-D _SwiftFoundationICU_SourceDIR=$SWIFT_FOUNDATION_ICU_SOURCE_DIR `
2181
2182
-D _SwiftCollections_SourceDIR=$SWIFT_COLLECTIONS_SOURCE_DIR `
2182
- -D LIBXML2_DEFINITIONS="${DEFINITION_FLAG}LIBXML_STATIC" `
2183
- -D LIBXML2_INCLUDE_DIR=${{ github.workspace }}/BuildRoot/Library/libxml2-${{ inputs.libxml2_version }}/usr/include/libxml2 `
2184
- -D LIBXML2_LIBRARY=${{ github.workspace }}/BuildRoot/Library/libxml2-${{ inputs.libxml2_version }}/usr/lib/$LIBXML `
2183
+ -D LibXml2_DIR=${{ github.workspace }}/BuildRoot/Library/libxml2-${{ inputs.libxml2_version }}/usr/lib/Windows/${{ matrix.cpu }}/cmake/libxml2-${{ inputs.libxml2_version }} `
2185
2184
-D ZLIB_ROOT=${{ github.workspace }}/BuildRoot/Library/zlib-${{ inputs.zlib_version }}/usr `
2186
2185
-D ZLIB_LIBRARY=${{ github.workspace }}/BuildRoot/Library/zlib-${{ inputs.zlib_version }}/usr/lib/$LIBZ `
2187
2186
-D SwiftFoundation_MACRO=${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin
0 commit comments