We compile SPIRV-Headers project and SPIRV-Tools project together in a single Visual Studio solution. Code of those are on external, open source repository. Sometimes we are witnesses of a random build break during SPIRV-Headers installation. We want to skip the installation process not only to avoid this issue, but also because we do not need it. I have added new CMake option SPIRV_HEADERS_SKIP_INSTALL to avoid installing SPIRV-Headers: KhronosGroup/SPIRV-Headers#131. However, recently SPIRV-Headers library has become an INTERFACE library. In the same time SPIRV-Tools sets property FOLDER quite often. This combination is not allowed by CMake. I have proposed another change to fix this conflict between libraries: KhronosGroup/SPIRV-Headers#132. But we do not need to compile SPIRV-Headers library at all. We just need to include its headers. So, finally I have decided to comment out instruction add_subdirectory for SPIRV-Headers.

Change-Id: I499bbddca76129bdc7061be43a599c1b16cf01e6

Author: lukaszgotszaldintel

IGC/CMakeLists.txt

@@ -3433,14 +3433,18 @@ if(IGC_BUILD__SPIRV-Tools)
     option(SKIP_SPIRV_TOOLS_INSTALL "Skip SPIRV-Tools installation" ON)
     option(SPIRV_SKIP_TESTS "Skip building SPIRV-Tools tests along with the library" ON)
     option(SPIRV_SKIP_EXECUTABLES "Skip building SPIRV-Tools executables and tests along with the library" ON)
-    message(STATUS "SPIRV-Tools source directory:    ${IGC_BUILD__SPIRV-Tools_DIR}")
-    message(STATUS "SPIRV-Headers source directory:  ${IGC_BUILD__SPIRV-Headers_DIR}")
-    message(STATUS "SPIRV-Tools output directory:    ${IGC_BUILD__SPIRV-Tools_OUTPUT_DIR}")
-    message(STATUS "SPIRV-Headers output directory:  ${IGC_BUILD__SPIRV-Headers_OUTPUT_DIR}")
+    option(SPIRV_HEADERS_SKIP_INSTALL "Skip SPIRV-Headers installation" ON)
+    option(SPIRV_HEADERS_SKIP_EXAMPLES "Skip building SPIRV-Headers examples" ON)
+    message(STATUS "SPIRV-Tools source directory: ${IGC_BUILD__SPIRV-Tools_DIR}")
+    message(STATUS "SPIRV-Headers source directory: ${IGC_BUILD__SPIRV-Headers_DIR}")
+    message(STATUS "SPIRV-Tools output directory: ${IGC_BUILD__SPIRV-Tools_OUTPUT_DIR}")
+    message(STATUS "SPIRV-Headers output directory: ${IGC_BUILD__SPIRV-Headers_OUTPUT_DIR}")
     message(STATUS "Option SKIP_SPIRV_TOOLS_INSTALL: ${SKIP_SPIRV_TOOLS_INSTALL}")
-    message(STATUS "Option SPIRV_SKIP_TESTS:         ${SPIRV_SKIP_TESTS}")
-    message(STATUS "Option SPIRV_SKIP_EXECUTABLES:   ${SPIRV_SKIP_EXECUTABLES}")
-    add_subdirectory("${IGC_BUILD__SPIRV-Headers_DIR}" "${IGC_BUILD__SPIRV-Headers_OUTPUT_DIR}")
+    message(STATUS "Option SPIRV_SKIP_TESTS: ${SPIRV_SKIP_TESTS}")
+    message(STATUS "Option SPIRV_SKIP_EXECUTABLES: ${SPIRV_SKIP_EXECUTABLES}")
+    message(STATUS "Option SPIRV_HEADERS_SKIP_INSTALL: ${SPIRV_HEADERS_SKIP_INSTALL}")
+    message(STATUS "Option SPIRV_HEADERS_SKIP_EXAMPLES: ${SPIRV_HEADERS_SKIP_EXAMPLES}")
+    # add_subdirectory("${IGC_BUILD__SPIRV-Headers_DIR}" "${IGC_BUILD__SPIRV-Headers_OUTPUT_DIR}")
     add_subdirectory("${IGC_BUILD__SPIRV-Tools_DIR}" "${IGC_BUILD__SPIRV-Tools_OUTPUT_DIR}")
     set(IGC_BUILD__PROJ__SPIRV-Tools "SPIRV-Tools")
     set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS IGC_BUILD_SPIRV_TOOLS)
@@ -3450,6 +3454,8 @@ if(IGC_BUILD__SPIRV-Tools)
     unset(SKIP_SPIRV_TOOLS_INSTALL)
     unset(SPIRV_SKIP_TESTS)
     unset(SPIRV_SKIP_EXECUTABLES)
+    unset(SPIRV_HEADERS_SKIP_INSTALL)
+    unset(SPIRV_HEADERS_SKIP_EXAMPLES)
     include_directories("${IGC_BUILD__SPIRV-Headers_DIR}/include")
     include_directories("${IGC_BUILD__SPIRV-Tools_DIR}/include")
     message(STATUS "=============================================================================")