ubuntu-touch-coreapps-reviewers team mailing list archive

[Dan Chapman  <dan@xxxxxxxxxxxxxxxx>]

Diff comments:

> 
> === 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-09-08 11:44:05 +0000
> @@ -70,6 +70,7 @@
>  
>  # Copy the plugin, the qmldir file and other assets to the build dir for running in QtCreator
>  if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
> +    file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR})
>      add_custom_target(qmltermwidget-qmldir ALL

I think the order of processing in cmake changed. The QMLTermWidget directory was previously set to be created post build http://bazaar.launchpad.net/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot/view/head:/src/plugin/qmltermwidget/CMakeLists.txt#L82. But the add_custom_target' run during the build so they were trying to copy the file resources to a non-existent directory, and ending up with a QMLTermWidget file instead of directory. Looks to me like they fixed a bug in cmake as it seems to be doing the correct thing on xenial.

I suppose we could actually drop L83 as the change above is doing the same thing.

>          COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/src/qmldir ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}
>          DEPENDS ${QMLFILES}


-- 
https://code.launchpad.net/~popey/ubuntu-terminal-app/add-snapcraft-config/+merge/305206
Your team Ubuntu Terminal Developers is subscribed to branch lp:ubuntu-terminal-app.