mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-10 07:59:02 +08:00
88b3aedb3b
* Revert "[wxwidgets] Remove debug asserts from Release build. (#25240)"
This reverts commit 6e16931acd
.
* Update to 3.1.7
* Update installation layout
* Upstream CMake export is not ready for use
* Update versions
* Remove obsolete patch
* Use msvc layout for mingw on windows
* Add debug-support feature
* Update versions
* Fix condition
* Update versions
* Restore symlink patch
* Update versions
* Remove trace option from test port
* Enable testing without feature debug-support
* Fixup defaults for using without debug support
* Expect wxrc-3.1 for mingw cross builds ("unix" layout)
* Update versions
30 lines
1.4 KiB
Diff
30 lines
1.4 KiB
Diff
diff --git a/build/cmake/lib/nanosvg.cmake b/build/cmake/lib/nanosvg.cmake
|
|
index 401bf48..b9e4b57 100644
|
|
--- a/build/cmake/lib/nanosvg.cmake
|
|
+++ b/build/cmake/lib/nanosvg.cmake
|
|
@@ -16,9 +16,9 @@ elseif(wxUSE_NANOSVG)
|
|
set(NANOSVG_INCLUDE_DIRS )
|
|
set(wxUSE_NANOSVG_EXTERNAL_ENABLE_IMPL TRUE)
|
|
|
|
- find_package(NanoSVG REQUIRED)
|
|
+ find_package(unofficial-nanosvg CONFIG REQUIRED)
|
|
|
|
- foreach(TARGETNAME NanoSVG::nanosvg NanoSVG::nanosvgrast unofficial::nanosvg)
|
|
+ foreach(TARGETNAME unofficial::nanosvg::nanosvg)
|
|
if(NOT TARGET ${TARGETNAME})
|
|
continue()
|
|
endif()
|
|
diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake
|
|
index 49c536a..5630526 100644
|
|
--- a/build/cmake/options.cmake
|
|
+++ b/build/cmake/options.cmake
|
|
@@ -114,7 +114,7 @@ wx_add_thirdparty_library(wxUSE_EXPAT EXPAT "use expat for XML parsing" DEFAULT_
|
|
wx_add_thirdparty_library(wxUSE_LIBJPEG JPEG "use libjpeg (JPEG file format)")
|
|
wx_add_thirdparty_library(wxUSE_LIBPNG PNG "use libpng (PNG image format)")
|
|
wx_add_thirdparty_library(wxUSE_LIBTIFF TIFF "use libtiff (TIFF file format)")
|
|
-wx_add_thirdparty_library(wxUSE_NANOSVG NanoSVG "use NanoSVG for rasterizing SVG")
|
|
+wx_add_thirdparty_library(wxUSE_NANOSVG unofficial-nanosvg "use NanoSVG for rasterizing SVG")
|
|
|
|
wx_option(wxUSE_LIBLZMA "use LZMA compression" OFF)
|
|
set(wxTHIRD_PARTY_LIBRARIES ${wxTHIRD_PARTY_LIBRARIES} wxUSE_LIBLZMA "use liblzma for LZMA compression")
|