From 5c08a9193c146f724aa24ae9b0911d577261ac84 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Tue, 28 Mar 2023 23:33:20 -0400 Subject: [PATCH] Yet Another Cmake Warning Fix #107 --- CMakeLists.txt | 6 +++--- src/dsd_main.c | 2 +- src/dsd_ncurses.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8921ad6..f8916cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,11 @@ -set(CMAKE_LEGACY_CYGWIN_WIN32 0) #annoying warning in cygwin -project(dsd-fme-aero) #Ubuntu 18.04 uses 3.10.2 currently -- almost EOL #Ubuntu 20.04 uses 3.16.3 #Ubuntu 22.04 uses 3.22.1 -#Arch currently on 3.25.3 +#Arch currently on 3.26.1 -- new nag warning starts on this one, see below +#cmake_minimum_required() should be called prior to this top-level project() #Cygwin currently using 3.23.2 (or newer) cmake_minimum_required(VERSION 3.10.2) +project(dsd-fme-aero) SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/") #Set curses to ncurses, and wide true for ascii diff --git a/src/dsd_main.c b/src/dsd_main.c index 080313c..5d0ee3b 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -52,7 +52,7 @@ char * FM_banner[9] = { " ██║ ██║ ╚═══██╗██║ ██║   ██╔══╝ ██║╚██╔╝██║██╔══╝ ", " ██████╔╝██████╔╝██████╔╝   ██║ ██║ ╚═╝ ██║███████╗", " ╚═════╝ ╚═════╝ ╚═════╝    ╚═╝ ╚═╝ ╚═╝╚══════╝", - " 'Aero' Edition v2.0.0-70-gf3c0199 Windows 32-bit RC5b " + " 'Aero' Edition v2.0.0-72-gce75acb Windows 32-bit RC5c " }; int comp (const void *a, const void *b) diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c index 5683db3..6877105 100644 --- a/src/dsd_ncurses.c +++ b/src/dsd_ncurses.c @@ -2061,7 +2061,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) if (opts->ncurses_compact == 1) { printw ("------------------------------------------------------------------------------\n"); - printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "v2.0.0-70-gf3c0199 RC5b"); + printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "v2.0.0-72-gce75acb RC5c"); } if (opts->ncurses_compact == 0) { @@ -2072,8 +2072,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) if (i == 1) printw (" ESC to Menu"); if (i == 2) printw (" 'q' to Quit "); if (i == 4) printw (" MBElib %s", versionstr); - if (i == 5) printw (" %s ", "Aero RC5b"); //printw (" %s \n", GIT_TAG); - if (i == 6) printw (" %s \n", "v2.0.0-70-gf3c0199"); //printw (" %s \n", GIT_TAG); + if (i == 5) printw (" %s ", "Aero RC5c"); //printw (" %s \n", GIT_TAG); + if (i == 6) printw (" %s \n", "v2.0.0-72-gce75acb"); //printw (" %s \n", GIT_TAG); else printw ("\n"); } attroff(COLOR_PAIR(6)); //6