Disable spvc build by default. (google#542) (google#547)

When SHADERC_ENABLE_SPVC is OFF, do nothing with third_party/spirv-cross.

But use SHADERC_ENABLE_SPVC=ON for the bots.

CMakeLists.txt

@@ -16,7 +16,7 @@ endif()
 
 option(SHADERC_SKIP_SPVC "Skip libshaderc_spvc" ${SHADERC_SKIP_SPVC})
 if(NOT ${SHADERC_SKIP_SPVC})
-  set(SHADERC_ENABLE_SPVC ON)
+  set(SHADERC_ENABLE_SPVC OFF)
 endif()
 
 option(SHADERC_SKIP_TESTS "Skip building tests" ${SHADERC_SKIP_TESTS})

kokoro/android-release/build.sh

@@ -45,7 +45,7 @@ cd $SRC/build
 # Invoke the build.
 BUILD_SHA=${KOKORO_GITHUB_COMMIT:-$KOKORO_GITHUB_PULL_REQUEST_COMMIT}
 echo $(date): Starting build...
-cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_MAKE_PROGRAM=$NINJA -DANDROID_ABI=$TARGET_ARCH -DSHADERC_SKIP_TESTS=ON -DSPIRV_SKIP_TESTS=ON -DCMAKE_TOOLCHAIN_FILE=$NDK/build/cmake/android.toolchain.cmake -DANDROID_NDK=$NDK ..
+cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_MAKE_PROGRAM=$NINJA -DANDROID_ABI=$TARGET_ARCH -DSHADERC_ENABLE_SPVC=ON -DSHADERC_SKIP_TESTS=ON -DSPIRV_SKIP_TESTS=ON -DCMAKE_TOOLCHAIN_FILE=$NDK/build/cmake/android.toolchain.cmake -DANDROID_NDK=$NDK ..
 
 echo $(date): Build glslang...
 $NINJA glslangValidator

kokoro/linux/build.sh

@@ -77,7 +77,7 @@ cd $SRC/build
 # Invoke the build.
 BUILD_SHA=${KOKORO_GITHUB_COMMIT:-$KOKORO_GITHUB_PULL_REQUEST_COMMIT}
 echo $(date): Starting build...
-cmake -GNinja -DRE2_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=$BUILD_TYPE $ADDITIONAL_CMAKE_FLAGS $CMAKE_C_CXX_COMPILER ..
+cmake -GNinja -DSHADERC_ENABLE_SPVC=ON -DRE2_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=$BUILD_TYPE $ADDITIONAL_CMAKE_FLAGS $CMAKE_C_CXX_COMPILER ..
 
 echo $(date): Build glslang...
 ninja glslangValidator

kokoro/macos/build.sh

@@ -40,7 +40,7 @@ cd $SRC/build
 # Invoke the build.
 BUILD_SHA=${KOKORO_GITHUB_COMMIT:-$KOKORO_GITHUB_PULL_REQUEST_COMMIT}
 echo $(date): Starting build...
-cmake -GNinja -DRE2_BUILD_TESTING=OFF -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
+cmake -GNinja -DSHADERC_ENABLE_SPVC=ON -DRE2_BUILD_TESTING=OFF -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
 
 echo $(date): Build glslang...
 ninja glslangValidator

kokoro/windows/build.bat

@@ -56,7 +56,7 @@ if "%KOKORO_GITHUB_COMMIT%." == "." (
   set BUILD_SHA=%KOKORO_GITHUB_COMMIT%
 )
 
-set CMAKE_FLAGS=-DRE2_BUILD_TESTING=OFF -GNinja -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe
+set CMAKE_FLAGS=-DSHADERC_ENABLE_SPVC=ON -DRE2_BUILD_TESTING=OFF -GNinja -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe
 
 :: Skip building SPIRV-Tools tests for VS2013
 if %VS_VERSION% == 2013 (

third_party/CMakeLists.txt

@@ -75,22 +75,24 @@ if (NOT TARGET glslang)
   endif()
 endif()
 
-if (NOT TARGET spirv-cross-core)
-  if (IS_DIRECTORY ${SHADERC_SPIRV_CROSS_DIR})
-    set(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS ${DISABLE_EXCEPTIONS} CACHE BOOL "tell SPIRV-Cross not to throw" FORCE)
-
-    # Add -fPIC to SPIRV-Cross build.
-    set(CXX_BACK ${CMAKE_CXX_FLAGS})
-    set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-fPIC")
-    # cmake inserts a semicolon, change it to a space.
-    string(REGEX REPLACE ";" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    add_subdirectory(${SHADERC_SPIRV_CROSS_DIR} spirv-cross)
-    set(CMAKE_CXX_FLAGS ${CXX_BACK})
-  endif()
+if (SHADERC_ENABLE_SPVC)
   if (NOT TARGET spirv-cross-core)
-    message(FATAL_ERROR "SPIRV-Cross was not found - required for compilation")
+    if (IS_DIRECTORY ${SHADERC_SPIRV_CROSS_DIR})
+      set(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS ${DISABLE_EXCEPTIONS} CACHE BOOL "tell SPIRV-Cross not to throw" FORCE)
+
+      # Add -fPIC to SPIRV-Cross build.
+      set(CXX_BACK ${CMAKE_CXX_FLAGS})
+      set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-fPIC")
+      # cmake inserts a semicolon, change it to a space.
+      string(REGEX REPLACE ";" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+      add_subdirectory(${SHADERC_SPIRV_CROSS_DIR} spirv-cross)
+      set(CMAKE_CXX_FLAGS ${CXX_BACK})
+    endif()
+    if (NOT TARGET spirv-cross-core)
+      message(FATAL_ERROR "SPIRV-Cross was not found - required for compilation")
+    endif()
   endif()
-endif()
+endif (SHADERC_ENABLE_SPVC)
 
 if(${SHADERC_ENABLE_TESTS})
   # Configure out-of-source-directory tests for glslang.