Move duplicate Windows-specific compiler flags to a common CMake variable

[rnk]

drive by nits that were already there

cmake/Modules/AddCompilerRT.cmake

129

Can we use -isystem to suppress these? Does -D_CRT_SECURE_NO_WARNINGS solve this problem?

137

ditto, this can be handled with -isystem.

[samsonov]

I'm ok with this patch. Deferring this to Reid who apparently knows more about Windows-specific warnings.

cmake/Modules/AddCompilerRT.cmake

116

Remove ""

[timurrrr]

Can you elaborate on the -isystem approach? I'm not sure I know what you're
taking about.
29 мая 2014 г. 21:03 пользователь "Reid Kleckner" <[e-mail]> написал:

drive by nits that were already there

Comment at: cmake/Modules/AddCompilerRT.cmake:129
@@ -126,1 +128,3 @@
if(MSVC)
+ # MSVC system headers and gtest use a lot of deprecated stuff.

+ list(APPEND COMPILER_RT_TEST_CFLAGS

Can we use -isystem to suppress these? Does -D_CRT_SECURE_NO_WARNINGS
solve this problem?

Comment at: cmake/Modules/AddCompilerRT.cmake:137
@@ +136,3 @@
+
+ # We should teach clang to understand more pragmas.

+ list(APPEND COMPILER_RT_TEST_CFLAGS

ditto, this can be handled with -isystem.

http://reviews.llvm.org/D3952

[timurrrr]

2014-05-29 21:03 GMT+04:00 Reid Kleckner <[e-mail]>:

drive by nits that were already there

Comment at: cmake/Modules/AddCompilerRT.cmake:129
@@ -126,1 +128,3 @@
if(MSVC)
+ # MSVC system headers and gtest use a lot of deprecated stuff.

+ list(APPEND COMPILER_RT_TEST_CFLAGS

Can we use -isystem to suppress these? Does -D_CRT_SECURE_NO_WARNINGS
solve this problem?\

-D_CRT_SECURE_NO_WARNINGS doesn't solve the problem.

Comment at: cmake/Modules/AddCompilerRT.cmake:137
@@ +136,3 @@
+
+ # We should teach clang to understand more pragmas.

+ list(APPEND COMPILER_RT_TEST_CFLAGS

ditto, this can be handled with -isystem.

In fact, the warning comes from the sanitizer runtime code.

[timurrrr]

I've landed a reduced and regrouped version of the patch as r209889 -- so it's easier to work on further stuff.

Please tell me if you think I should improve anything in particular and strongly feel we need to do that for test flags.

cmake/Modules/AddCompilerRT.cmake

     COMPILE_DEFINITIONS ${LIB_DEFS})
   set_target_properties(${name} PROPERTIES
     OSX_ARCHITECTURES "${LIB_ARCH}"
     LIBRARY_OUTPUT_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR})
   install(TARGETS ${name}
     LIBRARY DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR})
 endmacro()
 
+set(COMPILER_RT_TEST_CFLAGS "")
+
 # Unittests support.
 set(COMPILER_RT_GTEST_PATH ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest)
 set(COMPILER_RT_GTEST_SOURCE ${COMPILER_RT_GTEST_PATH}/src/gtest-all.cc)
 set(COMPILER_RT_GTEST_CFLAGS
   -DGTEST_NO_LLVM_RAW_OSTREAM=1
   -DGTEST_HAS_RTTI=0
   -I${COMPILER_RT_GTEST_PATH}/include
   -I${COMPILER_RT_GTEST_PATH}
 )
 
 if(MSVC)
+  # MSVC system headers and gtest use a lot of deprecated stuff.
+  list(APPEND COMPILER_RT_TEST_CFLAGS
+       -Wno-deprecated-declarations)
+
+  # clang doesn't support exceptions on Windows yet.
+  list(APPEND COMPILER_RT_TEST_CFLAGS
+       -D_HAS_EXCEPTIONS=0)
+
+  # We should teach clang to understand more pragmas.
+  list(APPEND COMPILER_RT_TEST_CFLAGS
+       -Wno-unknown-pragmas
+       -Wno-undefined-inline)
+
   # Clang doesn't support SEH on Windows yet.
   list(APPEND COMPILER_RT_GTEST_CFLAGS -DGTEST_HAS_SEH=0)
 endif()
 
 # Link objects into a single executable with COMPILER_RT_TEST_COMPILER,
 # using specified link flags. Make executable a part of provided
 # test_suite.
 # add_compiler_rt_test(<test_suite> <test_name>

lib/asan/tests/CMakeLists.txt

 include_directories(../..)
 
 set(ASAN_UNITTEST_HEADERS
   asan_mac_test.h
   asan_test_config.h
   asan_test_utils.h)
 
 set(ASAN_UNITTEST_COMMON_CFLAGS
+  ${COMPILER_RT_TEST_CFLAGS}
   ${COMPILER_RT_GTEST_CFLAGS}
   -I${COMPILER_RT_SOURCE_DIR}/include
   -I${COMPILER_RT_SOURCE_DIR}/lib
   -I${COMPILER_RT_SOURCE_DIR}/lib/asan
   -I${COMPILER_RT_SOURCE_DIR}/lib/sanitizer_common/tests
   -fno-rtti
   -O2
   -Wno-format
   -Werror=sign-compare)
 append_if(COMPILER_RT_HAS_WNO_VARIADIC_MACROS_FLAG -Wno-variadic-macros ASAN_UNITTEST_COMMON_CFLAGS)
 
 # -gline-tables-only must be enough for ASan, so use it if possible.
 if(COMPILER_RT_TEST_COMPILER_ID MATCHES "Clang")
   list(APPEND ASAN_UNITTEST_COMMON_CFLAGS -gline-tables-only)
 else()
   list(APPEND ASAN_UNITTEST_COMMON_CFLAGS -g)
 endif()
 
-if(MSVC)
-  # MSVC system headers and gtest use a lot of deprecated stuff.
-  list(APPEND ASAN_UNITTEST_COMMON_CFLAGS
-       -Wno-deprecated-declarations)
-
-  # clang doesn't support exceptions on Windows yet.
-  list(APPEND ASAN_UNITTEST_COMMON_CFLAGS
-       -D_HAS_EXCEPTIONS=0)
-
-  # We should teach clang to understand more pragmas.
-  list(APPEND ASAN_UNITTEST_COMMON_CFLAGS
-       -Wno-unknown-pragmas
-       -Wno-undefined-inline)
-endif()
-
 # Use -D instead of definitions to please custom compile command.
 list(APPEND ASAN_UNITTEST_COMMON_CFLAGS
   -DASAN_HAS_BLACKLIST=1
   -DASAN_HAS_EXCEPTIONS=1
   -DASAN_UAR=0)
 
 set(ASAN_BLACKLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/asan_test.ignore")
 set(ASAN_UNITTEST_INSTRUMENTED_CFLAGS

lib/sanitizer_common/tests/CMakeLists.txt

set(SANITIZER_TEST_HEADERS
   sanitizer_pthread_wrappers.h
   sanitizer_test_config.h
   sanitizer_test_utils.h)
 foreach(header ${SANITIZER_HEADERS})
   list(APPEND SANITIZER_TEST_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../${header})
 endforeach()
 
 set(SANITIZER_TEST_CFLAGS_COMMON
+  ${COMPILER_RT_TEST_CFLAGS}
   ${COMPILER_RT_GTEST_CFLAGS}
   -I${COMPILER_RT_SOURCE_DIR}/include
   -I${COMPILER_RT_SOURCE_DIR}/lib
   -I${COMPILER_RT_SOURCE_DIR}/lib/sanitizer_common
   -fno-rtti
   -O2
   -Werror=sign-compare
   -Wno-non-virtual-dtor)
 
 # -gline-tables-only must be enough for these tests, so use it if possible.
 if(COMPILER_RT_TEST_COMPILER_ID MATCHES "Clang")
   list(APPEND ASAN_UNITTEST_COMMON_CFLAGS -gline-tables-only)
 else()
   list(APPEND ASAN_UNITTEST_COMMON_CFLAGS -g)
 endif()
 
-if(MSVC)
-  # MSVC system headers and gtest use a lot of deprecated stuff.
-  list(APPEND SANITIZER_TEST_CFLAGS_COMMON
-       -Wno-deprecated-declarations)
-
-  # clang doesn't support exceptions on Windows yet.
-  list(APPEND SANITIZER_TEST_CFLAGS_COMMON
-       -D_HAS_EXCEPTIONS=0)
-
-  # We should teach clang to understand more pragmas.
-  list(APPEND SANITIZER_TEST_CFLAGS_COMMON
-       -Wno-unknown-pragmas
-       -Wno-undefined-inline)
-endif()
-
 if(NOT MSVC)
   list(APPEND SANITIZER_TEST_LINK_FLAGS_COMMON --driver-mode=g++)
 endif()
 
 append_if(COMPILER_RT_HAS_LIBDL -ldl SANITIZER_TEST_LINK_FLAGS_COMMON)
 append_if(COMPILER_RT_HAS_LIBPTHREAD -lpthread SANITIZER_TEST_LINK_FLAGS_COMMON)
 # x86_64 FreeBSD 9.2 additionally requires libc++ to build the tests.
 if(CMAKE_SYSTEM MATCHES "FreeBSD-9.2-RELEASE")