Use newest wble library. Change the way it is used in Volbx CMake files.

Author: przemek83

CMakeLists.txt

@@ -15,8 +15,9 @@ find_package(Qt6 REQUIRED COMPONENTS Widgets Core Gui Network Xml Test)
 qt_standard_project_setup()
 
 include(CMakeLists.txt.qwtble)
+include(CMakeLists.txt.wble)
 
-set(THIRD_PARTY_LIBS wble eible zlib quazip)
+set(THIRD_PARTY_LIBS eible zlib quazip)
 foreach(library ${THIRD_PARTY_LIBS})
     configure_file(CMakeLists.txt.${library} ${library}/CMakeLists.txt)
     execute_process(COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} .
@@ -39,7 +40,6 @@ find_package(QuaZip-Qt6 CONFIG REQUIRED)
 link_directories(${FETCHCONTENT_BASE_DIR}/qwtble-build/qwt/install/lib)
 link_directories(${CMAKE_BINARY_DIR}/zlib/install/bin)
 link_directories(${CMAKE_BINARY_DIR}/quazip/install/lib)
-link_directories(${CMAKE_BINARY_DIR}/wble/install/lib)
 link_directories(${CMAKE_BINARY_DIR}/eible/install/lib)
 
 include_directories(${CMAKE_SOURCE_DIR})

CMakeLists.txt.wble

@@ -1,12 +1,9 @@
-cmake_minimum_required(VERSION 3.16)
+include(FetchContent)
 
-include(ExternalProject)
-
-project(wble NONE)
-
-ExternalProject_Add(wble
-    PREFIX wble
+FetchContent_Declare(
+    wble
     GIT_REPOSITORY https://github.com/przemek83/wble.git
-    GIT_TAG v1.1.0
-    CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/wble/install
+    GIT_TAG d91243e7696acb4f6dde28f71d264b6ac55377d9
 )
+
+FetchContent_MakeAvailable(wble)

GUI/Export.cpp

@@ -2,8 +2,8 @@
 
 #include <ExportDsv.h>
 #include <ExportXlsx.h>
-#include <ProgressBarCounter.h>
 #include <qwtble/PlotBase.h>
+#include <wble/ProgressBarCounter.h>
 #include <QDir>
 #include <QElapsedTimer>
 #include <QFileDialog>

GUI/FiltersDock.cpp

@@ -1,9 +1,9 @@
 #include "FiltersDock.h"
 
-#include <Filter.h>
-#include <FilterDates.h>
-#include <FilterDoubles.h>
-#include <FilterStrings.h>
+#include <wble/Filter.h>
+#include <wble/FilterDates.h>
+#include <wble/FilterDoubles.h>
+#include <wble/FilterStrings.h>
 #include <QLineEdit>
 #include <QScrollArea>
 #include <QVBoxLayout>
@@ -152,8 +152,8 @@ FilterNumbers* FiltersDock::createNumbersFilter(const TableModel* parentModel,
     const QString columnName{getColumnName(parentModel, index)};
     const auto [min, max]{parentModel->getNumericRange(index)};
     auto* filter{new FilterDoubles(columnName, min, max)};
-    auto emitChangeForColumn{
-        [=](double from, double to) { Q_EMIT filterNumbers(index, from, to); }};
+    auto emitChangeForColumn{[=](double from, double to)
+                             { Q_EMIT filterNumbers(index, from, to); }};
     connect(filter, &FilterDoubles::newNumericFilter, this,
             emitChangeForColumn);
     filter->setCheckable(true);

GUI/VolbxMain.cpp

@@ -1,6 +1,6 @@
 #include "VolbxMain.h"
 
-#include <ProgressBarCounter.h>
+#include <wble/ProgressBarCounter.h>
 #include <QActionGroup>
 #include <QDir>
 #include <QElapsedTimer>

Import/SpreadsheetsImportTab.cpp

@@ -3,7 +3,7 @@
 #include <cmath>
 #include <future>
 
-#include <ProgressBarInfinite.h>
+#include <wble/ProgressBarInfinite.h>
 #include <QElapsedTimer>
 #include <QFileDialog>
 #include <QFileInfo>