Ubuntu Settings Components

Merge lp:~3v1n0/ubuntu-settings-components/cmake-staging-install-fix into lp:ubuntu-settings-components

  1. cmake-staging-install-fix
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Rejected
Rejected by: Michał Sawicz
Proposed branch: lp:~3v1n0/ubuntu-settings-components/cmake-staging-install-fix
Merge into: lp:ubuntu-settings-components
Diff against target: 18 lines (+6/-1)
1 file modified
CMakeLists.txt (+6/-1)
To merge this branch: bzr merge lp:~3v1n0/ubuntu-settings-components/cmake-staging-install-fix
Reviewer Review Type Date Requested Status
Michał Sawicz Disapprove
Albert Astals Cid (community) Approve
Unity8 CI Bot continuous-integration Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+296866@code.launchpad.net

Commit message

CMake: allow to install qml files in local staging folder

Description of the change

Now by configuring this with cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/my-staging-folder will allow to install qml files in local path.

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:147
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/34/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/1924/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1950/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/34/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:147
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/38/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/1991/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2019/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/38/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

When not passing any CMAKE_INSTALL_PREFIX
  file(INSTALL DESTINATION "/usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/Settings/Menus" TYPE FILE FILES
changes to
  file(INSTALL DESTINATION "/usr/local/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/Settings/Menus" TYPE FILE FILES
in
  plugins/Ubuntu/Settings/Menus/cmake_install.cmake

I guess the second is probably "more correct" for some definition of correct but since it is not what you're trying to fix, i'd prefer if the invokation without CMAKE_INSTALL_PREFIX behaved the same than without this patch.

review: Needs Fixing
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:147
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/44/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2490
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2518
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2403
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2403
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2403
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2396
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2396/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2396
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2396/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2396
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2396/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2396
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2396/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2396
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2396/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2396
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2396/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2396
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2396/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2396
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2396/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2396
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2396/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/44/rebuild

review: Approve (continuous-integration)
lp:~3v1n0/ubuntu-settings-components/cmake-staging-install-fix updated
148. By Marco Trevisan (Treviño)

Merging with trunk

149. By Marco Trevisan (Treviño)

CMake: don't try to fix QT_INSTALL_PREFIX if CMAKE_INSTALL_PREFIX has not been defined by user

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Fixed the case... Unfortunately it can't be easily fixed when cmake is re-ran (and CmakeCache is there), but it works for first configurations.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:149
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/45/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2512
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2540
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2421
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2421
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2421
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2414
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2414/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2414
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2414/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2414
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2414/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2414
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2414/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2414
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2414/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2414
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2414/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2414
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2414/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2414
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2414/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2414
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2414/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/45/rebuild

review: Approve (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Works fine now.

review: Approve
Revision history for this message
Michał Sawicz (saviq) wrote :

Hey, sorry for not noticing - lp:~saviq/ubuntu-settings-components/packaging-cleanup has a bigger packaging rework that makes this work, too.

review: Disapprove

Unmerged revisions

149. By Marco Trevisan (Treviño)

CMake: don't try to fix QT_INSTALL_PREFIX if CMAKE_INSTALL_PREFIX has not been defined by user

148. By Marco Trevisan (Treviño)

Merging with trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-08-02 14:42:46 +0000
3+++ CMakeLists.txt 2016-08-09 15:08:32 +0000
4@@ -14,9 +14,14 @@
5 set(OUR_QT_QUICK_LIB ${Qt5Quick_LIBRARIES})
6
7 get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
8+exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_PREFIX" OUTPUT_VARIABLE QT_INSTALL_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
9 exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" OUTPUT_VARIABLE QT_IMPORTS_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
10+
11+if(NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
12+ string(REPLACE ${QT_INSTALL_PREFIX} ${CMAKE_INSTALL_PREFIX} QT_IMPORTS_DIR ${QT_IMPORTS_DIR})
13+endif()
14+
15 file(TO_CMAKE_PATH "${QT_IMPORTS_DIR}" QT_IMPORTS_DIR)
16-
17 set(OUR_QT_QUICK_INCLUDE ${Qt5Quick_INCLUDE_DIRS})
18 LIST(APPEND QT_PKGCONFIG_DEPENDENCIES "Qt5Quick")
19

Subscribers

People subscribed via source and target branches