Merge lp:~didrocks/libusermetrics/build-new-gmock into lp:~indicator-applet-developers/libusermetrics/trunk

[Didier Roche-Tolomelli]

Build with new google mock in distro

Build with new google mock in distro

[lp:~didrocks/libusermetrics/build-new-gmock]

93. By Didier Roche-Tolomelli on 2013-07-10

move the snippet to a separaate cmake module

94. By Didier Roche-Tolomelli on 2013-07-10

remove include from the module, put it externally

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:92
http://jenkins.qa.ubuntu.com/job/libusermetrics-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libusermetrics-saucy-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libusermetrics-saucy-armhf-ci/26

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libusermetrics-ci/26/rebuild

review: Approve (continuous-integration)

=== added file 'cmake/FindGMock.cmake'
--- cmake/FindGMock.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindGMock.cmake	2013-07-10 14:42:27 +0000
@@ -0,0 +1,10 @@
+# Build with system gmock and embedded gtest
+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(GTEST_LIBRARIES gtest)
+set(GTEST_MAIN_LIBRARIES gtest_main)
+set(GMOCK_LIBRARIES gmock gmock_main)

=== removed file 'cmake/FindGMock.cmake'
--- cmake/FindGMock.cmake	2013-06-09 07:57:29 +0000
+++ cmake/FindGMock.cmake	1970-01-01 00:00:00 +0000
@@ -1,129 +0,0 @@
-# Locate the Google C++ Mocking Framework.
-# (This file is almost an identical copy of the original FindGTest.cmake file,
-#  feel free to use it as it is or modify it for your own needs.)
-#
-#
-# Defines the following variables:
-#
-#   GMOCK_FOUND - Found the Google Testing framework
-#   GMOCK_INCLUDE_DIRS - Include directories
-#
-# Also defines the library variables below as normal
-# variables. These contain debug/optimized keywords when
-# a debugging library is found.
-#
-#   GMOCK_BOTH_LIBRARIES - Both libgmock & libgmock-main
-#   GMOCK_LIBRARIES - libgmock
-#   GMOCK_MAIN_LIBRARIES - libgmock-main
-#
-# Accepts the following variables as input:
-#
-#   GMOCK_ROOT - (as a CMake or environment variable)
-#                The root directory of the gmock install prefix
-#
-#   GMOCK_MSVC_SEARCH - If compiling with MSVC, this variable can be set to
-#                       "MD" or "MT" to enable searching a gmock build tree
-#                       (defaults: "MD")
-#
-#-----------------------
-# Example Usage:
-#
-#    find_package(GMock REQUIRED)
-#    include_directories(${GMOCK_INCLUDE_DIRS})
-#
-#    add_executable(foo foo.cc)
-#    target_link_libraries(foo ${GMOCK_BOTH_LIBRARIES})
-#
-#=============================================================================
-# This file is released under the MIT licence:
-#
-# Copyright (c) 2011 Matej Svec
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-#=============================================================================
-
-
-function(_gmock_append_debugs _endvar _library)
-  if(${_library} AND ${_library}_DEBUG)
-    set(_output optimized ${${_library}} debug ${${_library}_DEBUG})
-  else()
-    set(_output ${${_library}})
-  endif()
-  set(${_endvar} ${_output} PARENT_SCOPE)
-endfunction()
-
-function(_gmock_find_library _name)
-  find_library(${_name}
-    NAMES ${ARGN}
-    HINTS
-      $ENV{GMOCK_ROOT}
-      ${GMOCK_ROOT}
-    PATH_SUFFIXES ${_gmock_libpath_suffixes}
-  )
-  mark_as_advanced(${_name})
-endfunction()
-
-
-if(NOT DEFINED GMOCK_MSVC_SEARCH)
-  set(GMOCK_MSVC_SEARCH MD)
-endif()
-
-set(_gmock_libpath_suffixes lib)
-if(MSVC)
-  if(GMOCK_MSVC_SEARCH STREQUAL "MD")
-    list(APPEND _gmock_libpath_suffixes
-      msvc/gmock-md/Debug
-      msvc/gmock-md/Release)
-  elseif(GMOCK_MSVC_SEARCH STREQUAL "MT")
-    list(APPEND _gmock_libpath_suffixes
-      msvc/gmock/Debug
-      msvc/gmock/Release)
-  endif()
-endif()
-
-find_path(GMOCK_INCLUDE_DIR gmock/gmock.h
-  HINTS
-    $ENV{GMOCK_ROOT}/include
-    ${GMOCK_ROOT}/include
-)
-mark_as_advanced(GMOCK_INCLUDE_DIR)
-
-if(MSVC AND GMOCK_MSVC_SEARCH STREQUAL "MD")
-  # The provided /MD project files for Google Mock add -md suffixes to the
-  # library names.
-  _gmock_find_library(GMOCK_LIBRARY            gmock-md  gmock)
-  _gmock_find_library(GMOCK_LIBRARY_DEBUG      gmock-mdd gmockd)
-  _gmock_find_library(GMOCK_MAIN_LIBRARY       gmock_main-md  gmock_main)
-  _gmock_find_library(GMOCK_MAIN_LIBRARY_DEBUG gmock_main-mdd gmock_maind)
-else()
-  _gmock_find_library(GMOCK_LIBRARY            gmock)
-  _gmock_find_library(GMOCK_LIBRARY_DEBUG      gmockd)
-  _gmock_find_library(GMOCK_MAIN_LIBRARY       gmock_main)
-  _gmock_find_library(GMOCK_MAIN_LIBRARY_DEBUG gmock_maind)
-endif()
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMock DEFAULT_MSG GMOCK_LIBRARY GMOCK_INCLUDE_DIR GMOCK_MAIN_LIBRARY)
-
-if(GMOCK_FOUND)
-  set(GMOCK_INCLUDE_DIRS ${GMOCK_INCLUDE_DIR})
-  _gmock_append_debugs(GMOCK_LIBRARIES      GMOCK_LIBRARY)
-  _gmock_append_debugs(GMOCK_MAIN_LIBRARIES GMOCK_MAIN_LIBRARY)
-  set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARIES} ${GMOCK_MAIN_LIBRARIES})
-endif()
-

