Skip to content

Commit 1f19e54

Browse files
committed
Better cmake var name
1 parent 88ad7b7 commit 1f19e54

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/actions/cmake/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ runs:
7373
GITHUB_HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
7474
#
7575
# If tag is being pushed, or it's a nightly release, we use that version.
76-
FORCE_VERSION: ${{ inputs.version }}
76+
FORCE_CLIO_VERSION: ${{ inputs.version }}
7777
run: |
7878
cmake \
7979
-B "${BUILD_DIR}" \

cmake/ClioVersion.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ message(STATUS "Git branch: ${GIT_BUILD_BRANCH}")
2727
message(STATUS "Git commit hash: ${GIT_COMMIT_HASH}")
2828
message(STATUS "Build date: ${BUILD_DATE}")
2929

30-
if (DEFINED ENV{FORCE_VERSION} AND NOT "$ENV{FORCE_VERSION}" STREQUAL "")
31-
message(STATUS "Using explicitly provided '${FORCE_VERSION}' as Clio version")
30+
if (DEFINED ENV{FORCE_CLIO_VERSION} AND NOT "$ENV{FORCE_CLIO_VERSION}" STREQUAL "")
31+
message(STATUS "Using explicitly provided '${FORCE_CLIO_VERSION}' as Clio version")
3232

33-
set(CLIO_VERSION "$ENV{FORCE_VERSION}")
34-
set(DOC_CLIO_VERSION "$ENV{FORCE_VERSION}")
33+
set(CLIO_VERSION "$ENV{FORCE_CLIO_VERSION}")
34+
set(DOC_CLIO_VERSION "$ENV{FORCE_CLIO_VERSION}")
3535
else ()
3636
message(STATUS "Using 'YYYYMMDDHMS-<branch>-<git short rev>' as Clio version")
3737

0 commit comments

Comments
 (0)