VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-22 17:45:48 -05:00
Code Issues Projects Releases Wiki Activity

Cache version numbers, so they can be used in other scripts

Browse Source
This commit is contained in:
Jon Beniston 2023-09-24 14:55:56 +01:00
parent ad7c08d05c
commit 9a6ade37d9
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/sdrangel.yml vendored
View File

@ -43,7 +43,11 @@ jobs:
echo github.workspace: ${{ github.workspace }}
- name: Get version
id: get_version
run: echo "version=$(git describe --tags | cut -c2-)" >> $env:GITHUB_OUTPUT
run: echo "version=$(grep sdrangel_VERSION CMakeCache.txt | cut -d "=" -f2)" >> $env:GITHUB_OUTPUT
#run: echo "version=$(git describe --tags | cut -c2-)" >> $env:GITHUB_OUTPUT
- name: Diplay version
run:
echo ${{ steps.get_version.outputs.version }}
- name: Install basic dependencies on Windows
if: startsWith(matrix.config.os, 'windows')
run: |
@ -107,7 +111,8 @@ jobs:
# Need with clause so git describe --tags works
- name: Get version
id: get_version
run: echo "version=$(git describe --tags | cut -c2-)" >> $GITHUB_OUTPUT
run: echo "version=$(grep CPACK_PACKAGE_FILE_NAME CMakeCache.txt | cut -d "=" -f2)" >> $GITHUB_OUTPUT
#
# Requires git fetch --tags upstream to have been run on the branch!
# git remote add upstream https://github.com/f4exb/sdrangel.git
# git fetch --tags upstream

2
CMakeLists.txt
View File

@ -173,7 +173,7 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/")
endif()
endif()
set(sdrangel_VERSION "${sdrangel_VERSION_MAJOR}.${sdrangel_VERSION_MINOR}.${sdrangel_VERSION_PATCH}${sdrangel_VERSION_SUFFIX}")
set(sdrangel_VERSION "${sdrangel_VERSION_MAJOR}.${sdrangel_VERSION_MINOR}.${sdrangel_VERSION_PATCH}${sdrangel_VERSION_SUFFIX}" CACHE INTERNAL "")
message(STATUS "${APPLICATION_NAME} Version: ${sdrangel_VERSION}")
add_definitions("-DSDRANGEL_LIB_VERSION=\"${sdrangel_VERSION_MAJOR}.${sdrangel_VERSION_MINOR}.${sdrangel_VERSION_PATCH}\"")
add_definitions("-DSDRANGEL_VERSION=\"${sdrangel_VERSION}\"")

2
cmake/cpack/CMakeLists.txt
View File

@ -36,7 +36,7 @@ if(APPLE AND BUNDLE AND BUILD_GUI)
set(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/cmake/cpack/sdrangel_icon.icns")
set(CPACK_BUNDLE_PLIST "${CMAKE_BINARY_DIR}/Info.plist")
set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/cpack/sdrangel_icon.icns")
set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}_${CPACK_MACOS_PACKAGE_ARCHITECTURE}_${CMAKE_SYSTEM_PROCESSOR}")
set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}_${CPACK_MACOS_PACKAGE_ARCHITECTURE}_${CMAKE_SYSTEM_PROCESSOR}" CACHE INTERNAL "")
set(CPACK_PRE_BUILD_SCRIPTS "${PROJECT_BINARY_DIR}/deploy_mac.cmake")
# copy SoapySDR Modules