<div dir="ltr">Hi,<div><br></div><div><font face="arial, sans-serif">Now LLVM_COMPILE_FLAGS set in add_unittest is ignored, and I see a bunch of warnings:</font><br></div><div><font face="arial, sans-serif"><div>/llvm/utils/unittest/googletest/include/gtest/gtest-typed-test.h:239:47: warning: anonymous variadic macros were introduced in C99 [-Wvariadic-macros]</div>
<div><br></div></font></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Jan 28, 2014 at 1:44 PM, NAKAMURA Takumi <span dir="ltr"><<a href="mailto:geek4civic@gmail.com" target="_blank">geek4civic@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: chapuni<br>
Date: Tue Jan 28 03:44:06 2014<br>
New Revision: 200301<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=200301&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=200301&view=rev</a><br>
Log:<br>
[CMake] Enhance llvm_update_compile_flags(name sources) to handle LLVM_REQUIRES_EH and LLVM_REQUIRES_RTTI.<br>
<br>
LLVM_REQUIRES_EH implies LLVM_REQUIRES_RTTI. It is as same behavior as Makefile.rule's.<br>
llvm/examples/ExceptionDemo is affected. (It was built with -fno-rtti.)<br>
<br>
For MSVC, Remove flags like "/EHsc /GR" in HandleLLVMOptions, or CL.EXE complains with flags like "/GR /GR-".<br>
<br>
llvm_update_compile_flags() updates source file property if the target contains *.c.<br>
COMPILE_FLAGS in target properties affects both C++ and C!<br>
<br>
LLVM_NO_RTTI is deprecated. It was introduced by me and was my mistake.<br>
<br>
Modified:<br>
llvm/trunk/cmake/modules/AddLLVM.cmake<br>
llvm/trunk/cmake/modules/HandleLLVMOptions.cmake<br>
<br>
Modified: llvm/trunk/cmake/modules/AddLLVM.cmake<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=200301&r1=200300&r2=200301&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=200301&r1=200300&r2=200301&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)<br>
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Tue Jan 28 03:44:06 2014<br>
@@ -3,20 +3,45 @@ include(LLVMProcessSources)<br>
include(LLVM-Config)<br>
<br>
function(llvm_update_compile_flags name)<br>
- get_property(target_compile_flags TARGET ${name} PROPERTY COMPILE_FLAGS)<br>
- if(NOT "${LLVM_COMPILE_FLAGS}" STREQUAL "")<br>
- set(target_compile_flags "${target_compile_flags} ${LLVM_COMPILE_FLAGS}")<br>
+ set(ALL_SOURCES ${ARGN})<br>
+ if("${ALL_SOURCES}" MATCHES "\\.c(;|$)")<br>
+ set(update_src_props ON)<br>
endif()<br>
- if(LLVM_NO_RTTI)<br>
+<br>
+ if(LLVM_REQUIRES_EH)<br>
+ set(LLVM_REQUIRES_RTTI ON)<br>
+ else()<br>
+ if(LLVM_COMPILER_IS_GCC_COMPATIBLE)<br>
+ set(target_compile_flags "${target_compile_flags} -fno-exceptions")<br>
+ elseif(MSVC)<br>
+ list(APPEND LLVM_COMPILE_DEFINITIONS _HAS_EXCEPTIONS=0)<br>
+ set(target_compile_flags "${target_compile_flags} /EHs-c-")<br>
+ endif()<br>
+ endif()<br>
+<br>
+ if(NOT LLVM_REQUIRES_RTTI)<br>
list(APPEND LLVM_COMPILE_DEFINITIONS GTEST_HAS_RTTI=0)<br>
if (LLVM_COMPILER_IS_GCC_COMPATIBLE)<br>
set(target_compile_flags "${target_compile_flags} -fno-rtti")<br>
elseif (MSVC)<br>
- llvm_replace_compiler_option(target_compile_flags "/GR" "/GR-")<br>
+ set(target_compile_flags "${target_compile_flags} /GR-")<br>
endif ()<br>
endif()<br>
<br>
- set_property(TARGET ${name} PROPERTY COMPILE_FLAGS "${target_compile_flags}")<br>
+ if(update_src_props)<br>
+ foreach(fn ${ALL_SOURCES})<br>
+ get_filename_component(suf ${fn} EXT)<br>
+ if("${suf}" STREQUAL ".cpp")<br>
+ set_property(SOURCE ${fn} APPEND_STRING PROPERTY<br>
+ COMPILE_FLAGS "${target_compile_flags}")<br>
+ endif()<br>
+ endforeach()<br>
+ else()<br>
+ # Update target props, since all sources are C++.<br>
+ set_property(TARGET ${name} APPEND_STRING PROPERTY<br>
+ COMPILE_FLAGS "${target_compile_flags}")<br>
+ endif()<br>
+<br>
set_property(TARGET ${name} APPEND PROPERTY COMPILE_DEFINITIONS ${LLVM_COMPILE_DEFINITIONS})<br>
endfunction()<br>
<br>
@@ -137,6 +162,7 @@ macro(add_llvm_library name)<br>
add_library( ${name} ${ALL_FILES} )<br>
set_output_directory(${name} ${LLVM_RUNTIME_OUTPUT_INTDIR} ${LLVM_LIBRARY_OUTPUT_INTDIR})<br>
set_property( GLOBAL APPEND PROPERTY LLVM_LIBS ${name} )<br>
+ llvm_update_compile_flags(${name} ${ALL_FILES})<br>
add_dead_strip( ${name} )<br>
if( LLVM_COMMON_DEPENDS )<br>
add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} )<br>
@@ -196,6 +222,7 @@ ${name} ignored.")<br>
add_library( ${name} ${libkind} ${ALL_FILES} )<br>
set_output_directory(${name} ${LLVM_RUNTIME_OUTPUT_INTDIR} ${LLVM_LIBRARY_OUTPUT_INTDIR})<br>
set_target_properties( ${name} PROPERTIES PREFIX "" )<br>
+ llvm_update_compile_flags(${name} ${ALL_FILES})<br>
add_dead_strip( ${name} )<br>
<br>
if (LLVM_EXPORTED_SYMBOL_FILE)<br>
@@ -237,6 +264,7 @@ macro(add_llvm_executable name)<br>
else()<br>
add_executable(${name} ${ALL_FILES})<br>
endif()<br>
+ llvm_update_compile_flags(${name} ${ALL_FILES})<br>
add_dead_strip( ${name} )<br>
<br>
if (LLVM_EXPORTED_SYMBOL_FILE)<br>
@@ -374,7 +402,7 @@ function(add_unittest test_suite test_na<br>
set(LLVM_COMPILE_FLAGS "-Wno-variadic-macros")<br>
endif ()<br>
<br>
- set(LLVM_NO_RTTI ON)<br>
+ set(LLVM_REQUIRES_RTTI OFF)<br>
<br>
add_llvm_executable(${test_name} ${ARGN})<br>
set(outdir ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR})<br>
@@ -390,7 +418,6 @@ function(add_unittest test_suite test_na<br>
if (NOT ${test_suite_folder} STREQUAL "NOTFOUND")<br>
set_property(TARGET ${test_name} PROPERTY FOLDER "${test_suite_folder}")<br>
endif ()<br>
- llvm_update_compile_flags(${test_name})<br>
endfunction()<br>
<br>
# This function provides an automatic way to 'configure'-like generate a file<br>
<br>
Modified: llvm/trunk/cmake/modules/HandleLLVMOptions.cmake<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/HandleLLVMOptions.cmake?rev=200301&r1=200300&r2=200301&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/HandleLLVMOptions.cmake?rev=200301&r1=200300&r2=200301&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/cmake/modules/HandleLLVMOptions.cmake (original)<br>
+++ llvm/trunk/cmake/modules/HandleLLVMOptions.cmake Tue Jan 28 03:44:06 2014<br>
@@ -359,3 +359,11 @@ if(NOT CYGWIN AND NOT WIN32)<br>
append("-ffunction-sections -fdata-sections" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)<br>
endif()<br>
endif()<br>
+<br>
+if(MSVC)<br>
+ # Remove flags here, for exceptions and RTTI.<br>
+ # Each target property of source proerty should be responsible to control them.<br>
+ # CL.EXE complains to override flags like "/GR /GR-".<br>
+ string(REGEX REPLACE "(^| ) */EH[-cs]+ *( |$)" "\\1 \\2" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")<br>
+ string(REGEX REPLACE "(^| ) */GR-? *( |$)" "\\1 \\2" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")<br>
+endif()<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div>Alexey Samsonov, MSK</div>
</div>