From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Fri, 14 Jun 2013 19:41:05 +0000 (+0000)
Subject: Revert "Cmake: add compiler option in a more idiomatic way"
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d132ce7a7503b38fc6dad7f4e1b3f6b7173e90a6;p=oota-llvm.git

Revert "Cmake: add compiler option in a more idiomatic way"

This reverts commit 183995.

It broke the bots:
http://bb.pgr.jp/builders/cmake-clang-x86_64-linux/builds/9730/steps/build_clang/logs/stdio

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183997 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
index b33632466c6..2939fa2afa2 100644
--- a/cmake/modules/HandleLLVMOptions.cmake
+++ b/cmake/modules/HandleLLVMOptions.cmake
@@ -268,6 +268,8 @@ add_llvm_definitions( -D__STDC_FORMAT_MACROS )
 add_llvm_definitions( -D__STDC_LIMIT_MACROS )
 
 # clang doesn't print colored diagnostics when invoked from Ninja
-if (UNIX AND CMAKE_GENERATOR STREQUAL "Ninja")
-  add_flag_if_supported("-fcolor-diagnostics")
+if (UNIX AND
+    CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
+    CMAKE_GENERATOR STREQUAL "Ninja")
+  append("-fcolor-diagnostics" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
 endif()