diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2017-01-05 20:51:35 +0100 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2017-01-05 20:51:35 +0100 |
| commit | 10e7e270773a258b0356bafc3a5bbc4853f38a4c (patch) | |
| tree | 5e55f5358a39e8caf453448ddc724ed66b61f387 /gr-utils/python/modtool | |
| parent | 7f25c0120fc7bc6a6eeee87878cf387647d51614 (diff) | |
| parent | 8d80d0adacc98b02392428ab5284d8417df9c776 (diff) | |
Merge remote-tracking branch 'upstream/next' into gtk3
Diffstat (limited to 'gr-utils/python/modtool')
3 files changed, 17 insertions, 24 deletions
diff --git a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt index bde9dc0c0f..3f316a78b4 100644 --- a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt +++ b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt @@ -46,6 +46,23 @@ set(VERSION_INFO_API_COMPAT 0) set(VERSION_INFO_MINOR_VERSION 0) set(VERSION_INFO_MAINT_VERSION git) +# Set cmake policies. +# This will suppress developer warnings during the cmake process that can occur +# if a newer cmake version than the minimum is used. + +if(POLICY CMP0026) + cmake_policy(SET CMP0026 OLD) +endif() +if(POLICY CMP0043) + cmake_policy(SET CMP0043 OLD) +endif() +if(POLICY CMP0045) + cmake_policy(SET CMP0045 OLD) +endif() +if(POLICY CMP0046) + cmake_policy(SET CMP0046 OLD) +endif() + ######################################################################## # Compiler specific setup ######################################################################## diff --git a/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.in b/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.in index 55336d5f1d..ef07c13205 100644 --- a/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.in +++ b/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.in @@ -1503,18 +1503,6 @@ GENERATE_XML = @enable_xml_docs@ XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - # If the XML_PROGRAMLISTING tag is set to YES Doxygen will # dump the program listings (including syntax highlighting # and cross-referencing information) to the XML output. Note that diff --git a/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in b/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in index 57736d7d0c..19e17dc925 100644 --- a/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in +++ b/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in @@ -1471,18 +1471,6 @@ GENERATE_XML = YES XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - # If the XML_PROGRAMLISTING tag is set to YES Doxygen will # dump the program listings (including syntax highlighting # and cross-referencing information) to the XML output. Note that |