ua1zbe
/
dsd-fme_20_06_2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake remove 'zdev' #127

This commit is contained in:
lwvmobile 2023-06-04 18:56:41 -04:00
parent e9962a8923
commit 005e15c45f
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@ -3,7 +3,7 @@
#Arch currently on 3.26.3 #Arch currently on 3.26.3
#Cygwin currently using 3.23.2 (or newer) #Cygwin currently using 3.23.2 (or newer)
cmake_minimum_required(VERSION 3.10.2) 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(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
#Set curses to ncurses, and wide true for ascii #Set curses to ncurses, and wide true for ascii
@ -32,11 +32,11 @@ if (PVC)
endif () endif ()
#use cmake option -DNXDN=ON to enable new NXDN Sync Pattern Testing #use cmake option -DNXDN=ON to enable new NXDN Sync Pattern Testing
option(NXDN # option(NXDN
"Build with new NXDN Sync Pattern Testing Enabled" OFF) # "Build with new NXDN Sync Pattern Testing Enabled" OFF)
if (NXDN) # if (NXDN)
add_definitions(-DNXDNTESTSYNC) # add_definitions(-DNXDNTESTSYNC)
endif () # endif ()
#use cmake option -DLZ=ON to enable LimaZulu Requested NXDN Tweaks #use cmake option -DLZ=ON to enable LimaZulu Requested NXDN Tweaks
option(LZ option(LZ
@ -77,24 +77,24 @@ list(APPEND SRCS "${CMAKE_CURRENT_BINARY_DIR}/git_ver.c")
include_directories("${PROJECT_SOURCE_DIR}/include") include_directories("${PROJECT_SOURCE_DIR}/include")
ADD_EXECUTABLE(dsd-fme-zdev ${SRCS} ${HEADERS}) ADD_EXECUTABLE(dsd-fme ${SRCS} ${HEADERS})
TARGET_LINK_LIBRARIES(dsd-fme-zdev ${LIBS}) TARGET_LINK_LIBRARIES(dsd-fme ${LIBS})
include(GNUInstallDirs) include(GNUInstallDirs)
install(TARGETS dsd-fme-zdev DESTINATION ${CMAKE_INSTALL_BINDIR}) install(TARGETS dsd-fme DESTINATION ${CMAKE_INSTALL_BINDIR})
# man page # man page
find_program(HELP2MAN_FOUND help2man) find_program(HELP2MAN_FOUND help2man)
if (HELP2MAN_FOUND) if (HELP2MAN_FOUND)
add_custom_command(TARGET dsd-fme-zdev POST_BUILD add_custom_command(TARGET dsd-fme POST_BUILD
COMMAND help2man COMMAND help2man
ARGS -n "Digital Speech Decoder" ARGS -n "Digital Speech Decoder"
--version-string=${GIT_TAG} --version-string=${GIT_TAG}
-o ${CMAKE_CURRENT_BINARY_DIR}/dsd-fme-zdev.1 -o ${CMAKE_CURRENT_BINARY_DIR}/dsd-fme.1
--no-info --no-info
$<TARGET_FILE:dsd-fme-zdev> $<TARGET_FILE:dsd-fme>
) )
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() endif()
# uninstall target # uninstall target

2
src/dsd_main.c
View File

@ -1358,7 +1358,7 @@ main (int argc, char **argv)
} }
#ifdef AERO_BUILD #ifdef AERO_BUILD
fprintf (stderr, "Build Version: v2.0.1-18 Win32 \n"); fprintf (stderr, "Build Version: v2.0.1-22 Win32 \n");
#else #else
fprintf (stderr, "Build Version: %s \n", GIT_TAG); fprintf (stderr, "Build Version: %s \n", GIT_TAG);
#endif #endif

5
src/dsd_ncurses.c
View File

@ -2072,7 +2072,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
if (opts->ncurses_compact == 1) if (opts->ncurses_compact == 1)
{ {
printw ("------------------------------------------------------------------------------\n"); 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"); printw ("------------------------------------------------------------------------------\n");
} }
#elif LIMAZULUTWEAKS #elif LIMAZULUTWEAKS
@ -2101,9 +2101,10 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
if (i == 4) printw (" MBElib %s", versionstr); if (i == 4) printw (" MBElib %s", versionstr);
#ifdef AERO_BUILD #ifdef AERO_BUILD
if (i == 5) printw (" %s ", "Aero Win32"); 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 #else
if (i == 5) printw (" %s ", "zDEV BUILD"); if (i == 5) printw (" %s ", "zDEV BUILD");
// if (i == 5) printw (" %s ", "MAIN BUILD");
if (i == 6) printw (" %s \n", GIT_TAG); if (i == 6) printw (" %s \n", GIT_TAG);
#endif #endif
else printw ("\n"); else printw ("\n");