Skip to content

Use valid Semver versions for pre-releases #5636

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

Merged
Spekular merged 9 commits into from
Sep 17, 2020
Merged

Use valid Semver versions for pre-releases #5636

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f2990bf
Fix ProjectVersion handling of pre-releases
Spekular Aug 16, 2020
8b400ba
Add workaround for old, non-standard version
Spekular Aug 21, 2020
c860b78
Attempt to fix versioning
Spekular Aug 21, 2020
a4a6b27
More consistent comments
Spekular Aug 26, 2020
6a73c28
Apply suggestions from code review
Spekular Sep 6, 2020
30a0346
CMAKE fixes from code review
Spekular Sep 9, 2020
de05889
Remove unnecessary changes to CMake logic
Spekular Sep 10, 2020
e034f69
More const, more reference
Spekular Sep 10, 2020
888e87d
Apply suggestions from code review
Spekular Sep 17, 2020
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
Prev Previous commit
Next Next commit
CMAKE fixes from code review 
Co-authored-by: Tres Finocchiaro <tres.finocchiaro@gmail.com>
  • Loading branch information
@Spekular @tresf
Spekular and tresf authored Sep 9, 2020
commit 30a03465c2f909e2a718d8830e40dbf9ce28e1fe
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ IF(VERSION_STAGE)
ENDIF()
IF(VERSION_BUILD)
MATH(EXPR VERSION_RELEASE_BUMP "${VERSION_RELEASE}+1")
SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE_BUMP"})
SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE_BUMP}")
SET(VERSION "${VERSION}-${VERSION_BUILD}")
ENDIF()

Expand Down
2 changes: 1 addition & 1 deletion cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ IF(VERSION_STAGE)
SET(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}-${VERSION_STAGE}")
ENDIF()
IF(VERSION_BUILD)
math(EXPR CPACK_PACKAGE_VERSION_PATH_BUMP "${CPACK_PACKAGE_VERSION_PATH}+1")
MATH(EXPR CPACK_PACKAGE_VERSION_PATH_BUMP "${CPACK_PACKAGE_VERSION_PATH}+1")
SET(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH_BUMP}-${VERSION_BUILD}")
ENDIF()
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME_UCASE}")
Expand Down