Static internal build of qwt (#583)

* static linking of qwt
* suppressed warning in qwt + added reason
This commit is contained in:
Erik Fröjdh
2022-11-23 11:59:22 +01:00
committed by GitHub
parent 2d6cb52dfa
commit 8dbcfc2ca8
1662 changed files with 66 additions and 247121 deletions

View File

@ -10,6 +10,7 @@ find_package(Qt5 5.9 COMPONENTS Widgets Core Gui REQUIRED)
find_package(PNG REQUIRED)
find_package(ZLIB REQUIRED)
set(SOURCES
slsDetectorPlotting/src/SlsQt1DPlot.cpp
slsDetectorPlotting/src/SlsQt1DZoomer.cpp
@ -97,7 +98,6 @@ target_include_directories(slsDetectorGui PUBLIC
target_link_libraries(slsDetectorGui PUBLIC
slsProjectOptions
slsDetectorStatic
${SLS_INTERNAL_QWT_DIR}/lib/libqwt.so.6.1.5
PNG::PNG
ZLIB::ZLIB
Qt5::Widgets
@ -107,6 +107,7 @@ target_link_libraries(slsDetectorGui PUBLIC
PRIVATE
slsProjectWarnings
qwt
)
set_target_properties(slsDetectorGui PROPERTIES

View File

@ -5,6 +5,11 @@
#include "qVersionResolve.h"
#include "sls/logger.h"
//Suppressing warning until qwt has a fix, avoid
//patching and should be backwards compatible
//https://doc.qt.io/qt-5/qflags-obsolete.html
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include <qlist.h>
#include <qtoolbutton.h>
#include <qwt_color_map.h>
@ -15,6 +20,7 @@
#include <qwt_scale_draw.h>
#include <qwt_scale_engine.h>
#include <qwt_scale_widget.h>
#pragma GCC diagnostic pop
#include <cmath>
#include <iostream>