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

[Kirill Bobyrev via llvm-commits]

Author: omtcyfz
Date: Wed Aug 29 01:59:36 2018
New Revision: 340905

URL: http://llvm.org/viewvc/llvm-project?rev=340905&view=rev
Log:
[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.

Modified:
    llvm/trunk/CMakeLists.txt
    llvm/trunk/docs/CMake.rst

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=340905&r1=340904&r2=340905&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Wed Aug 29 01:59:36 2018
@@ -495,7 +495,12 @@ option(LLVM_INCLUDE_GO_TESTS "Include th
 
 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)

Modified: llvm/trunk/docs/CMake.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CMake.rst?rev=340905&r1=340904&r2=340905&view=diff
==============================================================================
--- llvm/trunk/docs/CMake.rst (original)
+++ llvm/trunk/docs/CMake.rst Wed Aug 29 01:59:36 2018
@@ -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).