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

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

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
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2012-02-23 20:36:56 +0000
+++ src/CMakeLists.txt 2012-03-08 08:46:23 +0000
@@ -59,6 +59,7 @@
59)59)
60add_library(euclide MODULE60add_library(euclide MODULE
61 ${VALA_C})61 ${VALA_C})
62add_dependencies(euclide euclidecore)
62target_link_libraries(euclide euclidecore)63target_link_libraries(euclide euclidecore)
63target_link_libraries(euclide ${DEPS_LIBRARIES})64target_link_libraries(euclide ${DEPS_LIBRARIES})
64install(TARGETS euclide DESTINATION lib/scratch/plugins/euclide/)65install(TARGETS euclide DESTINATION lib/scratch/plugins/euclide/)
6566
=== modified file 'symbols/CMakeLists.txt'
--- symbols/CMakeLists.txt 2012-02-11 20:35:01 +0000
+++ symbols/CMakeLists.txt 2012-03-08 08:46:23 +0000
@@ -29,6 +29,7 @@
29 --thread29 --thread
30)30)
31add_library(euclidesymbols MODULE ${VALA_C})31add_library(euclidesymbols MODULE ${VALA_C})
32add_dependencies(euclidesymbols euclidecore)
32install(TARGETS euclidesymbols DESTINATION lib/scratch/plugins/euclide/)33install(TARGETS euclidesymbols DESTINATION lib/scratch/plugins/euclide/)
33target_link_libraries(euclidesymbols ${DEPS_LIBRARIES})34target_link_libraries(euclidesymbols ${DEPS_LIBRARIES})
34install(FILES class.png DESTINATION share/euclide/plugins/euclidesymbols/)35install(FILES class.png DESTINATION share/euclide/plugins/euclidesymbols/)

Subscribers

People subscribed via source and target branches