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

[Alan Griffiths]

Fix build with clang++

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

291. By Alan Griffiths on 2016-08-22

Link workaround to Mir bug (lp:1615587)

[Gerry Boland (gerboland)]

Failed here in xenial+overlay:

[80/235] Building CXX object test/CMakeFiles/miral-test.dir/mru_window_list.cpp.o
FAILED: /usr/lib/ccache/clang++ -I../include -isystem /usr/include/mirclient -isystem /usr/include/mircommon -isystem /usr/include/mircookie -I/usr/include/mirtest -I/usr/include/mirserver -I/usr/include/mirplatform -Wno-mismatched-tags -pthread -g -Werror -Wall -pedantic -Wextra -fPIC -fuse-ld=gold -Wno-unused-command-line-argument -Wnon-virtual-dtor -std=c++14 -Wno-mismatched-tags -Wno-return-type-c-linkage -MMD -MT test/CMakeFiles/miral-test.dir/mru_window_list.cpp.o -MF test/CMakeFiles/miral-test.dir/mru_window_list.cpp.o.d -o test/CMakeFiles/miral-test.dir/mru_window_list.cpp.o -c ../test/mru_window_list.cpp
In file included from ../test/mru_window_list.cpp:22:
/usr/include/mirtest/mir/test/doubles/stub_session.h:92:24: error: 'create_buffer' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override]
    graphics::BufferID create_buffer(graphics::BufferProperties const& properties);
                       ^
/usr/include/mirserver/mir/scene/session.h:72:32: note: overridden virtual function is here
    virtual graphics::BufferID create_buffer(graphics::BufferProperties const& properties) = 0;
                               ^
In file included from ../test/mru_window_list.cpp:22:
/usr/include/mirtest/mir/test/doubles/stub_session.h:93:10: error: 'destroy_buffer' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override]
    void destroy_buffer(graphics::BufferID);
         ^
/usr/include/mirserver/mir/scene/session.h:73:18: note: overridden virtual function is here
    virtual void destroy_buffer(graphics::BufferID) = 0;
                 ^
In file included from ../test/mru_window_list.cpp:22:
/usr/include/mirtest/mir/test/doubles/stub_session.h:94:39: error: 'get_buffer' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override]
    std::shared_ptr<graphics::Buffer> get_buffer(graphics::BufferID);
                                      ^
/usr/include/mirserver/mir/scene/session.h:74:47: note: overridden virtual function is here
    virtual std::shared_ptr<graphics::Buffer> get_buffer(graphics::BufferID) = 0;
                                              ^
3 errors generated.
[80/235] Building CXX object miral-qt/tests/framework/CMakeFiles/qtmir-test-framework-static.dir/fake_mirsurface.cpp.o
ninja: build stopped: subcommand failed.

review: Needs Fixing

[Gerry Boland (gerboland)]

Command used:
cmake .. -DMIRAL_ENABLE_QT=1 -DMIRAL_ENABLE_TESTS=1 -DCMAKE_CXX_COMPILER=clang++ -GNinja

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

292. By Alan Griffiths on 2016-08-22

merge :parent

293. By Alan Griffiths on 2016-08-22

Workaround lp:1615646

[Alan Griffiths (alan-griffiths)]

> Failed here in xenial+overlay:
> /usr/include/mirtest/mir/test/doubles/stub_session.h:92:24: error:
> 'create_buffer' overrides a member function but is not marked 'override'
> [-Werror,-Winconsistent-missing-override]
> graphics::BufferID create_buffer(graphics::BufferProperties const&
> properties);

Logged as Mir bug lp:1615646 and workaround added to MirAL

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

294. By Alan Griffiths on 2016-08-22

Mir already fixed on trunk

[Gerry Boland (gerboland)]

Yep, works now, thanks

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-08-19 10:54:39 +0000
+++ CMakeLists.txt	2016-08-22 13:59:01 +0000
@@ -6,6 +6,7 @@
 endif()
 
 include (GNUInstallDirs)
+include(CheckCXXCompilerFlag)
 
 cmake_policy(SET CMP0015 NEW)
 cmake_policy(SET CMP0022 NEW)
@@ -24,7 +25,8 @@
 if (MIRAL_USE_LD_GOLD)
     set(MIRAL_COMPILER_FLAGS "${MIRAL_COMPILER_FLAGS} -fuse-ld=gold")
     set(MIRAL_LINKER_FLAGS     "${MIRAL_LINKER_FLAGS} -fuse-ld=gold")
-    if ("${CMAKE_CXX_COMPILER}" MATCHES "clang")
+    check_cxx_compiler_flag(-Wno-unused-command-line-argument MIRAL_COMPILE_WITH_W_NO_UNUSED_COMMAND_LINE_ARGUMENT)
+    if (MIRAL_COMPILE_WITH_W_NO_UNUSED_COMMAND_LINE_ARGUMENT)
         set(MIRAL_COMPILER_FLAGS "${MIRAL_COMPILER_FLAGS} -Wno-unused-command-line-argument")
     endif()
 endif()
@@ -39,6 +41,11 @@
     endif()
 endif()
 
+check_cxx_compiler_flag(-Wno-mismatched-tags MIRAL_COMPILE_WITH_W_NO_MISMATCHED_TAGS)
+if (MIRAL_COMPILE_WITH_W_NO_MISMATCHED_TAGS)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-mismatched-tags")
+endif()
+
 set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} ${MIRAL_COMPILER_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MIRAL_COMPILER_FLAGS} -Wnon-virtual-dtor -std=c++14")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MIRAL_LINKER_FLAGS}")

=== modified file 'test/CMakeLists.txt'
--- test/CMakeLists.txt	2016-08-19 10:54:39 +0000
+++ test/CMakeLists.txt	2016-08-22 13:59:01 +0000
@@ -1,3 +1,25 @@
+if (MIRTEST_VERSION VERSION_LESS 0.25)
+    # Mir used mix struct and class in public test headers (fixed -r 3606 in lp:mir)
+    check_cxx_compiler_flag(-Wno-mismatched-tags MIRAL_COMPILE_WITH_W_NO_MISMATCHED_TAGS)
+    if (MIRAL_COMPILE_WITH_W_NO_MISMATCHED_TAGS)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-mismatched-tags")
+    endif()
+
+    if (NOT MIRTEST_VERSION VERSION_LESS 0.24)
+        # Mir 0.24 shipped with inconsistent override use in mirtest/mir/test/doubles/stub_session.h (lp:1609612)
+        check_cxx_compiler_flag(-Wno-inconsistent-missing-override MIRAL_COMPILE_WITH_W_NO_INCONSISTENT_MISSING_OVERRIDE)
+        if (MIRAL_COMPILE_WITH_W_NO_INCONSISTENT_MISSING_OVERRIDE)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override")
+        endif()
+    endif()
+endif()
+
+# Mir uses "C" linkage to avoid name-mangling some functions that are not intended not for C compatibility (lp:1615587)
+check_cxx_compiler_flag(-Wno-return-type-c-linkage MIRAL_COMPILE_WITH_W_RETURN_TYPE_C_LINKAGE)
+if (MIRAL_COMPILE_WITH_W_RETURN_TYPE_C_LINKAGE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage")
+endif()
+
 include_directories(
         ${MIRTEST_INCLUDE_DIRS}
         ${GMOCK_INCLUDE_DIR}