1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2016-11-10 16:20:00 +0000
3
+++ CMakeLists.txt	2016-12-07 19:42:48 +0000
4
@@ -26,6 +26,9 @@
5
26
pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
26
pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
6
27
pkg_check_modules(TP_QT5 REQUIRED TelepathyQt5)
27
pkg_check_modules(TP_QT5 REQUIRED TelepathyQt5)
7
28
28
8
29
find_package(Gtest REQUIRED)
9
30
include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
10
31
11
29
# Enable handy automoc functionality.
32
# Enable handy automoc functionality.
12
30
add_definitions(-DQT_NO_KEYWORDS)
33
add_definitions(-DQT_NO_KEYWORDS)
13
31
set(CMAKE_INCLUDE_CURRENT_DIR ON)
34
set(CMAKE_INCLUDE_CURRENT_DIR ON)
14
32
35
15
=== added file 'cmake/FindGtest.cmake'
16
--- cmake/FindGtest.cmake	1970-01-01 00:00:00 +0000
17
+++ cmake/FindGtest.cmake	2016-12-07 19:42:48 +0000
18
@@ -0,0 +1,67 @@
19
1
include(ExternalProject)
20
2
include(FindPackageHandleStandardArgs)
21
3
22
4
#gtest
23
5
if (EXISTS /usr/src/googletest)
24
6
    set (USING_GOOGLETEST_1_8 TRUE)
25
7
    set (GTEST_INSTALL_DIR /usr/src/googletest/googletest/include)
26
8
else()
27
9
    set(GTEST_INSTALL_DIR /usr/src/gmock/gtest/include)
28
10
endif()
29
11
find_path(GTEST_INCLUDE_DIR gtest/gtest.h
30
12
            HINTS ${GTEST_INSTALL_DIR})
31
13
32
14
#gmock
33
15
find_path(GMOCK_INSTALL_DIR CMakeLists.txt
34
16
          HINTS /usr/src/googletest /usr/src/gmock)
35
17
if(${GMOCK_INSTALL_DIR} STREQUAL "GMOCK_INSTALL_DIR-NOTFOUND")
36
18
    message(FATAL_ERROR "google-mock package not found")
37
19
endif()
38
20
39
21
find_path(GMOCK_INCLUDE_DIR gmock/gmock.h)
40
22
41
23
if (USING_GOOGLETEST_1_8)
42
24
  set(GMOCK_BASE_BINARY_DIR ${CMAKE_BINARY_DIR}/gmock/libs)
43
25
  set(GMOCK_BINARY_DIR ${GMOCK_BASE_BINARY_DIR}/googlemock)
44
26
  set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
45
27
else()
46
28
  set(GMOCK_BASE_BINARY_DIR ${CMAKE_BINARY_DIR}/gmock/libs)
47
29
  set(GMOCK_BINARY_DIR ${GMOCK_BASE_BINARY_DIR})
48
30
  set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
