Unity HUD

Merge lp:~pete-woods/hud/kill-curses into lp:hud/phablet

  1. kill-curses
  2. Merge into phablet
Proposed by Pete Woods
Status: Merged
Approved by: Ted Gould
Approved revision: 369
Merged at revision: 369
Proposed branch: lp:~pete-woods/hud/kill-curses
Merge into: lp:hud/phablet
Diff against target: 44 lines (+2/-9)
2 files modified
CMakeLists.txt (+0/-5)
tools/CMakeLists.txt (+2/-4)
To merge this branch: bzr merge lp:~pete-woods/hud/kill-curses
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ted Gould (community) Approve
Review via email: mp+156633@code.launchpad.net

Commit message

Remove the last traces of curses

Description of the change

Remove the last traces of curses

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-04-02 09:59:17 +0000
3+++ CMakeLists.txt 2013-04-02 16:36:31 +0000
4@@ -96,11 +96,6 @@
5 check_function_exists(kill HAVE_KILL)
6 endif()
7
8-find_package(Curses)
9-check_include_file("readline/readline.h" READLINE_FOUND)
10-check_include_file("readline/history.h" READLINE_HISTORY_FOUND)
11-find_library(READLINE_LIBRARIES NAMES readline)
12-
13 pkg_search_module(PANGO REQUIRED pango)
14
15 pkg_search_module(BAMF libbamf3)
16
17=== modified file 'tools/CMakeLists.txt'
18--- tools/CMakeLists.txt 2013-03-27 22:45:20 +0000
19+++ tools/CMakeLists.txt 2013-04-02 16:36:31 +0000
20@@ -4,7 +4,7 @@
21 include_directories(${HUD_CLIENT_INCLUDE_DIRS})
22 include_directories(${HUD_SERVICE_INCLUDE_DIRS})
23
24-if(${READLINE_FOUND} AND ${READLINE_HISTORY_FOUND} AND ${CURSES_FOUND} AND ${PANGO_FOUND})
25+if(${PANGO_FOUND})
26
27 include_directories(${PANGO_INCLUDE_DIRS})
28
29@@ -16,8 +16,6 @@
30
31 target_link_libraries(hud-cli
32 hud-service
33-${CURSES_LIBRARIES}
34-${READLINE_LIBRARIES}
35 ${PANGO_LIBRARIES}
36 )
37
38@@ -81,4 +79,4 @@
39 install(
40 TARGETS hud-pronounce-for-word
41 RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
42-)
43\ No newline at end of file
44+)

Subscribers

People subscribed via source and target branches