Merge lp:~compiz-team/compiz/fix-1051595-mskala into lp:compiz/0.9.9

[Daniel van Vugt]

Fixed: findcompiz_install doesn't work (LP: #1051595)
Author: Matija Skala <email address hidden>

I have not tested or verified this yet -Daniel

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/301//rebuild/?

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Verified it works.

review: Approve

=== modified file 'cmake/base.cmake'
--- cmake/base.cmake	2012-05-26 10:52:26 +0000
+++ cmake/base.cmake	2012-12-06 02:49:23 +0000
@@ -56,7 +56,7 @@
 	     ${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/FindCompiz.cmake ${CMAKE_ROOT}/Modules &&
 	${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindOpenGLES2.cmake ${CMAKE_ROOT}/Modules
     )
     find_file (_find_compizconfig FindCompizConfig.cmake PATHS ${CMAKE_ROOT}/Modules ${ARGN})