Merge lp:~nskaggs/reminders-app/fix-cmake-build into lp:reminders-app

[Nicholas Skaggs]

Fix cmake build

Cmake build fails in trunk, this should correct it allowing valid builds again. I believe the failure was introduced during the change to reminders from reminders-app.

[lp:~nskaggs/reminders-app/fix-cmake-build]

63. By Nicholas Skaggs on 2014-02-11

remove unneeded install step in cmake

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:63
http://91.189.93.70:8080/job/reminders-app-ci/205/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1248/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/205/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/205/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/205/rebuild

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Thanks Nick for looking into this.

To be able to review this, could you describe how exactly the build is failing and how to reproduce the build failure?

Running the following to create the package manually seems to work, and I haven't seen any build failures building from Qt Creator. However Jenkins probably does the build differently.

bzr branch lp:reminders-app
mkdir ../build-reminders
cd ../build-reminders
QT_SELECT=qt5 cmake ../reminders-app/ -DCLICK_MODE=1
make -j2
make install DESTDIR=install
click build install

review: Needs Information

[Michael Zanetti (mzanetti)]

Huh? This actually breaks compilation here as reminders.in is not in the repo any more. Looks like you have a dirty working dir.

We don't want to generate a script for calling qmlscene any more as reminders doesn't support being run by qmlscene. We need our own compiled binary.

review: Disapprove

[Nicholas Skaggs (nskaggs)]

@dpm, I'm not sure why jenkins doesn't like to build it, I'll have to look deeper today. I did use this to build the latest reminders and push to the store.

@mzanetti, it's a 2 line change, nothing to do with qmlscene, etc. It adds back the configure step. If you are seeing more perhaps something is wrong with the branch.

[Michael Zanetti (mzanetti)]

@Nicholas: The configure change you reintroduced was to generate a script calling qmlscene reminders-app.qml. That's why I pointed out the above qmlscene thing.

Please make sure you don't have the "reminders.in" file around any more as that one is probably able to cause the issue you're seeing.

Unmerged revisions

63. By Nicholas Skaggs on 2014-02-11

remove unneeded install step in cmake

62. By Nicholas Skaggs on 2014-02-11

Fix cmake build

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-05 10:14:57 +0000
+++ CMakeLists.txt	2014-02-11 19:42:58 +0000
@@ -37,6 +37,8 @@
 	set(DESKTOP_DIR ${DATA_DIR})
 else(CLICK_MODE)
 	set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
+	configure_file(${APP_HARDCODE}.in
+		${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
 	set(EXEC "reminders")
 	set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}")
 	set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)