Merge branch 'master' into uweham/master

CMakeLists.txt

@@ -5,10 +5,17 @@
 # Please report questions, comments, problems, or patches to the freetel
 # mailing list: https://lists.sourceforge.net/lists/listinfo/freetel-codec2
 #
+cmake_minimum_required(VERSION 3.13)
+project(FreeDV
+  VERSION 1.8.2
+  DESCRIPTION "HF Digital Voice for Radio Amateurs"
+  HOMEPAGE_URL "https://freedv.org"
+  LANGUAGES C CXX
+)
 
-set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "Minimum OS X deployment version")
-
-cmake_minimum_required(VERSION 3.0)
+# Adds a tag to the end of the version string. Leave empty
+# for official release builds.
+set(FREEDV_VERSION_TAG "devel")
 
 # Prevent in-source builds to protect automake/autoconf config.
 # If an in-source build is attempted, you will still need to clean up a few
@@ -24,41 +31,19 @@ endif("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
 # Set local module path.
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
-project(FreeDV)
-
 # Build universal ARM64 and x86_64 binaries on Mac.
 if(BUILD_OSX_UNIVERSAL)
 set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
 endif(BUILD_OSX_UNIVERSAL)
-
-# https://cmake.org/cmake/help/git-stage/policy/CMP0075.html
-if(POLICY CMP0075)
-    cmake_policy(SET CMP0075 NEW)
-endif()
+set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "Minimum OS X deployment version")
 
 # Return the date (yyyy-mm-dd)
-macro(DATE RESULT)
-  execute_process(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE ${RESULT})
-endmacro()
-DATE(DATE_RESULT)
-string(REGEX REPLACE "\n$" "" DATE_RESULT "${DATE_RESULT}")
+string(TIMESTAMP DATE_RESULT "%Y-%m-%d" UTC)
 message(STATUS "Compilation date = XX${DATE_RESULT}XX")
 
 #
-# Set FreeDV version and generate src/version.h
+# generate src/version.h
 #
-set(FREEDV_VERSION_MAJOR 1)
-set(FREEDV_VERSION_MINOR 8)
-set(FREEDV_VERSION_PATCH 2)
-set(FREEDV_VERSION_SUFFIX "")
-
-set(FREEDV_VERSION ${FREEDV_VERSION_MAJOR}.${FREEDV_VERSION_MINOR}.${FREEDV_VERSION_PATCH})
-if(FREEDV_VERSION_SUFFIX)
-    set(FREEDV_VERSION_STRING "${FREEDV_VERSION} ${FREEDV_VERSION_SUFFIX}")
-else()
-    set(FREEDV_VERSION_STRING "${FREEDV_VERSION}")
-endif()
-message(STATUS "FreeDV version: ${FREEDV_VERSION_STRING}")
 configure_file(cmake/version.h.in src/version.h @ONLY)
 
 # Set default build type
@@ -93,7 +78,6 @@ else()
         add_definitions(-DGIT_HASH="None")
 endif()
 
-
 # Set default build flags.
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
@@ -109,6 +93,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 # Setup cmake options
 #
 set(CMAKE_VERBOSE_MAKEFILE TRUE CACHE BOOL "Verbose makefile.")
