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/fix_utils.patch | |
| parent | 41fdef7a168e80cd1a381870727f688c37cc9c0a (diff) | |
| download | vcpkg-ed2d8564f0822115695a024f4e8ece2944e8bb4e.tar.gz vcpkg-ed2d8564f0822115695a024f4e8ece2944e8bb4e.zip | |
[plplot] fix static build issue (#8817)
Diffstat (limited to 'ports/plplot/fix_utils.patch')
| -rw-r--r-- | ports/plplot/fix_utils.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/ports/plplot/fix_utils.patch b/ports/plplot/fix_utils.patch new file mode 100644 index 000000000..d1d8596d0 --- /dev/null +++ b/ports/plplot/fix_utils.patch @@ -0,0 +1,23 @@ +diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
+index 59cfe20..b936dad 100644
+--- a/utils/CMakeLists.txt
++++ b/utils/CMakeLists.txt
+@@ -75,7 +75,8 @@ add_executable(parity_bit_check parity_bit_check.c)
+ if(ENABLE_wxwidgets AND NOT OLD_WXWIDGETS)
+ # Build wxwidgets applications with same wxwidgets compile and link flags
+ # as used with the PLplot wxwidgets device driver.
+-
++ find_package(JPEG REQUIRED)
++ find_package(TIFF REQUIRED)
+ set(wxPLViewer_SRCS wxplviewer.cpp wxplframe.cpp ${CMAKE_SOURCE_DIR}/drivers/wxwidgets_comms.cpp)
+ set_source_files_properties(${wxPLViewer_SRCS}
+ PROPERTIES COMPILE_FLAGS "${wxwidgets_COMPILE_FLAGS}")
+@@ -90,7 +91,7 @@ if(ENABLE_wxwidgets AND NOT OLD_WXWIDGETS)
+ COMPILE_DEFINITIONS "USINGDLL"
+ )
+ endif(BUILD_SHARED_LIBS)
+- target_link_libraries(wxPLViewer plplotwxwidgets plplotcxx ${wxwidgets_LINK_FLAGS} ${MATH_LIB} ${RT_LIB})
++ target_link_libraries(wxPLViewer plplotwxwidgets plplotcxx ${wxwidgets_LINK_FLAGS} ${MATH_LIB} ${RT_LIB} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES})
+
+ if(USE_RPATH)
+ # Assume that plplotwxwidgets and plplotcxx have the same install location as plplot
|