[benchmark] NFC: Turn benchmark ON on all non-Windows buildbots

The problems with benchmark build should be fixed now, but Windows
buildbots still run into errors seemingly because of the bug in
clang-cl. Because of that, benchmark shouldn't be built on Windows at
this point.

llvm-svn: 340905

diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index 0867b4b..ff21850 100644 (file)
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -495,7 +495,12 @@ option(LLVM_INCLUDE_GO_TESTS "Include the Go bindings tests in test build target
 
 option(LLVM_BUILD_BENCHMARKS "Add LLVM benchmark targets to the list of default
 targets. If OFF, benchmarks still could be built using Benchmarks target." OFF)
-option(LLVM_INCLUDE_BENCHMARKS "Generate benchmark targets. If OFF, benchmarks can't be built." OFF)
+option(LLVM_INCLUDE_BENCHMARKS "Generate benchmark targets. If OFF, benchmarks
+can't be built. This is set to OFF for Windows." ON)
+
+if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+  set(LLVM_INCLUDE_BENCHMARKS OFF)
+endif()
 
 option (LLVM_BUILD_DOCS "Build the llvm documentation." OFF)
 option (LLVM_INCLUDE_DOCS "Generate build targets for llvm documentation." ON)

diff --git a/llvm/docs/CMake.rst b/llvm/docs/CMake.rst
index c6d5cd9..e3460ac 100644 (file)
--- a/llvm/docs/CMake.rst
+++ b/llvm/docs/CMake.rst
@@ -254,7 +254,8 @@ LLVM-specific variables
   Adds benchmarks to the list of default targets. Defaults to OFF.
 
 **LLVM_INCLUDE_BENCHMARKS**:BOOL
-  Generate build targets for the LLVM benchmarks. Defaults to OFF.
+  Generate build targets for the LLVM benchmarks. Defaults to ON, but is set
+  to OFF on Windows.
 
 **LLVM_APPEND_VC_REV**:BOOL
   Embed version control revision info (svn revision number or Git revision id).