U1DB

Merge lp:~ralsina/u1db/cmake5 into lp:u1db

  1. cmake5
  2. Merge into trunk
Proposed by Roberto Alsina on 2012-07-05
Status: Merged
Approved by: dobey on 2012-07-05
Approved revision: 345
Merged at revision: 345
Proposed branch: lp:~ralsina/u1db/cmake5
Merge into: lp:u1db
Diff against target: 21 lines (+2/-2)
1 file modified
CMakeLists.txt (+2/-2)
To merge this branch: bzr merge lp:~ralsina/u1db/cmake5
Reviewer Review Type Date Requested Status
dobey (community) 2012-07-05 Approve on 2012-07-05
Review via email: mp+113606@code.launchpad.net

Commit Message

Add missing dependency, strip newline from version

Description of the Change

Add missing dependency, strip newline from version

To post a comment you must log in.
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-07-05 14:32:31 +0000
3+++ CMakeLists.txt 2012-07-05 16:02:25 +0000
4@@ -5,7 +5,7 @@
5 include_directories(${CMAKE_SOURCE_DIR}/include)
6
7 execute_process(COMMAND python ${CMAKE_SOURCE_DIR}/setup.py --version
8- OUTPUT_VARIABLE PROJECT_VERSION)
9+ OUTPUT_VARIABLE PROJECT_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
10
11 set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${PROJECT_VERSION})
12 add_custom_target(dist
13@@ -82,7 +82,7 @@
14 # Do NOT build this one in-place
15 COMMAND python setup.py build_ext -f -I ${CMAKE_SOURCE_DIR}/include
16 COMMAND python setup.py install --prefix=${CMAKE_INSTALL_PREFIX} --root=${CMAKE_CURRENT_BINARY_DIR}/temp
17- DEPENDS ReplicatePythonSourceTree
18+ DEPENDS ReplicatePythonSourceTree u1db
19 )
20
21 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/temp/${CMAKE_INSTALL_PREFIX}/

Subscribers

People subscribed via source and target branches