diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-01-16 08:37:07 +0800 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2020-01-15 16:37:07 -0800 |
| commit | ed2d8564f0822115695a024f4e8ece2944e8bb4e (patch) | |
| tree | 8d9bb25bf128453cfc49631107c3c1d0e6148f0e /ports/plplot/portfile.cmake | |
| parent | 41fdef7a168e80cd1a381870727f688c37cc9c0a (diff) | |
| download | vcpkg-ed2d8564f0822115695a024f4e8ece2944e8bb4e.tar.gz vcpkg-ed2d8564f0822115695a024f4e8ece2944e8bb4e.zip | |
[plplot] fix static build issue (#8817)
Diffstat (limited to 'ports/plplot/portfile.cmake')
| -rw-r--r-- | ports/plplot/portfile.cmake | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/ports/plplot/portfile.cmake b/ports/plplot/portfile.cmake index 46781da07..0bffd25aa 100644 --- a/ports/plplot/portfile.cmake +++ b/ports/plplot/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
set(PLPLOT_VERSION 5.13.0)
set(PLPLOT_HASH 1d5cb5da17d4bde6d675585bff1f8dcb581719249a0b2687867e767703f8dab0870e7ea44b9549a497f4ac0141a3cabf6761c49520c0e2b26ffe581468512cbb)
@@ -14,11 +12,11 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE}
REF ${PLPLOT_VERSION}
PATCHES
- "${CMAKE_CURRENT_LIST_DIR}/0001-findwxwidgets-fixes.patch"
- "${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"
+ 0001-findwxwidgets-fixes.patch
+ 0002-wxwidgets-dev-fixes.patch
+ install-interface-include-directories.patch
+ use-math-h-nan.patch
+ fix_utils.patch
)
set(BUILD_with_wxwidgets OFF)
@@ -53,8 +51,8 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/plplot) file(REMOVE
${CURRENT_PACKAGES_DIR}/debug/bin/pltek.exe
${CURRENT_PACKAGES_DIR}/bin/pltek.exe
- ${CURRENT_PACKAGES_DIR}/debug/bin/wxPLViewer.exe
- ${CURRENT_PACKAGES_DIR}/bin/wxPLViewer.exe
+ ${CURRENT_PACKAGES_DIR}/debug/bin/wxPLViewer.exe
+ ${CURRENT_PACKAGES_DIR}/bin/wxPLViewer.exe
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -66,18 +64,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif()
# Remove unwanted and duplicate directories
-file(REMOVE_RECURSE
- ${CURRENT_PACKAGES_DIR}/debug/include
-)
-
-file(INSTALL
- ${SOURCE_PATH}/Copyright
- DESTINATION ${CURRENT_PACKAGES_DIR}/share/plplot
- RENAME copyright
-)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
vcpkg_copy_pdbs()
-
-file(REMOVE_RECURSE
- ${CURRENT_PACKAGES_DIR}/debug/share
-)
+file(INSTALL ${SOURCE_PATH}/Copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/plplot RENAME copyright)
\ No newline at end of file |