Always include patch version in version string.
parent
4f2667a34f
commit
32c4376f4d
|
@ -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()
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue