mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-05 06:57:25 +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>
21 lines
527 B
Diff
21 lines
527 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 9728ead..f9e8051 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -93,8 +93,13 @@ set(MINIZIP_DEPENDS "" CACHE INTERNAL "MINIZIP_DEPENDS")
|
|
|
|
set(LIBKML_TARGETS)
|
|
|
|
-find_package(EXPAT)
|
|
-if(EXPAT_FOUND)
|
|
+find_package(expat CONFIG REQUIRED)
|
|
+if(WIN32 AND NOT MINGW)
|
|
+ set(EXPAT_LIBRARY expat::libexpat)
|
|
+else()
|
|
+ set(EXPAT_LIBRARY expat::expat)
|
|
+endif()
|
|
+if(EXPAT_LIBRARY)
|
|
include_directories(${EXPAT_INCLUDE_DIR})
|
|
else()
|
|
include(External_expat)
|