Ubuntu Terminal App

Merge lp:~larryprice/ubuntu-terminal-app/fix-cmake-xenial into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

  1. fix-cmake-xenial
  2. Merge into reboot
Proposed by Larry Price
Status: Rejected
Rejected by: Alan Pope 🍺🐧🐱 🦄
Proposed branch: lp:~larryprice/ubuntu-terminal-app/fix-cmake-xenial
Merge into: lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Diff against target: 11 lines (+2/-0)
1 file modified
src/plugin/qmltermwidget/CMakeLists.txt (+2/-0)
To merge this branch: bzr merge lp:~larryprice/ubuntu-terminal-app/fix-cmake-xenial
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 (community) Disapprove
Review via email: mp+297394@code.launchpad.net

Commit message

Update CMakeLists.txt to explicitly create QMLTermWidget directory.

Description of the change

Update CMakeLists.txt to explicitly create QMLTermWidget directory.

I noticed that the build was failing on xenial (locally + the daily recipe builds) and tracked it down to the first copy command in src/plugin/qmltermwidget/CMakeLists.txt, which copied a regular file into a location which is supposed to be a directory but had not yet been created. Creating the directory first fixes the issue for me.

See failing daily build on xenial: https://code.launchpad.net/~dpm/+archive/ubuntu/ppa/+build/9877450

To post a comment you must log in.
lp:~larryprice/ubuntu-terminal-app/fix-cmake-xenial updated
205. By Larry Price

make_directory syntax

Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Thanks Larry. Apologies for the lengthy delay in responding. As discussed on irc, this merge has been superseded.

review: Disapprove

Unmerged revisions

205. By Larry Price

make_directory syntax

204. By Larry Price

Undo auto-whitespace updates

203. By Larry Price

Fixing xenial build by explicitly creating QMLTermWidget directory

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/plugin/qmltermwidget/CMakeLists.txt'
2--- src/plugin/qmltermwidget/CMakeLists.txt 2014-11-15 14:39:05 +0000
3+++ src/plugin/qmltermwidget/CMakeLists.txt 2016-06-15 19:59:48 +0000
4@@ -3,6 +3,8 @@
5 )
6
7 set(PLUGIN_DIR QMLTermWidget)
8+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR})
9+
10 add_definitions(-DHAVE_POSIX_OPENPT -DHAVE_SYS_TIME_H -DHAVE_UPDWTMPX)
11 add_definitions(-DQ_WS_UBUNTU)
12

Subscribers

People subscribed via source and target branches