Skip to content

Add forced-version string override for releases and packaging #1008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add forced-version string override for releases and packaging #1008

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions scopehal/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,16 @@ get_target_property(Vulkan_INCLUDE_DIR Vulkan::Headers INTERFACE_INCLUDE_DIRECTO


#Set up versioning (with a dummy string for now if Git isn't present)
if(Git_FOUND)
execute_process(
COMMAND ${GIT_EXECUTABLE} describe --always --tags
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE SCOPEHAL_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
if (Git_FOUND OR SCOPEHAL_PACKAGE_VERSION)
if(NOT SCOPEHAL_PACKAGE_VERSION)
execute_process(
COMMAND ${GIT_EXECUTABLE} describe --always --tags
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE SCOPEHAL_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
else ()
set(SCOPEHAL_VERSION "${SCOPEHAL_PACKAGE_VERSION}")
endif ()
else()
set(SCOPEHAL_VERSION "unknown")
endif()
Expand Down