Merge ~mitya57/compiz:googletest into compiz:master

[Dmitry Shachnev]

Fix build with latest googletest, by using static libraries shipped by distro.

There is no need to compile googletest ourselves, when Ubuntu has pre-built binaries.

One may argue that this will work only on Debian/Ubuntu, but the previous code looking for source in /usr/src/googletest will also work only there. Anyway, if someone wants to re-introduce old code later, I will happily accept patches.

[Alberts Muktupāvels (muktupavels)]

review: Approve

diff --git a/cmake/GoogleTest.cmake b/cmake/GoogleTest.cmake
index 3f9d459..14efaca 100644
--- a/cmake/GoogleTest.cmake
+++ b/cmake/GoogleTest.cmake
@@ -1,46 +1,15 @@
-set (GOOGLETEST_DIR "/usr/src/googletest" CACHE PATH "Path to Google Test")
+find_library (GTEST_LIBRARY gtest)
+find_library (GTEST_MAIN_LIBRARY gtest_main)
+find_library (GMOCK_LIBRARY gmock)
+find_library (GMOCK_MAIN_LIBRARY gmock_main)
 
-if (EXISTS "${GOOGLETEST_DIR}")
+if (GTEST_LIBRARY AND GTEST_MAIN_LIBRARY AND GMOCK_LIBRARY AND GMOCK_MAIN_LIBRARY)
 
     find_package (Threads REQUIRED)
 
-    set (GMOCK_SRC_DIR "${GOOGLETEST_DIR}/googlemock" CACHE PATH "Path to Google Mock Sources")
-    set (GMOCK_INCLUDE_DIR "${GMOCK_SRC_DIR}/include" CACHE PATH "Path to Google Mock Headers")
-    set (GTEST_INCLUDE_DIR "${GOOGLETEST_DIR}/googletest/include" CACHE PATH "Path to Google Test Headers")
-    set (GMOCK_BIN_DIR "${CMAKE_BINARY_DIR}/gmock")
-
-    include (ExternalProject)
-    ExternalProject_Add (GMock
-                         SOURCE_DIR "${GMOCK_SRC_DIR}"
-                         BINARY_DIR "${GMOCK_BIN_DIR}"
-                         STAMP_DIR "${GMOCK_BIN_DIR}/stamp"
-                         TMP_DIR "${GMOCK_BIN_DIR}/tmp"
-                         INSTALL_COMMAND "")
-
-    add_library (gtest INTERFACE)
-    target_include_directories (gtest INTERFACE ${GTEST_INCLUDE_DIR})
-    target_link_libraries (gtest INTERFACE "${GMOCK_BIN_DIR}/gtest/libgtest.a" ${CMAKE_THREAD_LIBS_INIT})
-    add_dependencies (gtest GMock)
-
-    add_library (gtest_main INTERFACE)
-    target_include_directories (gtest_main INTERFACE ${GTEST_INCLUDE_DIR})
-    target_link_libraries (gtest_main INTERFACE "${GMOCK_BIN_DIR}/gtest/libgtest_main.a" gtest)
-
-    add_library (gmock INTERFACE)
-    target_include_directories (gmock INTERFACE ${GMOCK_INCLUDE_DIR})
-    target_link_libraries (gmock INTERFACE "${GMOCK_BIN_DIR}/libgmock.a" gtest)
-
-    add_library (gmock_main INTERFACE)
-    target_include_directories (gmock_main INTERFACE ${GMOCK_INCLUDE_DIR})
-    target_link_libraries (gmock_main INTERFACE "${GMOCK_BIN_DIR}/libgmock_main.a" gmock)
-
-    set (GMOCK_LIBRARY gmock)
-    set (GMOCK_MAIN_LIBRARY gmock_main)
-    set (GTEST_BOTH_LIBRARIES gtest gtest_main)
+    set (GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
 
     add_definitions (-DGTEST_USE_OWN_TR1_TUPLE=0)
-    include_directories (${GMOCK_INCLUDE_DIR}
-                         ${GTEST_INCLUDE_DIR})
 
     set (GTEST_FOUND TRUE)
     set (GOOGLE_TEST_AND_MOCK_FOUND TRUE)
diff --git a/debian/control b/debian/control
index 2161815..a66d8e1 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Build-Depends: cmake (>= 3.10.0),
                debhelper (>= 9~),
                dh-python,
                dh-translations,
-               googletest (>= 1.8.0),
+               libgtest-dev (>= 1.8.0),
+               libgmock-dev (>= 1.8.0),
                intltool,
                libtool,
                pkg-config (>= 0.29.1),