From 94437633d3fc11e3f858431c4f4cdd26bb454e4c Mon Sep 17 00:00:00 2001 From: Ross Wardrup Date: Sun, 6 Nov 2022 11:10:42 -0700 Subject: [PATCH] Increment to version 2.5.2 --- CMakeLists.txt | 14 +++++++------- VERS | 1 + src/about.cpp | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c35b5c3c..b57cd539 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,12 +77,12 @@ if (CMAKE_BUILD_TYPE MATCHES Debug) add_compile_options(-Wall -Werror -Wextra -g -O0 - pedantic -Wno-error=deprecated-enum-enum-conversion -Wno-error=extra-semi -Wno-error=old-style-cast) elseif(CMAKE_BUILD_TYPE MATCHES Release) message(STATUS "Building release") - add_compile_options(-Wall -Werror -Wextra -gdwarf-2 -O2 -pedantic -Wno-error=deprecated-enum-enum-conversion -Wno-error=extra-semi -Wno-error=old-style-cast) + add_compile_options(-Wall -Werror -Wextra -gdwarf-2 -O2 -pedantic -Wno-error=deprecated-enum-enum-conversion -Wno-error=extra-semi -Wno-error=old-style-cast -s) elseif(CMAKE_BUILD_TYPE MATCHES RelLocalCpu) - add_compile_options(-Wall -Werror -Wextra -gdwarf-2 -O2 -pedantic -Wno-error=deprecated-enum-enum-conversion -Wno-error=extra-semi -Wno-error=old-style-cast) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") + add_compile_options(-Wall -Werror -Wextra -gdwarf-2 -O2 -pedantic -Wno-error=deprecated-enum-enum-conversion -Wno-error=extra-semi -Wno-error=old-style-cast -s) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -s") elseif(CMAKE_BUILD_TYPE MATCHES AppleM1) - add_compile_options(-Wall -Werror -Wextra -gdwarf-2 -O2 -pedantic -Wno-error=deprecated-enum-enum-conversion -Wno-error=extra-semi -Wno-error=old-style-cast) + add_compile_options(-Wall -Werror -Wextra -gdwarf-2 -O2 -pedantic -Wno-error=deprecated-enum-enum-conversion -Wno-error=extra-semi -Wno-error=old-style-cast -s) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=apple-m1") endif () @@ -99,11 +99,11 @@ IF(APPLE) set_target_properties(BuzzBot PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "BuzzBot" - MACOSX_BUNDLE_BUNDLE_VERSION "2.5.0" + MACOSX_BUNDLE_BUNDLE_VERSION "v2.5.2" MACOSX_BUNDLE TRUE MACOSX_BUNDLE_ICON_FILE icon.icns - MACOSX_BUNDLE_LONG_VERSION_STRING "2.5.0" - MACOSX_BUNDLE_SHORT_VERSION_STRING "2.5.0" + MACOSX_BUNDLE_LONG_VERSION_STRING "v2.5.2" + MACOSX_BUNDLE_SHORT_VERSION_STRING "v2.5.2" MACOSX_BUNDLE_COPYRIGHT "2021 Ross Wardrup" MACOSX_BUNDLE_GUI_IDENTIFIER com.rwardrup.buzzbot XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@loader_path/Libraries" diff --git a/VERS b/VERS index e986c9db..c7e074ac 100644 --- a/VERS +++ b/VERS @@ -37,3 +37,4 @@ 2.4.0 2022-09-25-12-39-36 v2.4.1 2022-10-01-13-58-02 2.5.0 2022-10-16-15-26-24 +v2.5.2 2022-11-06-11-09-57 diff --git a/src/about.cpp b/src/about.cpp index 418c5e69..9ea9c42b 100644 --- a/src/about.cpp +++ b/src/about.cpp @@ -19,7 +19,7 @@ About::About() { this->setFixedSize(237, 272); // Version text - const std::string version = "2.5.0"; + const std::string version = "v2.5.2"; ui.versionLabel->setText(QString::fromStdString("Version " + version)); // Make Qt URL clickable