Skip to content

Commit 77993dc

Browse files
lukaszgotszaldintelsys_zuul
authored andcommitted
rename flag IGC_BUILD__SPIRV-Tools
Change-Id: If78d453441f30d82dfbd2409baea9eee3e8c5919
1 parent 878b804 commit 77993dc

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

IGC/AdaptorOCL/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ add_library("${IGC_BUILD__PROJ__AdaptorOCL}" STATIC
140140
)
141141

142142
add_dependencies("${IGC_BUILD__PROJ__AdaptorOCL}" "${IGC_BUILD__PROJ__GenISAIntrinsics}")
143-
if(IGC_BUILD__SPIRV-Tools)
143+
if(IGC_BUILD__SPIRV_TOOLS_ENABLED)
144144
target_compile_definitions("${IGC_BUILD__PROJ__AdaptorOCL}" PRIVATE $<$<NOT:$<CONFIG:Release>>:IGC_BUILD_SPIRV_TOOLS>)
145145
target_include_directories("${IGC_BUILD__PROJ__AdaptorOCL}" PRIVATE $<$<NOT:$<CONFIG:Release>>:${IGC_BUILD__SPIRV-Tools_DIR}/include>)
146146
endif()

IGC/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3407,10 +3407,10 @@ add_subdirectory(GenISAIntrinsics)
34073407

34083408
# SPIRV-Tools are only inlcuded in Windows Debug and ReleaseInternal builds.
34093409
if(LLVM_ON_WIN32 AND (CMAKE_CONFIGURATION_TYPES OR ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") OR ("${CMAKE_BUILD_TYPE}" STREQUAL "ReleaseInternal")))
3410-
set(IGC_BUILD__SPIRV-Tools ON)
3410+
set(IGC_BUILD__SPIRV_TOOLS_ENABLED ON)
34113411
endif()
34123412

3413-
if(IGC_BUILD__SPIRV-Tools)
3413+
if(IGC_BUILD__SPIRV_TOOLS_ENABLED)
34143414
message(STATUS "============================ SPIRV-Tools project ============================")
34153415
set(IGC_BUILD__SPIRV-Headers_DIR "${BS_DIR_EXTERNAL_COMPONENTS}/build-tools/SPIRV-Headers")
34163416
set(IGC_BUILD__SPIRV-Tools_DIR "${BS_DIR_EXTERNAL_COMPONENTS}/build-tools/SPIRV-Tools")
@@ -3727,7 +3727,7 @@ foreach(_libBuildSuffix ${IGC_BUILD__MAIN_IGC_LIB_SUFFIXES})
37273727
"${IGC_BUILD__PROJ__AdaptorOGL}"
37283728
)
37293729

3730-
if(IGC_BUILD__SPIRV-Tools)
3730+
if(IGC_BUILD__SPIRV_TOOLS_ENABLED)
37313731
list(APPEND _targetLinkLineDebugAndReleaseInternalOnly
37323732
"${IGC_BUILD__PROJ__SPIRV-Tools}"
37333733
)
@@ -3790,7 +3790,7 @@ foreach(_libBuildSuffix ${IGC_BUILD__MAIN_IGC_LIB_SUFFIXES})
37903790
endif()
37913791
endforeach()
37923792

3793-
if(IGC_BUILD__SPIRV-Tools)
3793+
if(IGC_BUILD__SPIRV_TOOLS_ENABLED)
37943794
# Build only in Debug and ReleaseInternal
37953795
set_property(TARGET ${IGC_BUILD__PROJ__SPIRV-Tools} PROPERTY EXCLUDE_FROM_DEFAULT_BUILD_RELEASE TRUE)
37963796
endif()

IGC/DriverInterface/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
22

3-
if(IGC_BUILD__SPIRV-Tools)
3+
if(IGC_BUILD__SPIRV_TOOLS_ENABLED)
44
include_directories("${IGC_BUILD__SPIRV-Tools_DIR}/include")
55
endif()
66

0 commit comments

Comments
 (0)