Merge pull request #44 from vosst/adjust-find-gtest-and-gmock

Fix compilation on 17.04.

CMakeLists.txt

@@ -22,7 +22,7 @@ set(C_AND_CXX_WARNINGS "-pedantic -Wall -Wextra")
 
 # Some additional warnings not included by the general flags set above.
 set(EXTRA_C_WARNINGS "-Wcast-align -Wcast-qual -Wformat -Wredundant-decls -Wswitch-default")
-set(EXTRA_CXX_WARNINGS "-Wnon-virtual-dtor -Wctor-dtor-privacy -Wold-style-cast")
+set(EXTRA_CXX_WARNINGS "-Wnon-virtual-dtor -Wold-style-cast")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_AND_CXX_WARNINGS}")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_C_WARNINGS}")
@@ -87,12 +87,7 @@ IF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
   SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
 ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
 
-# Build with system gmock and embedded gtest
+find_package(GMock)
-set (GMOCK_INCLUDE_DIR "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
-set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
-set (GTEST_INCLUDE_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
-
-add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fPIC")
 

packaging/snap/snapcraft.yaml

@@ -84,6 +84,7 @@ parts:
       - build-essential
       - cmake
       - cmake-data
+      - cmake-extras
       - debhelper
       - dbus
       - google-mock

scripts/clean-build.sh

@@ -7,6 +7,7 @@ apt-get install -qq -y \
   build-essential \
   cmake \
   cmake-data \
+  cmake-extras \
   debhelper \
   dbus \
   git \

src/anbox/bridge/platform_api_skeleton.cpp

@@ -22,6 +22,10 @@
 #include "anbox/wm/window_state.h"
 #include "anbox/logger.h"
 
+#if defined(Status)
+#undef Status
+#endif // defined(Status)
+
 #include "anbox_bridge.pb.h"
 
 namespace anbox {

src/anbox/common/small_vector.h

@@ -15,6 +15,7 @@
 
 #include <algorithm>
 #include <initializer_list>
+#include <memory>
 #include <type_traits>
 #include <utility>
 

tests/CMakeLists.txt

@@ -1,3 +1,5 @@
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare")
+
 include_directories(
   ${Boost_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}
@@ -16,8 +18,8 @@ macro(ANBOX_ADD_TEST test_name src)
 
     anbox-core
 
-    gmock
+    ${GMOCK_LIBRARIES}
-    gmock_main
+    ${GTEST_BOTH_LIBRARIES}
 
     ${ARGN}