Merge lp:~jpakkane/compiz/pyrexfix into lp:compiz/0.9.9

Proposed by Jussi Pakkanen
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 3500
Merged at revision: 3505
Proposed branch: lp:~jpakkane/compiz/pyrexfix
Merge into: lp:compiz/0.9.9
Diff against target: 17 lines (+6/-1)
1 file modified
compizconfig/compizconfig-python/CMakeLists.txt (+6/-1)
To merge this branch: bzr merge lp:~jpakkane/compiz/pyrexfix
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
Sam Spilsbury Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+137877@code.launchpad.net

Commit message

Explicitly check for the existence of pyrexc and error out if it is not found.
(LP: #1086704)

Description of the change

Explicitly check for the existence of pyrexc and error out if it is not found.

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

Please create a bug for this issue and link it...

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Approved, pending bug creation.

review: Approve
Revision history for this message
Jussi Pakkanen (jpakkane) wrote :

Bug created and linked.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/compizconfig-python/CMakeLists.txt'
2--- compizconfig/compizconfig-python/CMakeLists.txt 2012-10-17 17:19:41 +0000
3+++ compizconfig/compizconfig-python/CMakeLists.txt 2012-12-04 15:24:30 +0000
4@@ -29,8 +29,13 @@
5 set (PY_COMPIZCONFIG_SRC ${CMAKE_CURRENT_BINARY_DIR}/compizconfig.c)
6 set (PY_COMPIZCONFIG_PYREX ${CMAKE_CURRENT_SOURCE_DIR}/src/compizconfig.pyx)
7
8+find_program(PYREXC_BIN pyrexc)
9+if(NOT PYREXC_BIN)
10+ message(FATAL_ERROR "Can not build because pyrexc binary not found.")
11+endif()
12+
13 add_custom_command (OUTPUT ${PY_COMPIZCONFIG_SRC}
14- COMMAND pyrexc -o ${PY_COMPIZCONFIG_SRC} ${PY_COMPIZCONFIG_PYREX}
15+ COMMAND ${PYREXC_BIN} -o ${PY_COMPIZCONFIG_SRC} ${PY_COMPIZCONFIG_PYREX}
16 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
17 DEPENDS ${PY_COMPIZCONFIG_PYREX})
18

Subscribers

People subscribed via source and target branches