Merge lp:~saviq/unity-system-compositor/use-cmake-extras into lp:unity-system-compositor

[Michał Sawicz]

Use FindGMock from cmake-extras_0.3, also wrap-and-sort debian/control

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:190
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/169/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-armhf-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/169/rebuild

review: Approve (continuous-integration)

[Robert Carr (robertcarr)]

+1

review: Approve

[Alan Griffiths (alan-griffiths)]

Basicly sound, but out of date:

Text conflict in debian/control
1 conflicts encountered.

review: Needs Fixing

[Michał Sawicz (saviq)]

W dniu 03.06.2015 o 19:02, Alan Griffiths pisze:
> Basicly sound, but out of date:
>
> Text conflict in debian/control
> 1 conflicts encountered.

Well, "Proposed [...] on 2014-12-05" ;)

Resolved.

[lp:~saviq/unity-system-compositor/use-cmake-extras]

191. By Michał Sawicz on 2015-06-03

Merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:191
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/224/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-i386-ci/12/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/224/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[Alan Griffiths (alan-griffiths)]

Mmm. No, there are linker errors.

review: Needs Fixing

Unmerged revisions

191. By Michał Sawicz on 2015-06-03

Merge trunk

190. By Michał Sawicz on 2014-12-04

Use FindGtest from cmake-extras_0.3, also wrap-and-sort debian/control

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-04-07 13:36:48 +0000
+++ CMakeLists.txt	2015-06-03 18:55:34 +0000
@@ -57,7 +57,6 @@
 option(MIR_ENABLE_TESTS "Build tests" ON)
 
 if (MIR_ENABLE_TESTS)
-  find_package(Gtest REQUIRED)
-  include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
+  find_package(GMock REQUIRED)
   add_subdirectory(tests/)
 endif ()

=== removed file 'cmake/FindGtest.cmake'
--- cmake/FindGtest.cmake	2014-07-09 06:58:05 +0000
+++ cmake/FindGtest.cmake	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-include(ExternalProject)
-include(FindPackageHandleStandardArgs)
-
-#gtest
-set(GTEST_INSTALL_DIR /usr/src/gmock/gtest/include)
-find_path(GTEST_INCLUDE_DIR gtest/gtest.h
-            HINTS ${GTEST_INSTALL_DIR})
-
-#gmock
-find_path(GMOCK_INSTALL_DIR gmock/CMakeLists.txt
-          HINTS /usr/src)
-if(${GMOCK_INSTALL_DIR} STREQUAL "GMOCK_INSTALL_DIR-NOTFOUND")
-    message(FATAL_ERROR "google-mock package not found")
-endif()
-
-set(GMOCK_INSTALL_DIR ${GMOCK_INSTALL_DIR}/gmock)
-find_path(GMOCK_INCLUDE_DIR gmock/gmock.h)
-
-set(GMOCK_PREFIX gmock)
-set(GMOCK_BINARY_DIR ${CMAKE_BINARY_DIR}/${GMOCK_PREFIX}/libs)
-set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
-
-set(GTEST_CMAKE_ARGS "")
-if (${CMAKE_CROSSCOMPILING})
-    set(GTEST_CMAKE_ARGS
-        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
-endif()
-
-ExternalProject_Add(
-    GMock
-    #where to build in source tree
-    PREFIX ${GMOCK_PREFIX}
-    #where the source is external to the project
-    SOURCE_DIR ${GMOCK_INSTALL_DIR}
-    #forward the compilers to the subproject so cross-arch builds work
-    CMAKE_ARGS ${GTEST_CMAKE_ARGS}
-    BINARY_DIR ${GMOCK_BINARY_DIR}
-
-    #we don't need to install, so skip
-    INSTALL_COMMAND ""
-)
-
-set(GMOCK_LIBRARY ${GMOCK_BINARY_DIR}/libgmock.a)
-set(GMOCK_MAIN_LIBRARY ${GMOCK_BINARY_DIR}/libgmock_main.a)
-set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARY} ${GMOCK_MAIN_LIBRARY})
-set(GTEST_LIBRARY ${GTEST_BINARY_DIR}/libgtest.a)
-set(GTEST_MAIN_LIBRARY ${GTEST_BINARY_DIR}/libgtest_main.a)
-set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
-set(GTEST_ALL_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
-
-find_package_handle_standard_args(GTest  DEFAULT_MSG
-                                    GMOCK_INCLUDE_DIR
-                                    GTEST_INCLUDE_DIR)

=== modified file 'debian/control'
--- debian/control	2015-05-06 16:09:19 +0000
+++ debian/control	2015-06-03 18:55:34 +0000
@@ -3,6 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
+               cmake-extras (>= 0.3),
                cmake-data,
                dbus,
                debhelper (>= 9),

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2015-02-18 14:40:29 +0000
+++ tests/unit-tests/CMakeLists.txt	2015-06-03 18:55:34 +0000
@@ -34,10 +34,7 @@
 
    usc
    ${GTEST_BOTH_LIBRARIES}
-   ${GMOCK_LIBRARY}
-   ${GMOCK_MAIN_LIBRARY}
+   ${GMOCK_LIBRARIES}
 )
 
 add_test(usc_unit_tests ${EXECUTABLE_OUTPUT_PATH}/usc_unit_tests)
-
-add_dependencies(usc_unit_tests GMock)