=== removed file 'cmake/FindLocalGTest.cmake'
--- cmake/FindLocalGTest.cmake	2013-06-05 17:25:45 +0000
+++ cmake/FindLocalGTest.cmake	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-
-# Check for google test and build it locally
-set(
- GTEST_ROOT_DIR
-  "/usr/src/gtest" # Default value, adjustable by user with e.g., ccmake
-  CACHE
-  PATH
-  "Path to Google test srcs"
-)
-
-set(
-  GTEST_INCLUDE_DIR
-  "/usr/include/gtest"
-  CACHE
-  PATH
-  "Path to Google tests include"
-)
-
-find_path(GTEST_INCLUDE_DIR gtest/gtest.h)
-if (GTEST_INCLUDE_DIR)
-	set(GTEST_FOUND true)
-	#FIXME - hardcoded is bad!
-  add_subdirectory(
-    ${GTEST_ROOT_DIR}
-    gtest
-  )
-endif(GTEST_INCLUDE_DIR)
-
-set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIR})
-set(GTEST_LIBRARIES gtest)
-set(GTEST_MAIN_LIBRARIES gtest_main)
-set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
-

=== modified file 'debian/control'
--- debian/control	2013-07-05 15:38:41 +0000
+++ debian/control	2013-07-10 14:42:27 +0000
@@ -4,7 +4,7 @@
 Build-Depends: cmake,
                debhelper (>= 9),
                doxygen,
-               google-mock,
+               google-mock (>= 1.6.0+svn437),
                libgtest-dev,
                qtbase5-dev,
                libqdjango-dev,

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-07-05 15:31:22 +0000
+++ tests/CMakeLists.txt	2013-07-10 14:42:27 +0000
@@ -1,15 +1,11 @@
-
-set(CMAKE_AUTOMOC OFF)
-find_package("LocalGTest" REQUIRED)
-include_directories(${GTEST_INCLUDE_DIRS})
-set(CMAKE_AUTOMOC ON)
-
-find_package("GMock" REQUIRED)
-include_directories(${GMOCK_INCLUDE_DIRS})
+include(FindGMock)
 
 find_package("Valgrind" REQUIRED)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+                    ${GMOCK_INCLUDE_DIR}
+                    ${GTEST_INCLUDE_DIR}
+)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")