Euclide

Merge lp:~pimvullers/euclide/fix-parallel-build into lp:euclide

  1. fix-parallel-build
  2. Merge into trunk
Proposed by Pim Vullers
Status: Merged
Merged at revision: 108
Proposed branch: lp:~pimvullers/euclide/fix-parallel-build
Merge into: lp:euclide
Diff against target: 23 lines (+2/-0)
2 files modified
src/CMakeLists.txt (+1/-0)
symbols/CMakeLists.txt (+1/-0)
To merge this branch: bzr merge lp:~pimvullers/euclide/fix-parallel-build
Reviewer Review Type Date Requested Status
Euclide Developers Pending
Review via email: mp+96527@code.launchpad.net

Commit message

fixed bug #913939

Description of the change

fixed parallel build issues due to missing internal dependencies

To post a comment you must log in.
Revision history for this message
xapantu (xapantu) wrote :

Thanks for all these merge requests :) I'm sorry, I was really willing
to take a look at the patches on the bug reports, I was busy with some
exams this week.

Revision history for this message
Pim Vullers (pimvullers) wrote :

No problem, I was just making merge requests for some other apps, so I just decided to do it also for outstanding patches.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/CMakeLists.txt'
2--- src/CMakeLists.txt 2012-02-23 20:36:56 +0000
3+++ src/CMakeLists.txt 2012-03-08 08:46:23 +0000
4@@ -59,6 +59,7 @@
5 )
6 add_library(euclide MODULE
7 ${VALA_C})
8+add_dependencies(euclide euclidecore)
9 target_link_libraries(euclide euclidecore)
10 target_link_libraries(euclide ${DEPS_LIBRARIES})
11 install(TARGETS euclide DESTINATION lib/scratch/plugins/euclide/)
12
13=== modified file 'symbols/CMakeLists.txt'
14--- symbols/CMakeLists.txt 2012-02-11 20:35:01 +0000
15+++ symbols/CMakeLists.txt 2012-03-08 08:46:23 +0000
16@@ -29,6 +29,7 @@
17 --thread
18 )
19 add_library(euclidesymbols MODULE ${VALA_C})
20+add_dependencies(euclidesymbols euclidecore)
21 install(TARGETS euclidesymbols DESTINATION lib/scratch/plugins/euclide/)
22 target_link_libraries(euclidesymbols ${DEPS_LIBRARIES})
23 install(FILES class.png DESTINATION share/euclide/plugins/euclidesymbols/)

Subscribers

People subscribed via source and target branches