Unity System Compositor

Merge lp:~brandontschaefer/unity-system-compositor/gmock-fix into lp:unity-system-compositor

gmock-fix
Merge into trunk

Proposed by Brandon Schaefer on 2016-12-05

Status:	Merged
Approved by:	Brandon Schaefer on 2016-12-09
Approved revision:	302
Merged at revision:	302
Proposed branch:	lp:~brandontschaefer/unity-system-compositor/gmock-fix
Merge into:	lp:unity-system-compositor
Diff against target:	61 lines (+23/-8) 1 file modified cmake/FindGtest.cmake (+23/-8)
To merge this branch:	bzr merge lp:~brandontschaefer/unity-system-compositor/gmock-fix
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Andreas Pokorny (community)			Approve on 2016-12-09
Cemil Azizoglu (community)		2016-12-05	Approve on 2016-12-06
Mir CI Bot	continuous-integration		Approve on 2016-12-05
Review via email: mp+312498@code.launchpad.net

Commit Message

Fix needed for zesty to build gtest/gmock

Description of the Change

Fix needed for zesty to build gtest/gmock

Mir CI Bot (mir-ci-bot) wrote on 2016-12-05:

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

review: Approve (continuous-integration)

Cemil Azizoglu (cemil-azizoglu) wrote on 2016-12-06:

LGTM

review: Approve

Andreas Pokorny (andreas-pokorny) wrote on 2016-12-09:

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Brandon Schaefer

Chris Halse Rogers

Mir development team

Unity System Compositor Development Team

 === modified file 'cmake/FindGtest.cmake'
 --- cmake/FindGtest.cmake	2016-07-05 18:14:47 +0000
 +++ cmake/FindGtest.cmake	2016-12-05 18:15:20 +0000
@@ -2,26 +2,41 @@
  include(FindPackageHandleStandardArgs)
  #gtest
--set(GTEST_INSTALL_DIR /usr/src/gmock/gtest/include)
++if(EXISTS /usr/src/googletest)
++  set(USING_GOOGLETEST_1_8 TRUE)
++  set(GTEST_INSTALL_DIR /usr/src/googletest/googletest/include)
++else()
++  set(GTEST_INSTALL_DIR /usr/src/gmock/gtest/include)
++endif()
++
  find_path(GTEST_INCLUDE_DIR gtest/gtest.h
              HINTS ${GTEST_INSTALL_DIR})
  #gmock
--find_path(GMOCK_INSTALL_DIR gmock/CMakeLists.txt
--          HINTS /usr/src)
++find_path(GMOCK_INSTALL_DIR CMakeLists.txt
++          HINTS /usr/src/googletest /usr/src/gmock)
  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)
++if (USING_GOOGLETEST_1_8)
++  set(GMOCK_BASE_BINARY_DIR ${CMAKE_BINARY_DIR}/gmock/libs)
++  set(GMOCK_BINARY_DIR ${GMOCK_BASE_BINARY_DIR}/googlemock)
++  set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
++else()
++  set(GMOCK_BASE_BINARY_DIR ${CMAKE_BINARY_DIR}/gmock/libs)
++  set(GMOCK_BINARY_DIR ${GMOCK_BASE_BINARY_DIR})
++  set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
++endif()
  set(GTEST_CMAKE_ARGS "")
++if (USING_GOOGLETEST_1_8)
++  list(APPEND GTEST_CMAKE_ARGS -DBUILD_GTEST=ON)
++endif()
++
  ExternalProject_Add(
      GMock
      #where to build in source tree
@@ -30,7 +45,7 @@
      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}
++    BINARY_DIR ${GMOCK_BASE_BINARY_DIR}
      #we don't need to install, so skip
      INSTALL_COMMAND ""