File DIE-use_system_libs.patch of Package DIE
Index: DIE-3.04/XArchive/CMakeLists.txt
===================================================================
--- DIE-3.04.orig/XArchive/CMakeLists.txt
+++ DIE-3.04/XArchive/CMakeLists.txt
@@ -2,6 +2,3 @@ cmake_minimum_required(VERSION 3.14)
project(XArchive)
-add_subdirectory(${PROJECT_SOURCE_DIR}/3rdparty/bzip2)
-add_subdirectory(${PROJECT_SOURCE_DIR}/3rdparty/lzma)
-add_subdirectory(${PROJECT_SOURCE_DIR}/3rdparty/zlib)
Index: DIE-3.04/XArchive/xarchive.cmake
===================================================================
--- DIE-3.04.orig/XArchive/xarchive.cmake
+++ DIE-3.04/XArchive/xarchive.cmake
@@ -1,7 +1,13 @@
include_directories(${CMAKE_CURRENT_LIST_DIR})
-include_directories(${CMAKE_CURRENT_LIST_DIR}/3rdparty/bzip2/src/)
-include_directories(${CMAKE_CURRENT_LIST_DIR}/3rdparty/lzma/src/)
-include_directories(${CMAKE_CURRENT_LIST_DIR}/3rdparty/zlib/src/)
+
+include(FindPkgConfig)
+pkg_search_module(BZIP2 REQUIRED bzip2)
+pkg_search_module(CLZMA REQUIRED clzma)
+pkg_search_module(ZLIB REQUIRED zlib)
+
+include_directories(${BZIP2_INCLUDE_DIRS})
+include_directories(${CLZMA_INCLUDE_DIRS})
+include_directories(${ZLIB_INCLUDE_DIRS})
include(${CMAKE_CURRENT_LIST_DIR}/../Formats/xbinary.cmake)
Index: DIE-3.04/gui_source/CMakeLists.txt
===================================================================
--- DIE-3.04.orig/gui_source/CMakeLists.txt
+++ DIE-3.04/gui_source/CMakeLists.txt
@@ -63,9 +63,10 @@ else()
)
endif()
-target_link_libraries(${PROJECT_NAME} bzip2)
-target_link_libraries(${PROJECT_NAME} lzma)
-target_link_libraries(${PROJECT_NAME} zlib)
+target_link_libraries(${PROJECT_NAME} ${BZIP2_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${CLZMA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${QT5QWT6_LIBRARIES})
target_link_libraries(${PROJECT_NAME} capstone)
target_link_libraries(${PROJECT_NAME} cppfilt)
Index: DIE-3.04/console_source/CMakeLists.txt
===================================================================
--- DIE-3.04.orig/console_source/CMakeLists.txt
+++ DIE-3.04/console_source/CMakeLists.txt
@@ -53,9 +53,10 @@ else()
)
endif()
-target_link_libraries(${PROJECT_NAME} bzip2)
-target_link_libraries(${PROJECT_NAME} lzma)
-target_link_libraries(${PROJECT_NAME} zlib)
+target_link_libraries(${PROJECT_NAME} ${BZIP2_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${CLZMA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${QT5QWT6_LIBRARIES})
target_link_libraries(${PROJECT_NAME} capstone_x86)
target_link_libraries(${PROJECT_NAME} Qt5::Core)
Index: DIE-3.04/lite_source/CMakeLists.txt
===================================================================
--- DIE-3.04.orig/lite_source/CMakeLists.txt
+++ DIE-3.04/lite_source/CMakeLists.txt
@@ -51,9 +51,10 @@ else()
)
endif()
-target_link_libraries(${PROJECT_NAME} bzip2)
-target_link_libraries(${PROJECT_NAME} lzma)
-target_link_libraries(${PROJECT_NAME} zlib)
+target_link_libraries(${PROJECT_NAME} ${BZIP2_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${CLZMA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${QT5QWT6_LIBRARIES})
target_link_libraries(${PROJECT_NAME} capstone_x86)
target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
Index: DIE-3.04/XQwt/xqwt.cmake
===================================================================
--- DIE-3.04.orig/XQwt/xqwt.cmake
+++ DIE-3.04/XQwt/xqwt.cmake
@@ -3,125 +3,8 @@ include_directories(${CMAKE_CURRENT_LIST
add_definitions(-DXQWT_PRESENT)
add_definitions(-DQWT_MOC_INCLUDE=1)
-set(XQWT_SOURCES
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_abstract_legend.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_abstract_scale.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_abstract_scale_draw.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_abstract_slider.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_analog_clock.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_arrow_button.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_bezier.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_clipper.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_color_map.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_column_symbol.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_compass.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_compass_rose.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_counter.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_curve_fitter.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_date.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_date_scale_draw.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_date_scale_engine.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_dial.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_dial_needle.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_dyngrid_layout.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_event_pattern.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_graphic.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_interval.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_interval_symbol.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_knob.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_legend.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_legend_data.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_legend_label.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_magnifier.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_math.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_matrix_raster_data.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_null_paintdevice.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_painter.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_painter_command.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_panner.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_picker.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_picker_machine.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_pixel_matrix.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_abstract_barchart.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_abstract_canvas.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_axis.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_barchart.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_canvas.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_curve.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_dict.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_directpainter.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_graphicitem.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_grid.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_histogram.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_intervalcurve.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_item.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_layout.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_legenditem.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_magnifier.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_marker.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_multi_barchart.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_panner.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_picker.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_rasteritem.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_renderer.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_rescaler.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_scaleitem.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_seriesitem.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_shapeitem.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_spectrocurve.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_spectrogram.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_textlabel.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_tradingcurve.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_vectorfield.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_zoneitem.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_plot_zoomer.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_point_3d.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_point_data.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_point_mapper.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_point_polar.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_polar_canvas.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_polar_curve.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_polar_fitter.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_polar_grid.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_polar_item.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_polar_itemdict.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_polar_layout.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_polar_magnifier.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_polar_marker.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_polar_panner.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_polar_picker.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_polar_plot.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_polar_renderer.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_polar_spectrogram.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_raster_data.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_round_scale_draw.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_sampling_thread.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_scale_div.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_scale_draw.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_scale_engine.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_scale_map.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_scale_widget.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_series_data.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_slider.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_spline.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_spline_basis.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_spline_cubic.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_spline_curve_fitter.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_spline_local.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_spline_parametrization.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_spline_pleasing.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_spline_polynomial.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_symbol.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_system_clock.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_text.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_text_engine.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_text_label.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_thermo.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_transform.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_vectorfield_symbol.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_weeding_curve_fitter.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_wheel.cpp
- ${CMAKE_CURRENT_LIST_DIR}/3rdparty/qwt/src/qwt_widget_overlay.cpp
-)
+include(FindPkgConfig)
+pkg_search_module(QT5QWT6 REQUIRED Qt5Qwt6)
+
+include_directories(${QT5QWT6_INCLUDE_DIRS})
+