# HG changeset patch # User Ethan Zonca # Date 2023-03-23 10:27:20 # Node ID 4cddc8ad115cfc5de87a29e69a433449fa73802d # Parent 16cb36cb4df042a1ddc03da6216f9182f384f766 Bump QWT version and fix includes diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ set(BUILD_QWT true CACHE BOOL "Download if (BUILD_QWT) include(BuildQwt) else (BUILD_QWT) - find_package(Qwt 6.1 REQUIRED) + find_package(Qwt 6.1.5 REQUIRED) endif (BUILD_QWT) # includes @@ -127,9 +127,9 @@ add_executable(${PROGRAM_NAME} WIN32 src/barchart.cpp src/barscaledraw.cpp src/numberformat.cpp - src/updatechecker.cpp + # src/updatechecker.cpp src/versionnumber.cpp - src/updatecheckdialog.cpp +#src/updatecheckdialog.cpp src/samplepack.cpp src/source.cpp src/sink.cpp diff --git a/cmake/modules/BuildQwt.cmake b/cmake/modules/BuildQwt.cmake --- a/cmake/modules/BuildQwt.cmake +++ b/cmake/modules/BuildQwt.cmake @@ -22,7 +22,7 @@ include(ExternalProject) ExternalProject_Add(QWT PREFIX qwt # SVN_REPOSITORY svn://svn.code.sf.net/p/qwt/code/branches/qwt-6.1 - URL https://sourceforge.net/projects/qwt/files/qwt/6.1.4/qwt-6.1.4.tar.bz2 + URL https://sourceforge.net/projects/qwt/files/qwt/6.1.5/qwt-6.1.5.tar.bz2 # disable QwtDesigner plugin and enable static build PATCH_COMMAND sed -i -r -e "s/QWT_CONFIG\\s*\\+=\\s*QwtDesigner/#&/" -e "s/QWT_CONFIG\\s*\\+=\\s*QwtDll/#&/"