@@ -3416,44 +3416,12 @@ endif()
34163416
34173417
34183418if (IGC_BUILD__SPIRV_TOOLS_ENABLED)
3419- message (STATUS "============================ SPIRV-Tools project ============================" )
3420- set (IGC_BUILD__SPIRV-Headers_DIR "${BS_DIR_EXTERNAL_COMPONENTS} /build-tools/SPIRV-Headers" )
3421- set (IGC_BUILD__SPIRV-Tools_DIR "${BS_DIR_EXTERNAL_COMPONENTS} /build-tools/SPIRV-Tools" )
3422- set (IGC_BUILD__SPIRV-Headers_OUTPUT_DIR "${IGC_OPTION__OUTPUT_DIR} /SPIRV-Headers" )
3423- set (IGC_BUILD__SPIRV-Tools_OUTPUT_DIR "${IGC_OPTION__OUTPUT_DIR} /SPIRV-Tools" )
3424- set (SPIRV-Headers_SOURCE_DIR "${IGC_BUILD__SPIRV-Headers_DIR}" )
3425- option (SKIP_SPIRV_TOOLS_INSTALL "Skip SPIRV-Tools installation" ON )
3426- option (SPIRV_SKIP_TESTS "Skip building SPIRV-Tools tests along with the library" ON )
3427- option (SPIRV_SKIP_EXECUTABLES "Skip building SPIRV-Tools executables and tests along with the library" ON )
3428- option (SPIRV_HEADERS_SKIP_INSTALL "Skip SPIRV-Headers installation" ON )
3429- option (SPIRV_HEADERS_SKIP_EXAMPLES "Skip building SPIRV-Headers examples" ON )
3430- message (STATUS "SPIRV-Tools source directory: ${IGC_BUILD__SPIRV-Tools_DIR}" )
3431- message (STATUS "SPIRV-Headers source directory: ${IGC_BUILD__SPIRV-Headers_DIR}" )
3432- message (STATUS "SPIRV-Tools output directory: ${IGC_BUILD__SPIRV-Tools_OUTPUT_DIR}" )
3433- message (STATUS "SPIRV-Headers output directory: ${IGC_BUILD__SPIRV-Headers_OUTPUT_DIR}" )
3434- message (STATUS "Option SKIP_SPIRV_TOOLS_INSTALL: ${SKIP_SPIRV_TOOLS_INSTALL} " )
3435- message (STATUS "Option SPIRV_SKIP_TESTS: ${SPIRV_SKIP_TESTS} " )
3436- message (STATUS "Option SPIRV_SKIP_EXECUTABLES: ${SPIRV_SKIP_EXECUTABLES} " )
3437- message (STATUS "Option SPIRV_HEADERS_SKIP_INSTALL: ${SPIRV_HEADERS_SKIP_INSTALL} " )
3438- message (STATUS "Option SPIRV_HEADERS_SKIP_EXAMPLES: ${SPIRV_HEADERS_SKIP_EXAMPLES} " )
3439- # add_subdirectory("${IGC_BUILD__SPIRV-Headers_DIR}" "${IGC_BUILD__SPIRV-Headers_OUTPUT_DIR}")
3440- add_subdirectory ("${IGC_BUILD__SPIRV-Tools_DIR}" "${IGC_BUILD__SPIRV-Tools_OUTPUT_DIR}" EXCLUDE_FROM_ALL )
3441- set (IGC_BUILD__PROJ__SPIRV-Tools "SPIRV-Tools" ) # same name as in subdirectory
3442- unset (IGC_BUILD__SPIRV-Headers_OUTPUT_DIR)
3443- unset (IGC_BUILD__SPIRV-Tools_OUTPUT_DIR)
3444- unset (SPIRV-Headers_SOURCE_DIR)
3445- unset (SKIP_SPIRV_TOOLS_INSTALL)
3446- unset (SPIRV_SKIP_TESTS)
3447- unset (SPIRV_SKIP_EXECUTABLES)
3448- unset (SPIRV_HEADERS_SKIP_INSTALL)
3449- unset (SPIRV_HEADERS_SKIP_EXAMPLES)
3419+ add_subdirectory ("${IGC_SOURCE_DIR} /../external/SPIRV-Tools" "${IGC_OPTION__OUTPUT_DIR} /external/SPIRV-Tools/config" EXCLUDE_FROM_ALL )
34503420 include_directories ("${IGC_BUILD__SPIRV-Headers_DIR}/include" )
34513421 include_directories ("${IGC_BUILD__SPIRV-Tools_DIR}/include" )
3452- set_target_properties ("${IGC_BUILD__PROJ__SPIRV-Tools}" PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD_RELEASE TRUE )
34533422 set_property (DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG IGC_SPIRV_TOOLS_ENABLED)
34543423 set_property (DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELEASEINTERNAL IGC_SPIRV_TOOLS_ENABLED)
34553424 igc_sg_define(IGC__SPIRV-Tools)
3456- message (STATUS "=============================================================================" )
34573425endif ()
34583426
34593427if (LLVM_ON_WIN32
0 commit comments