diff options
Diffstat (limited to 'meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch')
-rw-r--r-- | meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch b/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch new file mode 100644 index 000000000..bbebc4dc7 --- /dev/null +++ b/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch | |||
@@ -0,0 +1,94 @@ | |||
1 | From 81b213b98f51ec3eed5774f6f797c074ac35db3e Mon Sep 17 00:00:00 2001 | ||
2 | From: Ton van den Heuvel <tonvandenheuvel@gmail.com> | ||
3 | Date: Mon, 6 May 2019 15:17:28 +0200 | ||
4 | Subject: [PATCH] Fix #6906 | ||
5 | |||
6 | Generate configvalues.h only as a dependency for the VHDL parser. Fixes | ||
7 | a problem in combination with Ninja v1.9.0 because of duplicate rules | ||
8 | for generating configvalues.h. | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | ||
12 | --- | ||
13 | addon/doxyapp/CMakeLists.txt | 8 -------- | ||
14 | addon/doxyparse/CMakeLists.txt | 8 -------- | ||
15 | src/CMakeLists.txt | 4 ++++ | ||
16 | vhdlparser/CMakeLists.txt | 12 +++--------- | ||
17 | 4 files changed, 7 insertions(+), 25 deletions(-) | ||
18 | |||
19 | diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt | ||
20 | index a7377112..0aaf4655 100644 | ||
21 | --- a/addon/doxyapp/CMakeLists.txt | ||
22 | +++ b/addon/doxyapp/CMakeLists.txt | ||
23 | @@ -1,11 +1,3 @@ | ||
24 | -# configvalues.h | ||
25 | -add_custom_command( | ||
26 | - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h | ||
27 | - DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py | ||
28 | - OUTPUT ${GENERATED_SRC}/configvalues.h | ||
29 | -) | ||
30 | -set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) | ||
31 | - | ||
32 | find_package(Iconv) | ||
33 | |||
34 | include_directories( | ||
35 | diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt | ||
36 | index ff198fb4..1620c72e 100644 | ||
37 | --- a/addon/doxyparse/CMakeLists.txt | ||
38 | +++ b/addon/doxyparse/CMakeLists.txt | ||
39 | @@ -1,11 +1,3 @@ | ||
40 | -# configvalues.h | ||
41 | -add_custom_command( | ||
42 | - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h | ||
43 | - DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py | ||
44 | - OUTPUT ${GENERATED_SRC}/configvalues.h | ||
45 | -) | ||
46 | -set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) | ||
47 | - | ||
48 | find_package(Iconv) | ||
49 | |||
50 | include_directories( | ||
51 | diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
52 | index 92a302ab..37a21ff6 100644 | ||
53 | --- a/src/CMakeLists.txt | ||
54 | +++ b/src/CMakeLists.txt | ||
55 | @@ -43,6 +43,10 @@ add_custom_command( | ||
56 | OUTPUT ${GENERATED_SRC}/configvalues.h | ||
57 | ) | ||
58 | set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) | ||
59 | +add_custom_target( | ||
60 | + generate_configvalues_header | ||
61 | + DEPENDS ${GENERATED_SRC}/configvalues.h | ||
62 | +) | ||
63 | |||
64 | # configvalues.cpp | ||
65 | add_custom_command( | ||
66 | diff --git a/vhdlparser/CMakeLists.txt b/vhdlparser/CMakeLists.txt | ||
67 | index 71e97df5..f89008c5 100644 | ||
68 | --- a/vhdlparser/CMakeLists.txt | ||
69 | +++ b/vhdlparser/CMakeLists.txt | ||
70 | @@ -1,14 +1,5 @@ | ||
71 | -# configvalues.h | ||
72 | -add_custom_command( | ||
73 | - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h | ||
74 | - DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py | ||
75 | - OUTPUT ${GENERATED_SRC}/configvalues.h | ||
76 | -) | ||
77 | -set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) | ||
78 | - | ||
79 | include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC}) | ||
80 | add_library(vhdlparser STATIC | ||
81 | -${GENERATED_SRC}/configvalues.h | ||
82 | CharStream.cc | ||
83 | ParseException.cc | ||
84 | Token.cc | ||
85 | @@ -17,3 +8,6 @@ VhdlParser.cc | ||
86 | VhdlParserTokenManager.cc | ||
87 | VhdlParserIF.cpp | ||
88 | ) | ||
89 | +add_dependencies(vhdlparser | ||
90 | + generate_configvalues_header | ||
91 | +) | ||
92 | -- | ||
93 | 2.17.1 | ||
94 | |||