mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-02 04:19:00 +08:00
d6285bc24b
* [expat] Update the version to 2.2.9(support uwp) * [readosm] Fix expat.lib cannot be found * Remove expat:arm-uwp and expat:x64-uwp from fail list in ci.baseline.txt * [apr-util,io2d,skia] Fix expat cannot be found and also update expat * [many ports] Add supports and fix the regressions * Fix new regressions * Fix typo * [io2d] Update expat patch * [io2d,libkml,skia] Fix expat cannot find and also fix typo * [expat] Remove usage * [libkml,vtk] Update expat patch and fix static build * [wxwidgets] Fix static build caused by expat cannot found * Update as review suggestion * Add Port-Version * Remove evpp:x64-osx=fail from ci.baseline.txt * [wxwidgest] Remove unnecessary spaces * [itk] Fix expat cannot be found * fix cmake test port * [wxwidgets] Update Port-Version Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
25 lines
835 B
Diff
25 lines
835 B
Diff
diff --git a/build/cmake/lib/expat.cmake b/build/cmake/lib/expat.cmake
|
|
index 1d2b79b..04bef93 100644
|
|
--- a/build/cmake/lib/expat.cmake
|
|
+++ b/build/cmake/lib/expat.cmake
|
|
@@ -7,14 +7,9 @@
|
|
# Licence: wxWindows licence
|
|
#############################################################################
|
|
|
|
-if(wxUSE_EXPAT STREQUAL "builtin")
|
|
- wx_add_builtin_library(wxexpat
|
|
- src/expat/expat/lib/xmlparse.c
|
|
- src/expat/expat/lib/xmlrole.c
|
|
- src/expat/expat/lib/xmltok.c
|
|
- )
|
|
- set(EXPAT_LIBRARIES wxexpat)
|
|
- set(EXPAT_INCLUDE_DIRS ${wxSOURCE_DIR}/src/expat/expat/lib)
|
|
-elseif(wxUSE_EXPAT)
|
|
- find_package(EXPAT REQUIRED)
|
|
+find_package(expat CONFIG REQUIRED)
|
|
+if(WIN32 AND NOT MINGW)
|
|
+ set(EXPAT_LIBRARIES expat::libexpat)
|
|
+else()
|
|
+ set(EXPAT_LIBRARIES expat::expat)
|
|
endif()
|