realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 18:23:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix FindwxWidgets.cmake on vcpkg so that it fully completes

Browse Source
This commit is contained in:
Marek Roszko 2020-10-14 19:16:03 -04:00
parent f59551d6ad
commit ff977b050a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeModules/FindwxWidgets.cmake
View File

@ -231,7 +231,11 @@ endif()
#===================================================================== #=====================================================================
if(wxWidgets_FIND_STYLE STREQUAL "win32") if(wxWidgets_FIND_STYLE STREQUAL "win32")
# Useful common wx libs needed by almost all components. # Useful common wx libs needed by almost all components.
if(VCPKG_TOOLCHAIN)
set(wxWidgets_COMMON_LIBRARIES libpng16 tiff jpeg zlib libexpat)
else()
set(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat) set(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
endif()
# DEPRECATED: Use find_package(wxWidgets COMPONENTS mono) instead. # DEPRECATED: Use find_package(wxWidgets COMPONENTS mono) instead.
if(NOT wxWidgets_FIND_COMPONENTS) if(NOT wxWidgets_FIND_COMPONENTS)
@ -282,6 +286,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
NAMES NAMES
wx${LIB}${_UCD}${_DBG} # for regex wx${LIB}${_UCD}${_DBG} # for regex
wx${LIB}${_DBG} wx${LIB}${_DBG}
${LIB}${_DBG} # vcpkg libraries aren't specific to wx
PATHS ${WX_LIB_DIR} PATHS ${WX_LIB_DIR}
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )