Merge lp:~pete-woods/hud/kill-curses into lp:hud/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
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-04-02 09:59:17 +0000
+++ CMakeLists.txt 2013-04-02 16:36:31 +0000
@@ -96,11 +96,6 @@
96 check_function_exists(kill HAVE_KILL)96 check_function_exists(kill HAVE_KILL)
97endif()97endif()
9898
99find_package(Curses)
100check_include_file("readline/readline.h" READLINE_FOUND)
101check_include_file("readline/history.h" READLINE_HISTORY_FOUND)
102find_library(READLINE_LIBRARIES NAMES readline)
103
104pkg_search_module(PANGO REQUIRED pango)99pkg_search_module(PANGO REQUIRED pango)
105100
106pkg_search_module(BAMF libbamf3)101pkg_search_module(BAMF libbamf3)
107102
=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt 2013-03-27 22:45:20 +0000
+++ tools/CMakeLists.txt 2013-04-02 16:36:31 +0000
@@ -4,7 +4,7 @@
4include_directories(${HUD_CLIENT_INCLUDE_DIRS})4include_directories(${HUD_CLIENT_INCLUDE_DIRS})
5include_directories(${HUD_SERVICE_INCLUDE_DIRS})5include_directories(${HUD_SERVICE_INCLUDE_DIRS})
66
7if(${READLINE_FOUND} AND ${READLINE_HISTORY_FOUND} AND ${CURSES_FOUND} AND ${PANGO_FOUND})7if(${PANGO_FOUND})
88
9include_directories(${PANGO_INCLUDE_DIRS})9include_directories(${PANGO_INCLUDE_DIRS})
1010
@@ -16,8 +16,6 @@
1616
17target_link_libraries(hud-cli17target_link_libraries(hud-cli
18hud-service18hud-service
19${CURSES_LIBRARIES}
20${READLINE_LIBRARIES}
21${PANGO_LIBRARIES}19${PANGO_LIBRARIES}
22)20)
2321
@@ -81,4 +79,4 @@
81install(79install(
82 TARGETS hud-pronounce-for-word80 TARGETS hud-pronounce-for-word
83 RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"81 RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
84)
85\ No newline at end of file82\ No newline at end of file
83)

Subscribers

People subscribed via source and target branches