Skip to content

Commit c2b7e42

Browse files
[Autobackout][FuncReg]Revert of change: 97d8fa9
Cleanup cmake scripts Change-Id: I8be5a25b1b39ace29f3c5b1b70e3f0d7c5f425c8
1 parent 88f4362 commit c2b7e42

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

IGC/VectorCompiler/cmake/spirv.cmake

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,19 +123,19 @@ install(FILES
123123
)
124124

125125
elseif(NOT TARGET SPIRVDLL)
126-
if(DEFINED SPIRV_PREBUILD_DIR)
127-
set(PREBUILT_SPIRVDLL_PATH "${SPIRV_PREBUILD_DIR}/lib" )
128-
endif()
129126
if(DEFINED WIN32)
130127
set(SPIRVDLL_NAME "SPIRVDLL.dll")
131128
else()
132129
set(SPIRVDLL_NAME "libSPIRVDLL.so")
133130
endif()
131+
if(DEFINED SPIRV_PREBUILD_DIR)
132+
set(PREBUILT_SPIRVDLL_PATH "${SPIRV_PREBUILD_DIR}/lib" )
133+
endif()
134134
find_file(SPIRVDLL_LIB
135135
${SPIRVDLL_NAME}
136136
PATHS ${PREBUILT_SPIRVDLL_PATH}
137137
NO_DEFAULT_PATH
138-
)
138+
)
139139
if(NOT SPIRVDLL_LIB)
140140
message(FATAL_ERROR "[VC] Cannot find SPIRVDLL in prebuilds")
141141
endif()
@@ -151,6 +151,11 @@ elseif(NOT TARGET SPIRVDLL)
151151
DESTINATION $<CONFIG>/lh64
152152
RENAME ${INSTALL_SPRIRVDLL_NAME}
153153
)
154+
install(FILES ${SPIRVDLL_LIB}
155+
CONFIGURATIONS ReleaseInternal
156+
DESTINATION Release-Internal/lh64
157+
RENAME ${INSTALL_SPRIRVDLL_NAME}
158+
)
154159
endif()
155160
else()
156161
install(FILES

0 commit comments

Comments
 (0)