1
=== modified file 'tests/CMakeLists.txt'
2
--- tests/CMakeLists.txt	2014-07-02 06:29:24 +0000
3
+++ tests/CMakeLists.txt	2014-08-08 06:13:52 +0000
4
@@ -50,5 +50,6 @@
5
50
add_subdirectory(mir_test_doubles/)
50
add_subdirectory(mir_test_doubles/)
6
51
add_subdirectory(client-language/)
51
add_subdirectory(client-language/)
7
52
add_subdirectory(mir-stress/)
52
add_subdirectory(mir-stress/)
8
53
add_subdirectory(pkgconfig)
9
53
54
10
54
mir_add_memcheck_test()
55
mir_add_memcheck_test()
11
55
56
12
=== added directory 'tests/pkgconfig'
13
=== added file 'tests/pkgconfig/CMakeLists.txt'
14
--- tests/pkgconfig/CMakeLists.txt	1970-01-01 00:00:00 +0000
15
+++ tests/pkgconfig/CMakeLists.txt	2014-08-08 06:13:52 +0000
16
@@ -0,0 +1,11 @@
17
1
18
2
# FIXME: Can't run pkg-config build testing when cross-compiling. It tries
19
3
#        to use a bunch of paths under MIR_NDK_PATH that actually don't exist.
20
4
#        That probably needs fixing in our cross-compile setup scripts, but
21
5
#        so long as these test projects get attempted on native builds,
22
6
#        that is sufficient test coverage.
23
7
24
8
if (NOT CMAKE_FIND_ROOT_PATH_MODE_PROGRAM MATCHES "NEVER")
25
9
  add_subdirectory(standaloneserver)
26
10
  add_subdirectory(standaloneclient)
27
11
endif()
28
0
12
29
=== added directory 'tests/pkgconfig/standaloneclient'
30
=== added file 'tests/pkgconfig/standaloneclient/CMakeLists.txt'
31
--- tests/pkgconfig/standaloneclient/CMakeLists.txt	1970-01-01 00:00:00 +0000
32
+++ tests/pkgconfig/standaloneclient/CMakeLists.txt	2014-08-08 06:13:52 +0000
33
@@ -0,0 +1,45 @@
34
1
#
35
2
# This project tests the correctness of mirclient.pc.in, ensuring it contains
36
3
# everything an external project needs to successfully compile and link
37
4
# a mir client.
38
5
#
39
6
project(StandaloneClient)
40
7
41
8
# Forget everything you know about the parent "Mir" project. Pretend you're
42
9
# a distant third-party project. This ensures the directories we do get are
43
10
# coming from mirclient.pc ...
44
11
set_directory_properties(PROPERTIES
45
12
    INCLUDE_DIRECTORIES ""
46
13
    LINK_DIRECTORIES ""
47
14
)
48
15
49
16
# Generate a temporary mirclient.pc file which points into the build tree ...
50
17
set(LIBDIR ${Mir_BINARY_DIR}/lib)
51
18
set(INCLUDEDIR ${Mir_SOURCE_DIR}/include/client)
52
19
set(COMMON_INCLUDEDIR ${Mir_SOURCE_DIR}/include/shared)
53
20
configure_file(${Mir_SOURCE_DIR}/src/client/mirclient.pc.in
54
21
               ${StandaloneClient_BINARY_DIR}/mirclient.pc)
55
22
set(ENV{PKG_CONFIG_PATH} ${StandaloneClient_BINARY_DIR})
56
23
57
24
# Now use mirclient.pc like real projects do, verifying it provides all
58
25
# the necessary information to build...
59
26
find_package(PkgConfig)
60
27
pkg_check_modules(LOCALMIRCLIENT REQUIRED mirclient)
61
28
62
29
include_directories(${LOCALMIRCLIENT_INCLUDE_DIRS})
63
30
link_directories(${LOCALMIRCLIENT_LIBRARY_DIRS})
64
31
add_compile_options(${LOCALMIRCLIENT_CFLAGS})
65
32
66
33
set(CLIENT_SRC "${Mir_SOURCE_DIR}/examples/flicker.c")
67
34
add_compile_options("-std=c99")
68
35
69
36
# Test CMake-style explicit linkage: "foo/libbar.so"
70
37
add_executable(test_standaloneclient_directlink ${CLIENT_SRC})
71
38
add_dependencies(test_standaloneclient_directlink mirclient)
72
39
target_link_libraries(test_standaloneclient_directlink ${LOCALMIRCLIENT_LIBRARIES})
73
40
74
41
# Test traditional linkage: "-Lfoo -lbar"
75
42
add_executable(test_standaloneclient_searchlink ${CLIENT_SRC})
76
43
add_dependencies(test_standaloneclient_searchlink mirclient)
77
44
target_link_libraries(test_standaloneclient_searchlink ${LOCALMIRCLIENT_LDFLAGS})
78
45
79
0
46
80
=== added directory 'tests/pkgconfig/standaloneserver'
81
=== added file 'tests/pkgconfig/standaloneserver/CMakeLists.txt'
82
--- tests/pkgconfig/standaloneserver/CMakeLists.txt	1970-01-01 00:00:00 +0000
83
+++ tests/pkgconfig/standaloneserver/CMakeLists.txt	2014-08-08 06:13:52 +0000
84
@@ -0,0 +1,45 @@
85
1
#
86
2
# This project tests the correctness of mirserver.pc.in, ensuring it contains
87
3
# everything an external project needs to successfully compile and link
88
4
# a mir server.
89
5
#
90
6
project(StandaloneServer)
91
7
92
8
# Forget everything you know about the parent "Mir" project. Pretend you're
93
9
# a distant third-party project. This ensures the directories we do get are
94
10
# coming from mirserver.pc ...
95
11
set_directory_properties(PROPERTIES
96
12
    INCLUDE_DIRECTORIES ""
97
13
    LINK_DIRECTORIES ""
98
14
)
99
15
100
16
# Generate a temporary mirserver.pc file which points into the build tree ...
101
17
set(LIBDIR ${Mir_BINARY_DIR}/lib)
102
18
set(INCLUDEDIR ${Mir_SOURCE_DIR}/include/server)
103
19
set(PLATFORM_INCLUDEDIR ${Mir_SOURCE_DIR}/include/platform)
104
20
set(COMMON_INCLUDEDIR ${Mir_SOURCE_DIR}/include/shared)
105
21
configure_file(${Mir_SOURCE_DIR}/src/platform/mirplatform.pc.in
106
22
               ${StandaloneServer_BINARY_DIR}/mirplatform.pc)
