← Back to branch summary

~vanvugt/compiz/fix-1009320

« back to all changes in this revision

Viewing changes to cmake/CompizCommon.cmake

  • Committer: smspillaz
  • Date: 2012-05-24 00:55:17 UTC
  • mto: This revision was merged to the branch mainline in revision 3219.
  • Revision ID: sam.spilsbury@canonical.com-20120524005517-g7t8sbd4d4tarxs3
Remove COMPIZ_DESTDIR

It was a broken hack for a problem that didn't exist

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmake/CompizCommon.cmake
22
22
option (COMPIZ_RUN_LDCONFIG "Leave OFF unless you need to run ldconfig after install")
23
23
option (COMPIZ_PACKAGING_ENABLED "Enable to manually set prefix, exec_prefix, libdir, includedir, datadir" OFF)
24
24
option (COMPIZ_BUILD_TESTING "Build Unit Tests" ON)
25
 
set (COMPIZ_DESTDIR "${DESTDIR}" CACHE STRING "Leave blank unless building packages")
26
 
 
27
 
if (NOT COMPIZ_DESTDIR)
28
 
    set (COMPIZ_DESTDIR $ENV{DESTDIR})
29
 
endif ()
30
25
 
31
26
set (COMPIZ_DATADIR ${CMAKE_INSTALL_PREFIX}/share)
32
27
set (COMPIZ_METADATADIR ${CMAKE_INSTALL_PREFIX}/share/compiz)
492
487
 
493
488
        install (
494
489
            FILES ${_file}
495
 
            DESTINATION ${COMPIZ_DESTDIR}${includedir}/compiz/${_prefix}
 
490
            DESTINATION ${includedir}/compiz/${_prefix}
496
491
        )
497
492
 
498
493
    endforeach (_file)
738
733
    install (CODE
739
734
        "message (\"-- Installing: ${_dst}\")
740
735
         execute_process (
741
 
            COMMAND ${CMAKE_COMMAND} -E copy_if_different \"${_src}\" \"${COMPIZ_DESTDIR}${_dst}\"
 
736
            COMMAND ${CMAKE_COMMAND} -E copy_if_different \"${_src}\" \"$ENV{DESTDIR}${_dst}\"
742
737
            RESULT_VARIABLE _result
743
738
            OUTPUT_QUIET ERROR_QUIET
744
739
         )