1
=== modified file 'cmake/FindGtestGmock.cmake'
2
--- cmake/FindGtestGmock.cmake	2017-10-23 09:51:40 +0000
3
+++ cmake/FindGtestGmock.cmake	2017-10-24 15:56:51 +0000
4
@@ -10,25 +10,28 @@
5
10
        PATHS /usr/src/gtest /usr/src/googletest/googletest/
10
        PATHS /usr/src/gtest /usr/src/googletest/googletest/
6
11
        DOC "Path to GTest CMake project")
11
        DOC "Path to GTest CMake project")
7
12
12
9
13
    ExternalProject_Add(gtest PREFIX ./gtest
13
    ExternalProject_Add(GTest PREFIX ./gtest
10
14
            SOURCE_DIR ${GTEST_ROOT}
14
            SOURCE_DIR ${GTEST_ROOT}
11
15
            CMAKE_ARGS
15
            CMAKE_ARGS
12
16
                -DCMAKE_CXX_COMPILER_WORKS=1
13
16
                -DCMAKE_CXX_FLAGS='${CMAKE_CXX_FLAGS}'
17
                -DCMAKE_CXX_FLAGS='${CMAKE_CXX_FLAGS}'
14
17
                -DCMAKE_CXX_COMPILER_WORKS=1
15
18
                -DCMAKE_C_COMPILER_WORKS=1
16
19
                -DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}
17
20
                -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
18
                -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
18
21
                -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
19
22
                -DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}
20
23
            INSTALL_COMMAND true)
19
            INSTALL_COMMAND true)
21
24
20
24
25
    set(GTEST_LIBRARY "-lgtest")
21
    ExternalProject_Get_Property(GTest binary_dir)
25
26
    set(GTEST_MAIN_LIBRARY "-lgtest_main")
22
26
23
    add_library(gtest UNKNOWN IMPORTED)
27
24
    set_target_properties(gtest      PROPERTIES IMPORTED_LOCATION ${binary_dir}/libgtest.a)
28
25
    add_dependencies(gtest GTest)
29
26
    set(GTEST_LIBRARY "gtest")
30
27
31
28
    add_library(gtest_main UNKNOWN IMPORTED)
32
29
    set_target_properties(gtest_main PROPERTIES IMPORTED_LOCATION ${binary_dir}/libgtest_main.a)
33
30
    add_dependencies(gtest_main GTest)
34
31
    set(GTEST_MAIN_LIBRARY "gtest_main")
35
32
36
27
    set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
33
    set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
37
28
    set(GTEST_DEPENDENCIES "gtest")
38
29
    set(GTEST_FOUND TRUE)
39
30
    find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h)
34
    find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h)
40
31
    link_directories(${CMAKE_CURRENT_BINARY_DIR}/gtest/src/gtest-build)
41
32
    find_package_handle_standard_args(GTest GTEST_LIBRARY GTEST_BOTH_LIBRARIES GTEST_INCLUDE_DIRS)
35
    find_package_handle_standard_args(GTest GTEST_LIBRARY GTEST_BOTH_LIBRARIES GTEST_INCLUDE_DIRS)
42
33
endif()
36
endif()
43
34
37
44
@@ -51,10 +54,6 @@
45
51
    set_source_files_properties(${GMOCK_SOURCE} PROPERTIES COMPILE_FLAGS "-I/usr/src/gmock")
54
    set_source_files_properties(${GMOCK_SOURCE} PROPERTIES COMPILE_FLAGS "-I/usr/src/gmock")
46
52
endif()
55
endif()
47
53
56
48
54
if (TARGET gtest)
49
55
    add_dependencies(GMock gtest)
50
56
endif()
51
57
52
58
find_package_handle_standard_args(GMock DEFAULT_MSG GMOCK_INCLUDE_DIR)
57
find_package_handle_standard_args(GMock DEFAULT_MSG GMOCK_INCLUDE_DIR)
53
59
58
54
60
set(GMOCK_LIBRARY GMock)
59
set(GMOCK_LIBRARY GMock)
Status:	Merged
Approved by:	Alan Griffiths on 2017-10-25
Approved revision:	no longer in the source branch.
Merged at revision:	4301
Proposed branch:	lp:~alan-griffiths/mir/fix-gtest-dependencies
Merge into:	lp:mir
Prerequisite:	lp:~alan-griffiths/mir/no-cmake-extras
Diff against target:	54 lines (+14/-15) 1 file modified cmake/FindGtestGmock.cmake (+14/-15)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/fix-gtest-dependencies
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Brandon Schaefer (community)		2017-10-24	Approve on 2017-10-24
Mir CI Bot	continuous-integration		Approve on 2017-10-24
Review via email: mp+332723@code.launchpad.net