linux-trace-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Yordan Karadzhov (VMware)" <y.karadz@gmail.com>
To: linux-trace-devel@vger.kernel.org
Cc: "Yordan Karadzhov (VMware)" <y.karadz@gmail.com>
Subject: [PATCH 1/3] kernel-shark: Build the plugins together with the GUI.
Date: Tue, 16 Mar 2021 19:39:20 +0200	[thread overview]
Message-ID: <20210316173922.657865-1-y.karadz@gmail.com> (raw)

There is no need the compile the plugins in the case when
not all third party dependencies are available and the
KernelShark GUI is not compiled. In fact this even causes
the build to fail because the plugins can include headers
from the third party packages.

Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
---
 src/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1e86e9c..5942e91 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -140,9 +140,9 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND AND TT_FONT_FILE)
             DESTINATION ${PKG_CONGIG_DIR}
                 COMPONENT                 libkshark-devel)
 
-endif (Qt5Widgets_FOUND AND Qt5Network_FOUND AND TT_FONT_FILE)
+    add_subdirectory(plugins)
+    set(PLUGINS ${PLUGINS} PARENT_SCOPE)
 
-add_subdirectory(plugins)
-set(PLUGINS ${PLUGINS} PARENT_SCOPE)
+    find_program(DO_AS_ROOT pkexec)
 
-find_program(DO_AS_ROOT pkexec)
+endif (Qt5Widgets_FOUND AND Qt5Network_FOUND AND TT_FONT_FILE)
-- 
2.25.1


             reply	other threads:[~2021-03-16 17:40 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-16 17:39 Yordan Karadzhov (VMware) [this message]
2021-03-16 17:39 ` [PATCH 2/3] kernel-shark: Build "dataplot" only if OpenGL and GLUT are found Yordan Karadzhov (VMware)
2021-03-16 17:39 ` [PATCH 3/3] kernel-shark: Always install the pkg-config descriptor Yordan Karadzhov (VMware)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210316173922.657865-1-y.karadz@gmail.com \
    --to=y.karadz@gmail.com \
    --cc=linux-trace-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).