107
23
configure_file(${Mir_SOURCE_DIR}/src/server/mirserver.pc.in
108
24
               ${StandaloneServer_BINARY_DIR}/mirserver.pc)
109
25
set(ENV{PKG_CONFIG_PATH} ${StandaloneServer_BINARY_DIR})
110
26
111
27
# Now use mirserver.pc like real projects do, verifying it provides all
112
28
# the necessary information to build...
113
29
find_package(PkgConfig)
114
30
pkg_check_modules(LOCALMIRSERVER REQUIRED mirserver)
115
31
116
32
include_directories(${LOCALMIRSERVER_INCLUDE_DIRS})
117
33
link_directories(${LOCALMIRSERVER_LIBRARY_DIRS})
118
34
add_compile_options(${LOCALMIRSERVER_CFLAGS})
119
35
120
36
# Test CMake-style explicit linkage: "foo/libbar.so"
121
37
add_executable(test_standaloneserver_directlink server.cpp)
122
38
add_dependencies(test_standaloneserver_directlink mirserver)
123
39
target_link_libraries(test_standaloneserver_directlink ${LOCALMIRSERVER_LIBRARIES})
124
40
125
41
# Test traditional linkage: "-Lfoo -lbar"
126
42
add_executable(test_standaloneserver_searchlink server.cpp)
127
43
add_dependencies(test_standaloneserver_searchlink mirserver)
128
44
target_link_libraries(test_standaloneserver_searchlink ${LOCALMIRSERVER_LDFLAGS})
129
45
130
0
46
131
=== added file 'tests/pkgconfig/standaloneserver/server.cpp'
132
--- tests/pkgconfig/standaloneserver/server.cpp	1970-01-01 00:00:00 +0000
133
+++ tests/pkgconfig/standaloneserver/server.cpp	2014-08-08 06:13:52 +0000
134
@@ -0,0 +1,38 @@
135
1
/*
136
2
 * Copyright © 2014 Canonical Ltd.
137
3
 *
138
4
 * This program is free software: you can redistribute it and/or modify
139
5
 * it under the terms of the GNU General Public License version 3 as
140
6
 * published by the Free Software Foundation.
141
7
 *
142
8
 * This program is distributed in the hope that it will be useful,
143
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
144
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
145
11
 * GNU General Public License for more details.
146
12
 *
147
13
 * You should have received a copy of the GNU General Public License
148
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
149
15
 *
150
16
 * Authored by: Daniel van Vugt <daniel.van.vugt@canonical.com>
151
17
 */
152
18
153
19
#include "mir/default_server_configuration.h"
154
20
#include "mir/run_mir.h"
155
21
#include "mir/geometry/rectangle.h"
156
22
157
23
using namespace mir;
158
24
using namespace mir::geometry;
159
25
160
26
int main(int argc, char const* argv[])
161
27
{
162
28
    // Exercise some symbols from libmircommon. Make sure users of
163
29
    // mirserver.pc get these automatically in their link lines...
164
30
    Rectangle a;
165
31
    (void)a.bottom_right();
166
32
    Rectangle b;
167
33
    (void)a.contains(b);
168
34
169
35
    DefaultServerConfiguration config(argc, argv);
170
36
    run_mir(config, [](mir::DisplayServer&){} );
171
37
    return 0;
172
38
}
Reviewer	Review Type	Date Requested	Status
Daniel van Vugt			Needs Fixing on 2014-08-11
PS Jenkins bot (community)	continuous-integration		Approve on 2014-08-08
Alan Griffiths		2014-08-06	Needs Fixing on 2014-08-06
Review via email: mp+229756@code.launchpad.net