Merge lp:~compiz-team/compiz/fix-1051595 into lp:compiz/0.9.8

Proposed by Sam Spilsbury on 2012-09-18
Status: Rejected
Rejected by: Daniel van Vugt on 2012-09-28
Proposed branch: lp:~compiz-team/compiz/fix-1051595
Merge into: lp:compiz/0.9.8
Diff against target: 38 lines (+5/-14)
1 file modified
cmake/base.cmake (+5/-14)
To merge this branch: bzr merge lp:~compiz-team/compiz/fix-1051595
Reviewer Review Type Date Requested Status
Daniel van Vugt 2012-09-18 Needs Fixing on 2012-09-20
jenkins (community) continuous-integration 2012-09-18 Needs Fixing on 2012-09-18
Review via email: mp+124977@code.launchpad.net

This proposal supersedes a proposal from 2012-09-18.

Commit message

Some problems with make findcompiz_install and make findcompizconfig_install
- make findcompiz_install errors since r3320
- in r3219 installs the findcompiz*.cmake-files with a normal make install,
but not in the Modules directory. This is a) wrong and b) not according to
the message that findcompiz* must be installed with make findcompiz_install.
Patch fixes this, by removing the extra file install with make install, and
cleaning up the building of the findcompiz-target.
(LP: #1051595)

Description of the change

Some problems with make findcompiz_install and make findcompizconfig_install
- make findcompiz_install errors since r3320
- in r3219 installs the findcompiz*.cmake-files with a normal make install,
but not in the Modules directory. This is a) wrong and b) not according to
the message that findcompiz* must be installed with make findcompiz_install.
Patch fixes this, by removing the extra file install with make install, and
cleaning up the building of the findcompiz-target.
(LP: #1051595)

To post a comment you must log in.
jenkins (martin-mrazik+qa) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Sam Spilsbury (smspillaz) wrote :

Try again jenkins

jenkins (martin-mrazik+qa) wrote :
review: Needs Fixing (continuous-integration)
Martin Mrazik (mrazik) wrote :

Do you think this is a problem on jenkins side? TBH I don't see anything obvious.

Martin Mrazik (mrazik) wrote :

I think this is the line which makes it fail:

dh_install: compiz-dev missing files (debian/tmp/usr/share/cmake*/FindCompiz.cmake), aborting

Martin Mrazik (mrazik) wrote :

Looks like a packaging/installing issue to me (see also the comment in debian/rules for override_dh_install). Ping me if you still think its a jenkins problem.

Sam Spilsbury (smspillaz) wrote :

Ah, you're right. I wasn't looking at the right link. We'll need to fix the packaging to handle that I guess

Daniel van Vugt (vanvugt) wrote :

Not installing share/cmake-2.8/FindCompiz.cmake
will break builds of Unity which needs it for:
  find_package (Compiz REQUIRED)

Or am I missing something?

review: Needs Information
Daniel van Vugt (vanvugt) wrote :

Confirmed, this breaks Unity builds.

review: Needs Fixing
Daniel van Vugt (vanvugt) wrote :

Rejecting this because it needs fixing and needs to be resubmitted targeting lp:compiz

Unmerged revisions

3378. By erikjanp on 2012-09-18

Some problems with make findcompiz_install and make findcompizconfig_install
- make findcompiz_install errors since r3320
- in r3219 installs the findcompiz*.cmake-files with a normal make install,
but not in the Modules directory. This is a) wrong and b) not according to
the message that findcompiz* must be installed with make findcompiz_install.
Patch fixes this, by removing the extra file install with make install, and
cleaning up the building of the findcompiz-target.
(LP: #1051595)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/base.cmake'
2--- cmake/base.cmake 2012-05-26 10:52:26 +0000
3+++ cmake/base.cmake 2012-09-18 16:30:46 +0000
4@@ -49,15 +49,10 @@
5 message ("Call \"sudo make findcompiz_install\" to install it.\n")
6 compiz_print_configure_footer ()
7 endif ()
8- install (FILES
9- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindCompiz.cmake
10- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindOpenGLES2.cmake
11- DESTINATION
12- ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
13 add_custom_target (findcompiz_install
14- ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
15- ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${CMAKE_ROOT}/Modules
16- ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindOpenGLES2.cmake ${CMAKE_ROOT}/Modules
17+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules
18+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${CMAKE_ROOT}/Modules
19+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindOpenGLES2.cmake ${CMAKE_ROOT}/Modules
20 )
21 find_file (_find_compizconfig FindCompizConfig.cmake PATHS ${CMAKE_ROOT}/Modules ${ARGN})
22 if (NOT _find_compizconfig)
23@@ -67,14 +62,10 @@
24 message ("Call \"sudo make findcompiz_install\" to install it.\n")
25 compiz_print_configure_footer ()
26 endif (NOT _find_compizconfig)
27- install (FILES
28- ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake
29- DESTINATION
30- ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
31 add_custom_target (
32 findcompizconfig_install
33- ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
34- ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${CMAKE_ROOT}/Modules
35+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules
36+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${CMAKE_ROOT}/Modules
37 )
38 endfunction ()
39

Subscribers

People subscribed via source and target branches