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

[Daniel van Vugt]

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)

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)

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3378
http://jenkins.qa.ubuntu.com/job/compiz-ci/83/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/83/console

review: Needs Fixing (continuous-integration)

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)

=== modified file 'cmake/base.cmake'
--- cmake/base.cmake	2012-05-26 10:52:26 +0000
+++ cmake/base.cmake	2012-09-18 09:33:21 +0000
@@ -49,15 +49,10 @@
         message ("Call \"sudo make findcompiz_install\" to install it.\n")
         compiz_print_configure_footer ()
     endif ()
-    install (FILES
-	     ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindCompiz.cmake
-	     ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindOpenGLES2.cmake
-	     DESTINATION
-	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
     add_custom_target (findcompiz_install
-	${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
-	${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${CMAKE_ROOT}/Modules
-	${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindOpenGLES2.cmake ${CMAKE_ROOT}/Modules
+	COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules
+	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${CMAKE_ROOT}/Modules
+	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindOpenGLES2.cmake ${CMAKE_ROOT}/Modules
     )
     find_file (_find_compizconfig FindCompizConfig.cmake PATHS ${CMAKE_ROOT}/Modules ${ARGN})
     if (NOT _find_compizconfig)
@@ -67,14 +62,10 @@
 	message ("Call \"sudo make findcompiz_install\" to install it.\n")
 	compiz_print_configure_footer ()
     endif (NOT _find_compizconfig)
-    install (FILES
-	     ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake
-	     DESTINATION
-	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
     add_custom_target (
 	findcompizconfig_install
-	${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
-	${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${CMAKE_ROOT}/Modules
+	COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules
+	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${CMAKE_ROOT}/Modules
     )
 endfunction ()