Unity HUD

Merge lp:~pete-woods/hud/random-build-changes into lp:hud/phablet

  1. random-build-changes
  2. Merge into phablet
Proposed by Pete Woods
Status: Merged
Approved by: Ted Gould
Approved revision: 373
Merged at revision: 372
Proposed branch: lp:~pete-woods/hud/random-build-changes
Merge into: lp:hud/phablet
Diff against target: 41 lines (+6/-3)
2 files modified
CMakeLists.txt (+5/-2)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~pete-woods/hud/random-build-changes
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+157297@code.launchpad.net

Commit message

Make docs only when asked for, and set C standard to C11

Description of the change

Make docs only when asked for, and set C standard to C11

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

PASSED: Continuous integration, rev:373
http://s-jenkins:8080/job/hud-small-ci/310/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/hud-small-ci/./build=pbuilder,distribution=quantal,flavor=i386/310

Click here to trigger a rebuild:
http://s-jenkins:8080/job/hud-small-ci/310/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-04-02 16:30:44 +0000
+++ CMakeLists.txt 2013-04-05 08:16:23 +0000
@@ -10,6 +10,7 @@
10 message(FATAL_ERROR "In-tree build attempt detected, aborting. Set your build dir outside your source dir, delete CMakeCache.txt from source root and try again.")10 message(FATAL_ERROR "In-tree build attempt detected, aborting. Set your build dir outside your source dir, delete CMakeCache.txt from source root and try again.")
11endif()11endif()
1212
13option(ENABLE_DOCUMENTATION "Enable documentation." OFF)
13option(ENABLE_TESTS "Enable tests." ON)14option(ENABLE_TESTS "Enable tests." ON)
14option(ENABLE_VOICE_TESTS "Enable voice tests" ON)15option(ENABLE_VOICE_TESTS "Enable voice tests" ON)
15option(ENABLE_SCALABILITY_TESTS "Additional scalability tests that are potentially very slow to run." OFF)16option(ENABLE_SCALABILITY_TESTS "Additional scalability tests that are potentially very slow to run." OFF)
@@ -121,7 +122,7 @@
121include_directories(${CMAKE_CURRENT_SOURCE_DIR})122include_directories(${CMAKE_CURRENT_SOURCE_DIR})
122include_directories(${CMAKE_CURRENT_BINARY_DIR})123include_directories(${CMAKE_CURRENT_BINARY_DIR})
123124
124set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -fPIC")125set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -fPIC")
125126
126add_subdirectory(data)127add_subdirectory(data)
127add_subdirectory(libhud-client)128add_subdirectory(libhud-client)
@@ -143,4 +144,6 @@
143endif()144endif()
144145
145add_subdirectory(tools-vala)146add_subdirectory(tools-vala)
146add_subdirectory(docs)147if(${ENABLE_DOCUMENTATION})
148 add_subdirectory(docs)
149endif()
147150
=== modified file 'debian/rules'
--- debian/rules 2013-04-02 08:34:53 +0000
+++ debian/rules 2013-04-05 08:16:23 +0000
@@ -8,7 +8,7 @@
8 dh $@ --parallel8 dh $@ --parallel
99
10override_dh_auto_configure:10override_dh_auto_configure:
11 dh_auto_configure -- -DDEBIAN_TARGET_DIR="${DEBIAN_TARGET_DIR}" -DENABLE_VOICE_TESTS=OFF11 dh_auto_configure -- -DDEBIAN_TARGET_DIR="${DEBIAN_TARGET_DIR}" -DENABLE_DOCUMENTATION=ON -DENABLE_VOICE_TESTS=OFF
1212
13override_dh_install:13override_dh_install:
14 dh_install --fail-missing14 dh_install --fail-missing

Subscribers

People subscribed via source and target branches