Skip to content

Commit 6225f98

Browse files
committed
GHA: adjust CMake invocation for libxml2 usage
Use the CMake CONFIG definitions to wire up LibXml2 rather than trying to manually add the dependencies.
1 parent 4d59da3 commit 6225f98

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -970,6 +970,7 @@ jobs:
970970
-D CMAKE_Swift_COMPILER_WORKS=YES `
971971
-D CMAKE_Swift_FLAGS="-sdk `"${SDKROOT}`" -Xcc -D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH" `
972972
-D CMAKE_EXE_LINKER_FLAGS="${{ inputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}" `
973+
-D CMAKE_FIND_PACKAGE_PREFER_CONFIG=YES `
973974
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr `
974975
-D CMAKE_SHARED_LINKER_FLAGS="${{ inputs.WINDOWS_CMAKE_SHARED_LINKER_FLAGS }}" `
975976
${CMAKE_SYSTEM_NAME} `
@@ -1004,8 +1005,7 @@ jobs:
10041005
-D CLANG_VENDOR=compnerd.org `
10051006
-D CLANG_VENDOR_UTI=org.compnerd.dt `
10061007
-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 }} `
10091009
-D PACKAGE_VENDOR=compnerd.org `
10101010
-D SWIFT_VENDOR=compnerd.org `
10111011
-D LLVM_PARALLEL_LINK_JOBS=2 `
@@ -2155,6 +2155,7 @@ jobs:
21552155
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
21562156
-D CMAKE_CXX_FLAGS="${{ matrix.cxxflags }}" `
21572157
-D CMAKE_EXE_LINKER_FLAGS="${{ inputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}" `
2158+
-D CMAKE_FIND_PACKAGE_PREFER_CONFIG=YES `
21582159
-D CMAKE_MT=mt `
21592160
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/${{ matrix.os }}.platform/Developer/SDKs/${{ matrix.os }}.sdk/usr `
21602161
-D CMAKE_Swift_COMPILER=${SWIFTC} `
@@ -2179,9 +2180,7 @@ jobs:
21792180
-D _SwiftFoundation_SourceDIR=$SWIFT_FOUNDATION_SOURCE_DIR `
21802181
-D _SwiftFoundationICU_SourceDIR=$SWIFT_FOUNDATION_ICU_SOURCE_DIR `
21812182
-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 }} `
21852184
-D ZLIB_ROOT=${{ github.workspace }}/BuildRoot/Library/zlib-${{ inputs.zlib_version }}/usr `
21862185
-D ZLIB_LIBRARY=${{ github.workspace }}/BuildRoot/Library/zlib-${{ inputs.zlib_version }}/usr/lib/$LIBZ `
21872186
-D SwiftFoundation_MACRO=${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin

0 commit comments

Comments
 (0)