From 32c4376f4d41a849bd0fda7220b19a7417ac7bb9 Mon Sep 17 00:00:00 2001
From: Mooneer Salem <mooneer@gmail.com>
Date: Fri, 7 Jan 2022 08:45:59 -0800
Subject: [PATCH] Always include patch version in version string.

---
 CMakeLists.txt     | 5 +----
 src/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f8f0ec0..7a41928c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,10 +52,7 @@ set(FREEDV_VERSION_MINOR 7)
 set(FREEDV_VERSION_PATCH 0)
 set(FREEDV_VERSION_SUFFIX "")
 
-set(FREEDV_VERSION ${FREEDV_VERSION_MAJOR}.${FREEDV_VERSION_MINOR})
-if(FREEDV_VERSION_PATCH)
-    set(FREEDV_VERSION ${FREEDV_VERSION}.${FREEDV_VERSION_PATCH})
-endif()
+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()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3e9fd687..18029227 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -144,7 +144,7 @@ if(APPLE)
     add_custom_command(
         TARGET FreeDV
         POST_BUILD
-        COMMAND rm -rf dist_tmp || true
+        COMMAND rm -rf dist_tmp FreeDV.dmg || true
         COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${LPCNET_BUILD_DIR}/src:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${LPCNET_BUILD_DIR}/src -s ${CODEC2_BUILD_DIR}/src 
         COMMAND cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/freedv.icns FreeDV.app/Contents/Resources
         COMMAND mkdir dist_tmp