Compiz

Merge lp:~vanvugt/compiz/fix-1088414 into lp:compiz/0.9.9

  1. fix-1088414
  2. Merge into 0.9.9
Proposed by Daniel van Vugt
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 3519
Merged at revision: 3521
Proposed branch: lp:~vanvugt/compiz/fix-1088414
Merge into: lp:compiz/0.9.9
Diff against target: 26 lines (+9/-1)
1 file modified
cmake/CompizCommon.cmake (+9/-1)
To merge this branch: bzr merge lp:~vanvugt/compiz/fix-1088414
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Sam Spilsbury Approve
Review via email: mp+138941@code.launchpad.net

Commit message

Default to BUILD_GLES=ON when building for ARM so you don't have to specify
it manually. (LP: #1088414)

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3519
http://jenkins.qa.ubuntu.com/job/compiz-ci/316/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/316/console

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

review: Approve (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Please change that as well on debian/rules or ask mterry or I do it :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/CompizCommon.cmake'
2--- cmake/CompizCommon.cmake 2012-10-16 13:53:20 +0000
3+++ cmake/CompizCommon.cmake 2012-12-10 12:06:23 +0000
4@@ -1,5 +1,7 @@
5 cmake_minimum_required (VERSION 2.6)
6
7+include (FindPkgConfig)
8+
9 if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
10 message (SEND_ERROR "Building in the source directory is not supported.")
11 message (FATAL_ERROR "Please remove the created \"CMakeCache.txt\" file, the \"CMakeFiles\" directory and create a build directory and call \"${CMAKE_COMMAND} <path to the sources>\".")
12@@ -18,7 +20,13 @@
13
14 set (CMAKE_SKIP_RPATH FALSE)
15
16-option (BUILD_GLES "Build against GLESv2 instead of GL" OFF)
17+pkg_check_modules (GL QUIET gl)
18+set (BUILD_GLES_DEFAULT OFF)
19+if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm.*" OR NOT GL_FOUND)
20+ set (BUILD_GLES_DEFAULT ON)
21+endif ()
22+option (BUILD_GLES "Build against GLESv2 instead of GL" ${BUILD_GLES_DEFAULT})
23+
24 option (COMPIZ_BUILD_WITH_RPATH "Leave as ON unless building packages" ON)
25 option (COMPIZ_RUN_LDCONFIG "Leave OFF unless you need to run ldconfig after install")
26 option (COMPIZ_PACKAGING_ENABLED "Enable to manually set prefix, exec_prefix, libdir, includedir, datadir" OFF)

Subscribers

People subscribed via source and target branches