Merge lp:~ted/hud/filter-underscores into lp:hud/15.04

Proposed by Ted Gould on 2014-11-03
Status: Needs review
Proposed branch: lp:~ted/hud/filter-underscores
Merge into: lp:hud/15.04
Diff against target: 58 lines (+27/-0)
4 files modified
libhud-client/CMakeLists.txt (+3/-0)
libhud-client/libhud-client.map (+15/-0)
libhud/CMakeLists.txt (+3/-0)
libhud/libhud.map (+6/-0)
To merge this branch: bzr merge lp:~ted/hud/filter-underscores
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing on 2014-11-03
Indicator Applet Developers 2014-11-03 Pending
Review via email: mp+240494@code.launchpad.net

Commit message

Filter library symbols when building the libraries

Description of the change

Hopefully this should make Jenkins happy

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Unmerged revisions

400. By Ted Gould on 2014-11-03

Some C++-isms

399. By Ted Gould on 2014-11-03

Lib hud client filtering

398. By Ted Gould on 2014-11-03

Filtering hud symbols

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libhud-client/CMakeLists.txt'
2--- libhud-client/CMakeLists.txt 2013-11-27 14:28:43 +0000
3+++ libhud-client/CMakeLists.txt 2014-11-03 19:23:39 +0000
4@@ -125,6 +125,9 @@
5 -Wl,--no-undefined
6 )
7
8+set_target_properties(hud-client PROPERTIES LINK_FLAGS "${ldflags} -Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libhud-client.map")
9+set_target_properties(hud-client PROPERTIES LINK_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/libhud-client.map")
10+
11 qt5_use_modules(hud-client
12 Core
13 )
14
15=== added file 'libhud-client/libhud-client.map'
16--- libhud-client/libhud-client.map 1970-01-01 00:00:00 +0000
17+++ libhud-client/libhud-client.map 2014-11-03 19:23:39 +0000
18@@ -0,0 +1,15 @@
19+{
20+global:
21+ hud_*;
22+ extern "C++" {
23+ hud::*;
24+ vtable?for?hud::*;
25+ typeinfo?for?hud::*;
26+ typeinfo?name?for?hud::*;
27+ };
28+local:
29+ *;
30+ extern "C++" {
31+ *;
32+ };
33+};
34
35=== modified file 'libhud/CMakeLists.txt'
36--- libhud/CMakeLists.txt 2013-11-25 17:24:13 +0000
37+++ libhud/CMakeLists.txt 2014-11-03 19:23:39 +0000
38@@ -103,6 +103,9 @@
39 COMPILE_FLAGS "-Wpedantic -Wall -Wextra"
40 )
41
42+set_target_properties(hud PROPERTIES LINK_FLAGS "${ldflags} -Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libhud.map")
43+set_target_properties(hud PROPERTIES LINK_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/libhud.map")
44+
45 target_link_libraries(hud
46 hud-generated
47 ${GLIB2_LIBRARIES}
48
49=== added file 'libhud/libhud.map'
50--- libhud/libhud.map 1970-01-01 00:00:00 +0000
51+++ libhud/libhud.map 2014-11-03 19:23:39 +0000
52@@ -0,0 +1,6 @@
53+{
54+global:
55+ hud_*;
56+local:
57+ *;
58+};

Subscribers

People subscribed via source and target branches