Merge lp:~alan-griffiths/miral/fix-for-zesty-gtest into lp:miral

[Alan Griffiths]

[tests] GTest relies on a gnu extension, so don't treat that extension as an error when compiling tests

[lp:~alan-griffiths/miral/fix-for-zesty-gtest]

458. By Alan Griffiths on 2016-11-29

g++ treats all -pedantic warnings as one feature

459. By Alan Griffiths on 2016-11-29

g++ ignores clang command line flags

[Gerry Boland (gerboland)]

works on gcc

review: Approve

=== modified file 'test/CMakeLists.txt'
--- test/CMakeLists.txt	2016-11-15 17:38:33 +0000
+++ test/CMakeLists.txt	2016-11-29 10:34:25 +0000
@@ -21,6 +21,16 @@
     endif()
 endif()
 
+# We can't tell which version of gtest we're building against and INSTANTIATE_TEST_CASE_P changed in
+# a way that relies on a gcc extension to support backward-compatible code, So...
+check_cxx_compiler_flag(-Wno-gnu-zero-variadic-macro-arguments MIRAL_COMPILE_WITH_W_NO_GNU_ZERO_VARIADIC_MACRO_ARGUMENTS)
+check_cxx_compiler_flag(-Wno-pedantic MIRAL_COMPILE_WITH_W_NO_PEDANTIC)
+if ("${CMAKE_CXX_COMPILER}" MATCHES ".*clang.*" AND MIRAL_COMPILE_WITH_W_NO_GNU_ZERO_VARIADIC_MACRO_ARGUMENTS)
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") # clang
+elseif(MIRAL_COMPILE_WITH_W_NO_PEDANTIC)
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pedantic") #gcc
+endif()
+
 include_directories(
         ${MIRTEST_INCLUDE_DIRS}
         ${GMOCK_INCLUDE_DIR}