Audience

Merge lp:~xapantu/audience/cmake-fix into lp:~audience-members/audience/trunk

  1. cmake-fix
  2. Merge into trunk
Proposed by xapantu
Status: Merged
Approved by: Pim Vullers
Approved revision: 54
Merged at revision: 55
Proposed branch: lp:~xapantu/audience/cmake-fix
Merge into: lp:~audience-members/audience/trunk
Diff against target: 25 lines (+4/-4)
1 file modified
cmake/ValaPrecompile.cmake (+4/-4)
To merge this branch: bzr merge lp:~xapantu/audience/cmake-fix
Reviewer Review Type Date Requested Status
Pim Vullers (community) Approve
Review via email: mp+94451@code.launchpad.net

Commit message

Fix CMake build issues

To post a comment you must log in.
Revision history for this message
Pim Vullers (pimvullers) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/ValaPrecompile.cmake'
2--- cmake/ValaPrecompile.cmake 2012-02-18 08:04:30 +0000
3+++ cmake/ValaPrecompile.cmake 2012-02-23 20:48:10 +0000
4@@ -117,6 +117,7 @@
5 set(out_files "")
6 set(${output} "")
7 foreach(src ${ARGS_DEFAULT_ARGS})
8+ string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" src ${src})
9 string(REGEX MATCH "^/" IS_MATCHED ${src})
10 if(${IS_MATCHED} MATCHES "/")
11 list(APPEND in_files "${src}")
12@@ -126,10 +127,9 @@
13 string(REPLACE ".vala" ".c" src ${src})
14 string(REPLACE ".gs" ".c" src ${src})
15 if(${IS_MATCHED} MATCHES "/")
16- string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} src ${src})
17- #get_filename_component(VALA_FILE_NAME ${src} NAME)
18- set(out_file "${src}")
19- list(APPEND out_files "${src}")
20+ get_filename_component(VALA_FILE_NAME ${src} NAME)
21+ set(out_file "${CMAKE_CURRENT_BINARY_DIR}/${VALA_FILE_NAME}")
22+ list(APPEND out_files "${CMAKE_CURRENT_BINARY_DIR}/${VALA_FILE_NAME}")
23 else()
24 set(out_file "${DIRECTORY}/${src}")
25 list(APPEND out_files "${DIRECTORY}/${src}")

Subscribers

People subscribed via source and target branches

to all changes: