From 77c4aa555495dff358856b7085b264aa53014fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 6 Nov 2022 15:16:26 +0100 Subject: [PATCH] avogadrolibs: Fix QA warnings by not including full path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../avogadro/avogadrolibs.bb | 1 + ...ists.txt-Remove-full-path-from-inlcu.patch | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 recipes-misc/recipes-chemistry/avogadro/avogadrolibs/0003-qtplugins-CMakeLists.txt-Remove-full-path-from-inlcu.patch diff --git a/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.bb b/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.bb index 33184c7b..2c09b013 100644 --- a/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.bb +++ b/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.bb @@ -21,6 +21,7 @@ REQUIRED_DISTRO_FEATURES = "opengl" SRC_URI += " \ file://0001-Avoid-RPATH-if-not-configured.patch \ file://0002-AvogadroLibsConfig.cmake-Find-include.patch \ + file://0003-qtplugins-CMakeLists.txt-Remove-full-path-from-inlcu.patch \ " do_configure:append() { diff --git a/recipes-misc/recipes-chemistry/avogadro/avogadrolibs/0003-qtplugins-CMakeLists.txt-Remove-full-path-from-inlcu.patch b/recipes-misc/recipes-chemistry/avogadro/avogadrolibs/0003-qtplugins-CMakeLists.txt-Remove-full-path-from-inlcu.patch new file mode 100644 index 00000000..2a2aab91 --- /dev/null +++ b/recipes-misc/recipes-chemistry/avogadro/avogadrolibs/0003-qtplugins-CMakeLists.txt-Remove-full-path-from-inlcu.patch @@ -0,0 +1,39 @@ +From d1dcf8bc3196754f5a0993475d940e14c6e893ed Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 6 Nov 2022 14:04:45 +0100 +Subject: [PATCH] qtplugins/CMakeLists.txt: Remove full path from inlcudes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + avogadro/qtplugins/CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/avogadro/qtplugins/CMakeLists.txt b/avogadro/qtplugins/CMakeLists.txt +index f36c8520..cd96a7f5 100644 +--- a/avogadro/qtplugins/CMakeLists.txt ++++ b/avogadro/qtplugins/CMakeLists.txt +@@ -43,7 +43,7 @@ function(avogadro_plugin name description type header pluginClass sources) + unset(PluginIncludes) + foreach(_header ${header}) + set(PluginIncludes +- "${PluginIncludes}#include \"${CMAKE_CURRENT_SOURCE_DIR}/${_header}\"\n") ++ "${PluginIncludes}#include \"${_header}\"\n") + endforeach() + set(PluginName "${name}") + set(PluginDescription "${description}") +@@ -73,6 +73,7 @@ function(avogadro_plugin name description type header pluginClass sources) + ${name}Plugin.cpp + ) + target_link_libraries(${name} PRIVATE AvogadroCore AvogadroQtGui) ++ target_include_directories(${name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) + + if("${_plugin_object}" STREQUAL "STATIC") + set_target_properties(${name} PROPERTIES COMPILE_DEFINITIONS +-- +2.38.1 +