diff options
| author | zi-m <53815290+zi-m@users.noreply.github.com> | 2019-10-05 00:53:43 +0200 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-10-04 15:53:43 -0700 |
| commit | 47c6b3f557f305969bb271d10ad4b0b0d936ad23 (patch) | |
| tree | b20fbea5abcff0738b10cbeacbc456af7e9eb553 /ports/plplot | |
| parent | da233c38ec1ab90cbe9e440b82b055db02f83a62 (diff) | |
| download | vcpkg-47c6b3f557f305969bb271d10ad4b0b0d936ad23.tar.gz vcpkg-47c6b3f557f305969bb271d10ad4b0b0d936ad23.zip | |
fix find_package(wxWidgets) issue in release build (#8405)
Diffstat (limited to 'ports/plplot')
| -rw-r--r-- | ports/plplot/0005-wxwidgets-fix-rel-lib-dir.patch | 23 | ||||
| -rw-r--r-- | ports/plplot/CONTROL | 2 | ||||
| -rw-r--r-- | ports/plplot/portfile.cmake | 1 |
3 files changed, 25 insertions, 1 deletions
diff --git a/ports/plplot/0005-wxwidgets-fix-rel-lib-dir.patch b/ports/plplot/0005-wxwidgets-fix-rel-lib-dir.patch new file mode 100644 index 000000000..7ebe79f11 --- /dev/null +++ b/ports/plplot/0005-wxwidgets-fix-rel-lib-dir.patch @@ -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
diff --git a/ports/plplot/CONTROL b/ports/plplot/CONTROL index 71bdb1a51..b70c5d176 100644 --- a/ports/plplot/CONTROL +++ b/ports/plplot/CONTROL @@ -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.
diff --git a/ports/plplot/portfile.cmake b/ports/plplot/portfile.cmake index 1efd8f5a4..46781da07 100644 --- a/ports/plplot/portfile.cmake +++ b/ports/plplot/portfile.cmake @@ -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)
|