Skip to content

Commit 8160353

Browse files
committed
Address rabbit issues.
1 parent 392663f commit 8160353

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

exports/taskfiles/utils/cmake.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ tasks:
132132
# Required parameters
133133
# @param {string} NAME Project name that must match the CMake package name.
134134
# @param {string} TAR_SHA256 Content hash to verify the downloaded tar file against.
135-
# @param {string} TAR_URL
135+
# @param {string} TAR_URL URL of the tarball to download.
136136
# @param {string} WORK_DIR Base directory to store the build, install, and src directories inside.
137137
#
138138
# CMake parameters
@@ -156,21 +156,21 @@ tasks:
156156
# file.
157157
install-remote-tar:
158158
internal: true
159-
label: "{{.TASK}}:{{.NAME}}-{{.URL}}-{{.INSTALL_PREFIX}}"
159+
label: "{{.TASK}}:{{.NAME}}-{{.TAR_URL}}-{{.INSTALL_PREFIX}}"
160160
vars:
161161
# CMake parameters
162162
CMAKE_BUILD_ARGS:
163-
ref: "default (list) .BUILD_ARGS"
163+
ref: "default (list) .CMAKE_BUILD_ARGS"
164164
CMAKE_GEN_ARGS:
165-
ref: "default (list) .GEN_ARGS"
165+
ref: "default (list) .CMAKE_GEN_ARGS"
166166
CMAKE_INSTALL_ARGS:
167167
ref: "default (list) .CMAKE_INSTALL_ARGS"
168168
CMAKE_JOBS: >-
169-
{{default "" .JOBS}}
169+
{{default "" .CMAKE_JOBS}}
170170
CMAKE_SETTINGS_DIR: >-
171171
{{default (printf "%s/cmake-settings" .WORK_DIR) .CMAKE_SETTINGS_DIR}}
172172
CMAKE_TARGETS:
173-
ref: "default (list) .TARGETS"
173+
ref: "default (list) .CMAKE_TARGETS"
174174

175175
# Directory parameters
176176
BUILD_DIR: >-
@@ -187,7 +187,7 @@ tasks:
187187
vars:
188188
FILE_SHA256: "{{.TAR_SHA256}}"
189189
OUTPUT_DIR: "{{.SOURCE_DIR}}"
190-
URL: "{{.URL}}"
190+
URL: "{{.TAR_URL}}"
191191
cmds:
192192
- task: "generate"
193193
vars:

0 commit comments

Comments
 (0)