+set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE CACHE BOOL "Enable IDE features.")
 set(USE_INTERNAL_CODEC2 FALSE CACHE BOOL
     "Download and build codec2 and lpcnetfreedv instead of using the system library.")
 set(USE_STATIC_DEPS FALSE CACHE BOOL

USER_MANUAL.html

@@ -581,6 +581,8 @@ FMA             -       Supports FMA extensions using YMM state</code></pre>
 <li>Build system:
 <ul>
 <li>Build Git version of Hamlib for Windows builds. (PR #261)</li>
+<li>Remove build date and time from libsox. (PR #267)</li>
+<li>Refactor CMakeList.txt using newer project format. (PR #268)</li>
 </ul></li>
 </ol>
 <h2 id="v1.8.2-july-2022"><span class="header-section-number">16.2</span> V1.8.2 July 2022</h2>

USER_MANUAL.md

@@ -795,8 +795,10 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
 
 1. Build system:
     * Build Git version of Hamlib for Windows builds. (PR #261)
+    * Remove build date and time from libsox. (PR #267)
+    * Refactor CMakeList.txt using newer project format. (PR #268)
 1. Enhancements:
-    * Update frequency and mode display every 15 sec.  (PR #266)
+    * Update frequency and mode display every 15 sec. (PR #266)
     
 ## V1.8.2 July 2022
 

cmake/version.h.in

@@ -1,11 +1,15 @@
 #ifndef FREEDV_VER_DOT_H
 #define FREEDV_VER_DOT_H 1
 
-#define FREEDV_VERSION_MAJOR @FREEDV_VERSION_MAJOR@
-#define FREEDV_VERSION_MINOR @FREEDV_VERSION_MINOR@
-#define FREEDV_VERSION_PATCH @FREEDV_VERSION_PATCH@
-#define FREEDV_VERSION_SUFFIX "@FREEDV_VERSION_SUFFIX@"
+#define FREEDV_VERSION_MAJOR @FreeDV_VERSION_MAJOR@
+#define FREEDV_VERSION_MINOR @FreeDV_VERSION_MINOR@
+#define FREEDV_VERSION_PATCH @FreeDV_VERSION_PATCH@
+#define FREEDV_VERSION_SUFFIX @FreeDV_VERSION_TWEAK@
 
-#define FREEDV_VERSION "@FREEDV_VERSION_STRING@"
+#if defined(FREEDV_VERSION_TAG)
+#define FREEDV_VERSION ("@FreeDV_VERSION@-" FREEDV_VERSION_TAG)
+#else
+#define FREEDV_VERSION ("@FreeDV_VERSION@-")
+#endif // defined(FREEDV_VERSION_TAG)
 
 #endif //FREEDV_VER_DOT_H

src/CMakeLists.txt

@@ -66,9 +66,9 @@ if(APPLE)
         MACOSX_BUNDLE_GUI_IDENTIFIER org.freedv.freedv
         MACOSX_BUNDLE_BUNDLE_NAME FreeDV
         MACOSX_BNUDLE_COPYRIGHT "Copyright (c) 2021 FreeDV"
-        MACOSX_BUNDLE_BUNDLE_VERSION "${FREEDV_VERSION}"
-        MACOSX_BUNDLE_BUNDLE_SHORT_VERSION_STRING "${FREEDV_VERSION}"
-        MACOSX_BUNDLE_BUNDLE_LONG_VERSION_STRING "${FREEDV_VERSION}"
+        MACOSX_BUNDLE_BUNDLE_VERSION "${FreeDV_VERSION}"
+        MACOSX_BUNDLE_BUNDLE_SHORT_VERSION_STRING "${FreeDV_VERSION}"
+        MACOSX_BUNDLE_BUNDLE_LONG_VERSION_STRING "${FreeDV_VERSION}"
         MACOSX_BUNDLE_ICON_FILE "freedv"
         MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/src/info.plist.in
     )
@@ -113,6 +113,11 @@ add_definitions(-DAPPLE_OLD_XCODE)
 endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0.0.900037)
 endif(APPLE)
 
+# If a release tag's set, pass it to the compiler.
+if(FREEDV_VERSION_TAG)
+add_definitions(-DFREEDV_VERSION_TAG="${FREEDV_VERSION_TAG}")
+endif(FREEDV_VERSION_TAG)
+
 # Insert source and generated header directories before other search directories.
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 

src/sox/libsox.c

@@ -66,7 +66,7 @@ sox_version_info_t const * sox_version_info(void)
         NULL,
 #endif
         /* sox_time */
-        __DATE__ " " __TIME__,
+        NULL,
         /* sox_distro */
 #ifdef DISTRO
         DISTRO,