Merge lp:~allanlesage/coverage-builder/lp1371690-remove-FindGtest.cmake into lp:coverage-builder

[Allan LeSage]

Quick fix to removes FindGtest.cmake from our sample CMake project.

[Martin Pitt (pitti)]

Does that actually work? I don't see any replacement, like adding a build dep or copying the file from some common dir. Or is FindGText.cmake not being used in the first place?

review: Needs Information

[Allan LeSage (allanlesage)]

Please forgive the brevity of my initial proposal--yes this is tested working, yes it's being used in the dummy project; to explain: cmake (cmake-data) simply installs this macro in the default location:

$ dpkg -L cmake-data | grep -i gtest
/usr/share/cmake-2.8/Modules/FindGTest.cmake

From cmake changelog this appears to have been the case for a while, indeed the copied macro is necessary in any project in which it's included, including this one--I can't explain how it came into vogue as I wasn't responsible for spreading it (except to this dummy project).

[Martin Pitt (pitti)]

Ah, great.

review: Approve

[Allan LeSage (allanlesage)]

Sorry *is not necessary* or *is unnecessary*, to be absolutely clear :) --thanks Martin for the review.

Unmerged revisions

282. By Allan LeSage on 2014-09-19

Remove FindGtest.cmake which now ships with CMake.

=== removed file 'test/cmake-project/cmake/FindGtest.cmake'
--- test/cmake-project/cmake/FindGtest.cmake	2014-09-19 02:41:28 +0000
+++ test/cmake-project/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)