49
31
endif()
50
32
51
33
set(GTEST_CMAKE_ARGS "")
52
34
if (${MIR_IS_CROSS_COMPILING})
53
35
    set(GTEST_CMAKE_ARGS
54
36
        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
55
37
endif()
56
38
57
39
if (USING_GOOGLETEST_1_8)
58
40
  list(APPEND GTEST_CMAKE_ARGS -DBUILD_GTEST=ON)
59
41
endif()
60
42
61
43
ExternalProject_Add(
62
44
    GMock
63
45
    #where to build in source tree
64
46
    PREFIX ${GMOCK_PREFIX}
65
47
    #where the source is external to the project
66
48
    SOURCE_DIR ${GMOCK_INSTALL_DIR}
67
49
    #forward the compilers to the subproject so cross-arch builds work
68
50
    CMAKE_ARGS ${GTEST_CMAKE_ARGS} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_POSITION_INDEPENDENT_CODE=ON
69
51
    BINARY_DIR ${GMOCK_BASE_BINARY_DIR}
70
52
71
53
    #we don't need to install, so skip
72
54
    INSTALL_COMMAND ""
73
55
)
74
56
75
57
set(GMOCK_LIBRARY ${GMOCK_BINARY_DIR}/libgmock.a)
76
58
set(GMOCK_MAIN_LIBRARY ${GMOCK_BINARY_DIR}/libgmock_main.a)
77
59
set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARY} ${GMOCK_MAIN_LIBRARY})
78
60
set(GTEST_LIBRARY ${GTEST_BINARY_DIR}/libgtest.a)
79
61
set(GTEST_MAIN_LIBRARY ${GTEST_BINARY_DIR}/libgtest_main.a)
80
62
set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
81
63
set(GTEST_ALL_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
82
64
83
65
find_package_handle_standard_args(GTest  DEFAULT_MSG
84
66
                                    GMOCK_INCLUDE_DIR
85
67
                                    GTEST_INCLUDE_DIR)
86
0
68
87
=== modified file 'tests/CMakeLists.txt'
88
--- tests/CMakeLists.txt	2016-11-10 16:20:00 +0000
89
+++ tests/CMakeLists.txt	2016-12-07 19:42:48 +0000
90
@@ -12,13 +12,6 @@
91
12
# Disable the respective warning selectively for tests only.
12
# Disable the respective warning selectively for tests only.
92
13
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers")
13
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers")
93
14
14
94
15
# Build with system gmock and embedded gtest
95
16
set (GMOCK_INCLUDE_DIR "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
96
17
set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
97
18
set (GTEST_INCLUDE_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
98
19
set (GMOCK_BOTH_LIBRARIES gmock gmock_main)
99
20
add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
100
21
101
22
include_directories(
15
include_directories(
102
23
  ${CMAKE_CURRENT_BINARY_DIR}
16
  ${CMAKE_CURRENT_BINARY_DIR}
103
24
  ${CMAKE_CURRENT_SOURCE_DIR}
17
  ${CMAKE_CURRENT_SOURCE_DIR}
104
@@ -44,6 +37,7 @@
105
44
file(GLOB_RECURSE TEST_H_FILES *.h)
37
file(GLOB_RECURSE TEST_H_FILES *.h)
106
45
add_custom_target(test_dot_h_files ALL SOURCES ${TEST_H_FILES})
38
add_custom_target(test_dot_h_files ALL SOURCES ${TEST_H_FILES})
107
46
39
109
47
target_link_libraries(testing-mocks messaging-framework gmock gmock_main)
40
target_link_libraries(testing-mocks messaging-framework ${GMOCK_LIBRARY})
110
41
set_target_properties(testing-mocks PROPERTIES POSITION_INDEPENDENT_CODE ON)
111
48
42
112
49
add_subdirectory(unit)
43
add_subdirectory(unit)
113
50
44
114
=== modified file 'tests/unit/messaging/CMakeLists.txt'
115
--- tests/unit/messaging/CMakeLists.txt	2016-11-10 16:20:00 +0000
116
+++ tests/unit/messaging/CMakeLists.txt	2016-12-07 19:42:48 +0000
117
@@ -1,5 +1,5 @@
118
1
# Make sure that we can easily bootstrap a private dbus instance.
1
# Make sure that we can easily bootstrap a private dbus instance.
120
2
add_definitions(-DCORE_DBUS_ENABLE_GOOGLE_TEST_FIXTURE -DTP_QT_ENABLE_LOWLEVEL_API)
2
add_definitions(-DCORE_DBUS_ENABLE_GOOGLE_TEST_FIXTURE -DTP_QT_ENABLE_LOWLEVEL_API -fPIC)
121
3
3
122
4
# Enable handy automock'ing and auto include of generated files.
4
# Enable handy automock'ing and auto include of generated files.
123
5
set(CMAKE_INCLUDE_CURRENT_DIR ON)
5
set(CMAKE_INCLUDE_CURRENT_DIR ON)
124
@@ -48,8 +48,8 @@
125
48
    testing-mocks
48
    testing-mocks
126
49
    messaging-framework
49
    messaging-framework
127
50
50
130
51
    gmock 
51
    ${GMOCK_LIBRARY}
131
52
    gmock_main 
52
    ${GTEST_BOTH_LIBRARIES}
132
53
53
133
54
    ${DBUS_CPP_LDFLAGS} 
54
    ${DBUS_CPP_LDFLAGS} 
134
55
    ${PROCESS_CPP_LDFLAGS} 
55
    ${PROCESS_CPP_LDFLAGS} 
135
@@ -66,7 +66,7 @@
136
66
66
137
67
# Simple shared object that is used in unit-testing the messaging::DynamicLibrary.
67
# Simple shared object that is used in unit-testing the messaging::DynamicLibrary.
138
68
add_library(test-library SHARED test_library.cpp)
68
add_library(test-library SHARED test_library.cpp)
140
69
target_link_libraries(test-library testing-mocks gmock gmock_main)
69
target_link_libraries(test-library testing-mocks)
141
70
70
142
71
MSG_FW_ADD_TEST(associative-dictionary-test associative_dictionary_test.cpp)
71
MSG_FW_ADD_TEST(associative-dictionary-test associative_dictionary_test.cpp)
143
72
MSG_FW_ADD_TEST(boost-variant-test boost_variant_test.cpp)
72
MSG_FW_ADD_TEST(boost-variant-test boost_variant_test.cpp)
144
73
73
145
=== modified file 'tools/get_soversion.sh'
146
--- tools/get_soversion.sh	2016-11-11 12:58:48 +0000
147
+++ tools/get_soversion.sh	2016-12-07 19:42:48 +0000
148
@@ -17,7 +17,9 @@
149
17
17
150
18
set -eu
18
set -eu
151
19
19
153
20
[ -n "${SERIES:-}" ] || SERIES=$(lsb_release -c -s)
20
. /etc/lsb-release
154
21
155
22
[ -n "${SERIES:-}" ] || SERIES=$DISTRIB_CODENAME
156
21
23
157
22
case "$SERIES" in
24
case "$SERIES" in
158
23
    trusty)
25
    trusty)
Status:	Merged
Approved by:	Bill Filler on 2016-12-08
Approved revision:	78
Merged at revision:	73
Proposed branch:	lp:~phablet-team/messaging-framework/fix-lsb-release-dependency
Merge into:	lp:messaging-framework
Diff against target:	158 lines (+79/-13) 5 files modified CMakeLists.txt (+3/-0) cmake/FindGtest.cmake (+67/-0) tests/CMakeLists.txt (+2/-8) tests/unit/messaging/CMakeLists.txt (+4/-4) tools/get_soversion.sh (+3/-1)
To merge this branch:	bzr merge lp:~phablet-team/messaging-framework/fix-lsb-release-dependency
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Approve on 2016-12-08
Roberto Mier Escandon (community)		2016-11-30	Approve on 2016-11-30
Review via email: mp+312149@code.launchpad.net