← Back to branch summary

~compiz-team/compiz/fix-1051595

« back to all changes in this revision

Viewing changes to cmake/base.cmake

  • Committer: Daniel van Vugt
  • Author(s): erikjanp
  • Date: 2012-09-18 09:30:10 UTC
  • Revision ID: daniel.van.vugt@canonical.com-20120918093010-229m68n4m9taotp3
https://launchpad.net/bugs/1051595
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)

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmake/base.cmake
49
49
        message ("Call \"sudo make findcompiz_install\" to install it.\n")
50
50
        compiz_print_configure_footer ()
51
51
    endif ()
52
 
    install (FILES
53
 
             ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindCompiz.cmake
54
 
             ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindOpenGLES2.cmake
55
 
             DESTINATION
56
 
             ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
57
52
    add_custom_target (findcompiz_install
58
 
        ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
59
 
        ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${CMAKE_ROOT}/Modules
60
 
        ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindOpenGLES2.cmake ${CMAKE_ROOT}/Modules
 
53
        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules
 
54
        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${CMAKE_ROOT}/Modules
 
55
        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindOpenGLES2.cmake ${CMAKE_ROOT}/Modules
61
56
    )
62
57
    find_file (_find_compizconfig FindCompizConfig.cmake PATHS ${CMAKE_ROOT}/Modules ${ARGN})
63
58
    if (NOT _find_compizconfig)
67
62
        message ("Call \"sudo make findcompiz_install\" to install it.\n")
68
63
        compiz_print_configure_footer ()
69
64
    endif (NOT _find_compizconfig)
70
 
    install (FILES
71
 
             ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake
72
 
             DESTINATION
73
 
             ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
74
65
    add_custom_target (
75
66
        findcompizconfig_install
76
 
        ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
77
 
        ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${CMAKE_ROOT}/Modules
 
67
        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules
 
68
        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${CMAKE_ROOT}/Modules
78
69
    )
79
70
endfunction ()
80
71