File: fix-parallel.diff

package info (click to toggle)
kdevelop 4%3A4.7.0-1
  • links: PTS, VCS
  • area: main
  • in suites: jessie, jessie-kfreebsd
  • size: 18,360 kB
  • ctags: 11,484
  • sloc: cpp: 105,371; python: 522; ansic: 488; lex: 422; sh: 139; ruby: 120; makefile: 51; xml: 42; php: 12
file content (60 lines) | stat: -rw-r--r-- 1,726 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
Author: Pino Toscano <pino@debian.org>
Description: Fix parallel building of tests
 Set the proper dependency on the kdevcpplanguagesupport target on few tests;
 since they compile the sources of kdevcpplanguagesupport which include sources
 (like ui_*.h files) generated during the build of kdevcpplanguagesupport.
Last-Update: 2012-05-21
Forwarded: no

--- a/languages/cpp/CMakeLists.txt
+++ b/languages/cpp/CMakeLists.txt
@@ -11,7 +11,6 @@
 
 add_subdirectory(parser)
 add_subdirectory(cppduchain)
-add_subdirectory(tests)
 ########### next target ###############
 
 set(kdevcpplanguagesupport_PART_SRCS
@@ -81,6 +80,7 @@
 
 install(TARGETS kdevcpplanguagesupport DESTINATION ${PLUGIN_INSTALL_DIR})
 
+add_subdirectory(tests)
 
 ########### install files ###############
 
--- a/languages/cpp/tests/CMakeLists.txt
+++ b/languages/cpp/tests/CMakeLists.txt
@@ -87,6 +87,7 @@
     ${KDEVPLATFORM_PROJECT_LIBRARIES}
     ${KDEVPLATFORM_TESTS_LIBRARIES}
 )
+add_dependencies(cppspecialcompletion kdevcpplanguagesupport)
 
 ########### next target ###############
 
@@ -111,6 +112,7 @@
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KTEXTEDITOR_LIBS}
 )
+add_dependencies(cppassistantstest kdevcpplanguagesupport)
 
 add_definitions(-DTEST_COMPLETION)
 
@@ -147,6 +149,7 @@
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KTEXTEDITOR_LIBS}
 )
+add_dependencies(cppcodecompletiontest kdevcpplanguagesupport)
 
 kde4_add_unit_test(cppcodegentest ${cppcodegentest_SRCS})
 target_link_libraries(cppcodegentest
@@ -159,6 +162,7 @@
     ${KDEVPLATFORM_PROJECT_LIBRARIES}
     ${KDEVPLATFORM_TESTS_LIBRARIES}
 )
+add_dependencies(cppcodegentest kdevcpplanguagesupport)
 
 kde4_add_executable( cpp-parser cpp-parser.cpp )
 target_link_libraries(cpp-parser