~townsend/compiz/fix-auto-vp-switch-0.9.10

« back to all changes in this revision

Viewing changes to cmake/CompizPlugin.cmake

  • Committer: Sam Spilsbury
  • Date: 2012-10-16 13:53:20 UTC
  • mto: This revision was merged to the branch mainline in revision 3434.
  • Revision ID: sam.spilsbury@canonical.com-20121016135320-3zb8wy8u16eayb7m
Clean up the CMake code around the python modules and uninstalling
 - It isn't possible to build python extensions using distutils that
   link to things that we are building, because CMake provides no
   means for a custom command to depend on a library. Build them
   using CMake directly instead
 - Clean up the tests: the tests depended on having a working opengl
   and core plugin xml file and were also sensitive to xml data. Make
   a mock.xml and use that instead
 - Require ini for the compizconfig-python tests. They won't run without it
 - Fix the uninstall scripts. We were clobbering the uninstall target
   with the python uninstall targets, that is just plain wrong. Created
   a new cmake function to append custom uninstall scripts to the global
   uninstall script

Show diffs side-by-side

added added

removed removed

Lines of Context:
417
417
            LIBRARY DESTINATION ${PLUGIN_LIBDIR}
418
418
        )
419
419
 
420
 
        compiz_add_uninstall ()
 
420
        if (NOT _COMPIZ_INTERNAL)
 
421
 
 
422
            compiz_add_uninstall ()
 
423
 
 
424
        endif (NOT _COMPIZ_INTERNAL)
421
425
 
422
426
        if (NOT COMPIZ_PLUGIN_PACK_BUILD)
423
427
                set (CMAKE_PROJECT_NAME plugin-${plugin})