[llvm] r183997 - Revert "Cmake: add compiler option in a more idiomatic way"

Rafael Espindola rafael.espindola at gmail.com
Fri Jun 14 12:41:05 PDT 2013


Author: rafael
Date: Fri Jun 14 14:41:05 2013
New Revision: 183997

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

Modified:
    llvm/trunk/cmake/modules/HandleLLVMOptions.cmake

Modified: llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/HandleLLVMOptions.cmake?rev=183997&r1=183996&r2=183997&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/HandleLLVMOptions.cmake (original)
+++ llvm/trunk/cmake/modules/HandleLLVMOptions.cmake Fri Jun 14 14:41:05 2013
@@ -268,6 +268,8 @@ add_llvm_definitions( -D__STDC_FORMAT_MA
 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()





More information about the llvm-commits mailing list