ubuntu-touch-coreapps-reviewers team mailing list archive

[Larry Price <larry.price@xxxxxxxxxxxxx>]

Larry Price has proposed merging lp:~larryprice/ubuntu-terminal-app/fix-cmake-xenial into lp:ubuntu-terminal-app.

Commit message:
Update CMakeLists.txt to explicitly create QMLTermWidget directory.

Requested reviews:
  Ubuntu Terminal Developers (ubuntu-terminal-dev)

For more details, see:
https://code.launchpad.net/~larryprice/ubuntu-terminal-app/fix-cmake-xenial/+merge/297394

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
-- 
Your team Ubuntu Terminal Developers is requested to review the proposed merge of lp:~larryprice/ubuntu-terminal-app/fix-cmake-xenial into lp:ubuntu-terminal-app.

=== modified file 'src/plugin/qmltermwidget/CMakeLists.txt'
--- src/plugin/qmltermwidget/CMakeLists.txt	2014-11-15 14:39:05 +0000
+++ src/plugin/qmltermwidget/CMakeLists.txt	2016-06-14 20:29:52 +0000
@@ -3,6 +3,8 @@
 )
 
 set(PLUGIN_DIR QMLTermWidget)
+file(MAKE_DIRECTORY(${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}))
+
 add_definitions(-DHAVE_POSIX_OPENPT -DHAVE_SYS_TIME_H -DHAVE_UPDWTMPX)
 add_definitions(-DQ_WS_UBUNTU)