cemu-project/vcpkg
1
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-17 10:07:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix find_package(wxWidgets) issue in release build (#8405)

Browse Source
This commit is contained in:
zi-m 2019-10-05 00:53:43 +02:00 committed by Victor Romero
parent da233c38ec
commit 47c6b3f557
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ports/plplot/0005-wxwidgets-fix-rel-lib-dir.patch Normal file
View File

@ -0,0 +1,23 @@
diff --git a/cmake/modules/FindwxWidgets.cmake b/cmake/modules/FindwxWidgets.cmake
index eaaa358..a68683c 100644
--- a/cmake/modules/FindwxWidgets.cmake
+++ b/cmake/modules/FindwxWidgets.cmake
@@ -516,13 +516,11 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
endif()
endif()
if(VCPKG_TARGET_TRIPLET)
- find_library(wxWidgets_LIB_DIR
- NAMES
- wxmsw31ud_core.lib
- wxmsw31u_core.lib
- PATHS
- DOC "Path to wxWidgets libraries"
- )
+ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+ find_library(wxWidgets_LIB_DIR NAMES wxmsw31ud_core.lib DOC "Path to wxWidgets libraries")
+ else()
+ find_library(wxWidgets_LIB_DIR NAMES wxmsw31u_core.lib DOC "Path to wxWidgets libraries")
+ endif()
get_filename_component(wxWidgets_LIB_DIR ${wxWidgets_LIB_DIR} DIRECTORY)
elseif(BUILD_SHARED_LIBS)
find_path(wxWidgets_LIB_DIR

2
ports/plplot/CONTROL
View File

@ -1,5 +1,5 @@
Source: plplot
Version: 5.13.0-2
Version: 5.13.0-3
Build-Depends: freetype, zlib, libpng, bzip2
Description: PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer.

1
ports/plplot/portfile.cmake
View File

@ -18,6 +18,7 @@ vcpkg_extract_source_archive_ex(
"${CMAKE_CURRENT_LIST_DIR}/0002-wxwidgets-dev-fixes.patch"
"${CMAKE_CURRENT_LIST_DIR}/install-interface-include-directories.patch"
"${CMAKE_CURRENT_LIST_DIR}/use-math-h-nan.patch"
"0005-wxwidgets-fix-rel-lib-dir.patch"
)
set(BUILD_with_wxwidgets OFF)