early-access version 2853
This commit is contained in:
23
externals/vcpkg/ports/plplot/fix_utils.patch
vendored
Executable file
23
externals/vcpkg/ports/plplot/fix_utils.patch
vendored
Executable file
@@ -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
|
Reference in New Issue
Block a user