From 0fe040ab005d6f0266b4fd5153a4e50cac76a62f Mon Sep 17 00:00:00 2001 From: Przemek <4788832+przemek83@users.noreply.github.com> Date: Wed, 16 Aug 2023 20:47:41 +0200 Subject: [PATCH] Updated external libs versions and README Updated Wble, Eible and Qwtble to 1.1.0 versions. Updated README file. --- CMakeLists.txt.eible | 2 +- CMakeLists.txt.qwtble | 2 +- CMakeLists.txt.wble | 2 +- README.md | 19 +++++++++---------- Shared/CommonProperties.h | 2 +- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt.eible b/CMakeLists.txt.eible index 9a282fb..cffaf8e 100644 --- a/CMakeLists.txt.eible +++ b/CMakeLists.txt.eible @@ -7,6 +7,6 @@ project(eible NONE) ExternalProject_Add(eible PREFIX eible GIT_REPOSITORY https://github.com/przemek83/eible.git - GIT_TAG master + GIT_TAG v1.1.0 CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/eible/install ) diff --git a/CMakeLists.txt.qwtble b/CMakeLists.txt.qwtble index d9b7180..a2d5429 100644 --- a/CMakeLists.txt.qwtble +++ b/CMakeLists.txt.qwtble @@ -7,6 +7,6 @@ project(qwtble NONE) ExternalProject_Add(qwtble PREFIX qwtble GIT_REPOSITORY https://github.com/przemek83/qwtble.git - GIT_TAG master + GIT_TAG v1.1.0 CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/qwtble/install ) diff --git a/CMakeLists.txt.wble b/CMakeLists.txt.wble index 5e41008..0138f02 100644 --- a/CMakeLists.txt.wble +++ b/CMakeLists.txt.wble @@ -7,6 +7,6 @@ project(wble NONE) ExternalProject_Add(wble PREFIX wble GIT_REPOSITORY https://github.com/przemek83/wble.git - GIT_TAG master + GIT_TAG v1.1.0 CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/wble/install ) diff --git a/README.md b/README.md index be0e02f..c1e23a4 100644 --- a/README.md +++ b/README.md @@ -30,23 +30,22 @@ The tool was originally created for real estate appraisal as it gives the possib | Tool | Windows | Lubuntu | | --- | --- | --- | | OS version | 10 22H2 | 22.04 | -| GCC | 8.1.0 | 9.5.0 | +| GCC | 11.2.0 | 11.3.0 | | CMake | 3.25.0 | 3.25.0 | | Git | 2.38.1 | 2.34.1 | -| SVN | 1.14.2 | 1.14.1 | -| Qt | 5.15.2 | 5.15.2 | -| Qt Creator | 9.0.0 |9.0.0 | -| Qwt | 6.1.6 | 6.1.6 | -| QuaZip | 0.9 | 0.9 | +| Qt | 6.5.2 | 6.5.2 | +| Qt Creator | 10.0.2 | 10.0.2 | +| Qwt | 6.2 | 6.2 | +| QuaZip | 1.4 | 1.4 | | Zlib | 1.2.13 | 1.2.13 | -| Eible | master | master | -| QwtBle | master | master | -| Wble | master | master | +| Eible | 1.1.0 | 1.1.0 | +| QwtBle | 1.1.0 | 1.1.0 | +| Wble | 1.1.0 | 1.1.0 | ## Compilation and installation Use directly CMake or Qt Creator. CMake **should**: - configure everything automatically, -- download dependencies using Git (QuaZip, Zlib, Eible, Wble, Qwtble) and SVN (Qwt), +- download dependencies using Git (QuaZip, Zlib, Eible, Wble, Qwtble, Qwt), - build dependencies, - compile Volbx and create binaries. diff --git a/Shared/CommonProperties.h b/Shared/CommonProperties.h index 5c8145c..85fe34c 100644 --- a/Shared/CommonProperties.h +++ b/Shared/CommonProperties.h @@ -7,7 +7,7 @@ #define VER_PRODUCTVERSION_STR "2.00" #define VER_COMPANYNAME_STR "No Name" -#define VER_LEGALCOPYRIGHT_STR "Copyright 2014-2020" +#define VER_LEGALCOPYRIGHT_STR "Copyright 2014-2023" #define VER_LEGALTRADEMARKS1_STR "" #define VER_LEGALTRADEMARKS2_STR VER_LEGALTRADEMARKS1_STR