Skip to content

Commit 6fb0416

Browse files
committed
Combine deps sync with download and update steps
1 parent 2f79050 commit 6fb0416

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

llvm/tools/spirv-tools/CMakeLists.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,18 @@ if (NOT SPIRV_DIS OR NOT SPIRV_VAL)
2323
BINARY_DIR ${BINARY_DIR}
2424
BUILD_COMMAND ${CMAKE_COMMAND} --build ${BINARY_DIR} --target spirv-dis spirv-val
2525
BUILD_BYPRODUCTS ${BINARY_DIR}/tools/spirv-dis ${BINARY_DIR}/tools/spirv-val
26+
DOWNLOAD_COMMAND git clone https://github.com/KhronosGroup/SPIRV-Tools.git SPIRVTools &&
27+
cd SPIRVTools &&
28+
${Python3_EXECUTABLE} utils/git-sync-deps
29+
UPDATE_COMMAND git pull origin main &&
30+
${Python3_EXECUTABLE} utils/git-sync-deps
2631
# Don't auto-update on every build.
2732
UPDATE_DISCONNECTED 1
2833
# Allow manual updating with an explicit SPIRVTools-update target.
2934
STEP_TARGETS update
35+
# Install handled below.
3036
INSTALL_COMMAND ""
3137
)
32-
33-
ExternalProject_Add_Step(SPIRVTools get-deps
34-
COMMENT "Getting SPIRV-Tools dependencies"
35-
COMMAND ${Python3_EXECUTABLE} utils/git-sync-deps
36-
DEPENDEES update
37-
WORKING_DIRECTORY <SOURCE_DIR>
38-
)
3938
endif ()
4039

4140
if (CMAKE_HOST_UNIX)

0 commit comments

Comments
 (0)