From 005e15c45f7c0742706ab26c965c26da79470174 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Sun, 4 Jun 2023 18:56:41 -0400 Subject: [PATCH] cmake remove 'zdev' #127 --- CMakeLists.txt | 26 +++++++++++++------------- src/dsd_main.c | 2 +- src/dsd_ncurses.c | 5 +++-- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cf0885f..9e43148 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ #Arch currently on 3.26.3 #Cygwin currently using 3.23.2 (or newer) cmake_minimum_required(VERSION 3.10.2) -project(dsd-fme-zdev) +project(dsd-fme) SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/") #Set curses to ncurses, and wide true for ascii @@ -32,11 +32,11 @@ if (PVC) endif () #use cmake option -DNXDN=ON to enable new NXDN Sync Pattern Testing -option(NXDN - "Build with new NXDN Sync Pattern Testing Enabled" OFF) -if (NXDN) - add_definitions(-DNXDNTESTSYNC) -endif () +# option(NXDN +# "Build with new NXDN Sync Pattern Testing Enabled" OFF) +# if (NXDN) +# add_definitions(-DNXDNTESTSYNC) +# endif () #use cmake option -DLZ=ON to enable LimaZulu Requested NXDN Tweaks option(LZ @@ -77,24 +77,24 @@ list(APPEND SRCS "${CMAKE_CURRENT_BINARY_DIR}/git_ver.c") include_directories("${PROJECT_SOURCE_DIR}/include") -ADD_EXECUTABLE(dsd-fme-zdev ${SRCS} ${HEADERS}) -TARGET_LINK_LIBRARIES(dsd-fme-zdev ${LIBS}) +ADD_EXECUTABLE(dsd-fme ${SRCS} ${HEADERS}) +TARGET_LINK_LIBRARIES(dsd-fme ${LIBS}) include(GNUInstallDirs) -install(TARGETS dsd-fme-zdev DESTINATION ${CMAKE_INSTALL_BINDIR}) +install(TARGETS dsd-fme DESTINATION ${CMAKE_INSTALL_BINDIR}) # man page find_program(HELP2MAN_FOUND help2man) if (HELP2MAN_FOUND) - add_custom_command(TARGET dsd-fme-zdev POST_BUILD + add_custom_command(TARGET dsd-fme POST_BUILD COMMAND help2man ARGS -n "Digital Speech Decoder" --version-string=${GIT_TAG} - -o ${CMAKE_CURRENT_BINARY_DIR}/dsd-fme-zdev.1 + -o ${CMAKE_CURRENT_BINARY_DIR}/dsd-fme.1 --no-info - $ + $ ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dsd-fme-zdev.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dsd-fme.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) endif() # uninstall target diff --git a/src/dsd_main.c b/src/dsd_main.c index aa7f8b6..1b91954 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -1358,7 +1358,7 @@ main (int argc, char **argv) } #ifdef AERO_BUILD - fprintf (stderr, "Build Version: v2.0.1-18 Win32 \n"); + fprintf (stderr, "Build Version: v2.0.1-22 Win32 \n"); #else fprintf (stderr, "Build Version: %s \n", GIT_TAG); #endif diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c index d4729fc..6b1b170 100644 --- a/src/dsd_ncurses.c +++ b/src/dsd_ncurses.c @@ -2072,7 +2072,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.1-18 Win32"); + printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "v2.0.1-22 Win32"); printw ("------------------------------------------------------------------------------\n"); } #elif LIMAZULUTWEAKS @@ -2101,9 +2101,10 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) if (i == 4) printw (" MBElib %s", versionstr); #ifdef AERO_BUILD if (i == 5) printw (" %s ", "Aero Win32"); - if (i == 6) printw (" v2.0.1-18 Win32 \n"); + if (i == 6) printw (" v2.0.1-22 Win32 \n"); #else if (i == 5) printw (" %s ", "zDEV BUILD"); + // if (i == 5) printw (" %s ", "MAIN BUILD"); if (i == 6) printw (" %s \n", GIT_TAG); #endif else printw ("\n");