Merge lp:~alan-griffiths/mir/fix-gtest-dependencies into lp:mir

[Alan Griffiths]

The recent reworking of cmake/FindGtestGmock.cmake left us with a race between gtest building and being used. This fixes that.

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4301
https://mir-jenkins.ubuntu.com/job/mir-ci/3756/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5165
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5402
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5389
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5389
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5389
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5208
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5208/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5208
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5208/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5208
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5208/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5208
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5208/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5208
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5208/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5208
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5208/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5208
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5208/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5208
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5208/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3756/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

lgtm

review: Approve

=== modified file 'cmake/FindGtestGmock.cmake'
--- cmake/FindGtestGmock.cmake	2017-10-23 09:51:40 +0000
+++ cmake/FindGtestGmock.cmake	2017-10-24 15:56:51 +0000
@@ -10,25 +10,28 @@
         PATHS /usr/src/gtest /usr/src/googletest/googletest/
         DOC "Path to GTest CMake project")
 
-    ExternalProject_Add(gtest PREFIX ./gtest
+    ExternalProject_Add(GTest PREFIX ./gtest
             SOURCE_DIR ${GTEST_ROOT}
             CMAKE_ARGS
+                -DCMAKE_CXX_COMPILER_WORKS=1
                 -DCMAKE_CXX_FLAGS='${CMAKE_CXX_FLAGS}'
-                -DCMAKE_CXX_COMPILER_WORKS=1
-                -DCMAKE_C_COMPILER_WORKS=1
-                -DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}
                 -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-                -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-                -DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}
             INSTALL_COMMAND true)
 
-    set(GTEST_LIBRARY "-lgtest")
-    set(GTEST_MAIN_LIBRARY "-lgtest_main")
+    ExternalProject_Get_Property(GTest binary_dir)
+
+    add_library(gtest UNKNOWN IMPORTED)
+    set_target_properties(gtest      PROPERTIES IMPORTED_LOCATION ${binary_dir}/libgtest.a)
+    add_dependencies(gtest GTest)
+    set(GTEST_LIBRARY "gtest")
+
+    add_library(gtest_main UNKNOWN IMPORTED)
+    set_target_properties(gtest_main PROPERTIES IMPORTED_LOCATION ${binary_dir}/libgtest_main.a)
+    add_dependencies(gtest_main GTest)
+    set(GTEST_MAIN_LIBRARY "gtest_main")
+
     set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
-    set(GTEST_DEPENDENCIES "gtest")
-    set(GTEST_FOUND TRUE)
     find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h)
-    link_directories(${CMAKE_CURRENT_BINARY_DIR}/gtest/src/gtest-build)
     find_package_handle_standard_args(GTest GTEST_LIBRARY GTEST_BOTH_LIBRARIES GTEST_INCLUDE_DIRS)
 endif()
 
@@ -51,10 +54,6 @@
     set_source_files_properties(${GMOCK_SOURCE} PROPERTIES COMPILE_FLAGS "-I/usr/src/gmock")
 endif()
 
-if (TARGET gtest)
-    add_dependencies(GMock gtest)
-endif()
-
 find_package_handle_standard_args(GMock DEFAULT_MSG GMOCK_INCLUDE_DIR)
 
 set(GMOCK_LIBRARY GMock)