diff options
| author | John Spaith <jspaith@windows.microsoft.com> | 2019-10-10 09:36:18 -0700 |
|---|---|---|
| committer | John Spaith <jspaith@windows.microsoft.com> | 2019-10-10 09:36:18 -0700 |
| commit | 17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1 (patch) | |
| tree | 7baa6f699aa57601dbba4ace876fad45958878fc /ports/plplot | |
| parent | 1d4189d1dde0fa8bbcbc6237cc33b85bca0512e1 (diff) | |
| parent | 2b049c47b5b2e003f8bcfe6707d4b0eaf8d1b569 (diff) | |
| download | vcpkg-17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1.tar.gz vcpkg-17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1.zip | |
Merge from master
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)
|