* [PATCH 1/3] kernel-shark: Build the plugins together with the GUI.
@ 2021-03-16 17:39 Yordan Karadzhov (VMware)
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)
0 siblings, 2 replies; 3+ messages in thread
From: Yordan Karadzhov (VMware) @ 2021-03-16 17:39 UTC (permalink / raw)
To: linux-trace-devel; +Cc: Yordan Karadzhov (VMware)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/3] kernel-shark: Build "dataplot" only if OpenGL and GLUT are found
2021-03-16 17:39 [PATCH 1/3] kernel-shark: Build the plugins together with the GUI Yordan Karadzhov (VMware)
@ 2021-03-16 17:39 ` Yordan Karadzhov (VMware)
2021-03-16 17:39 ` [PATCH 3/3] kernel-shark: Always install the pkg-config descriptor Yordan Karadzhov (VMware)
1 sibling, 0 replies; 3+ messages in thread
From: Yordan Karadzhov (VMware) @ 2021-03-16 17:39 UTC (permalink / raw)
To: linux-trace-devel; +Cc: Yordan Karadzhov (VMware)
The "dataplot" example depends from those two packages.
Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
---
examples/CMakeLists.txt | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index bc17635..c2f4c01 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -20,9 +20,13 @@ message(STATUS "confogio")
add_executable(confio configio.c)
target_link_libraries(confio kshark)
-message(STATUS "dataplot")
-add_executable(dplot dataplot.cpp)
-target_link_libraries(dplot kshark-plot)
+if (OPENGL_FOUND AND GLUT_FOUND)
+
+ message(STATUS "dataplot")
+ add_executable(dplot dataplot.cpp)
+ target_link_libraries(dplot kshark-plot)
+
+endif (OPENGL_FOUND AND GLUT_FOUND)
if (Qt5Widgets_FOUND AND TT_FONT_FILE)
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 3/3] kernel-shark: Always install the pkg-config descriptor
2021-03-16 17:39 [PATCH 1/3] kernel-shark: Build the plugins together with the GUI Yordan Karadzhov (VMware)
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 ` Yordan Karadzhov (VMware)
1 sibling, 0 replies; 3+ messages in thread
From: Yordan Karadzhov (VMware) @ 2021-03-16 17:39 UTC (permalink / raw)
To: linux-trace-devel; +Cc: Yordan Karadzhov (VMware)
The pkg-config support is part of libkshark and has to be installed
together with the other components of the library regardless of the
GUI compilation.
Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
---
src/CMakeLists.txt | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5942e91..ec4149a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -38,6 +38,12 @@ install(FILES "${KS_DIR}/src/libkshark.h"
DESTINATION ${KS_INCLUDS_DESTINATION}
COMPONENT libkshark-devel)
+execute_process(COMMAND bash "-c" "pkg-config --variable pc_path pkg-config | cut -f 1 -d: -z"
+ OUTPUT_VARIABLE PKG_CONGIG_DIR)
+install(FILES "${KS_DIR}/libkshark.pc"
+ DESTINATION ${PKG_CONGIG_DIR}
+ COMPONENT libkshark-devel)
+
if (OPENGL_FOUND)
message(STATUS "libkshark-plot")
@@ -134,12 +140,6 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND AND TT_FONT_FILE)
DESTINATION ${_INSTALL_PREFIX}/bin/
COMPONENT kernelshark)
- execute_process(COMMAND bash "-c" "pkg-config --variable pc_path pkg-config | cut -f 1 -d: -z"
- OUTPUT_VARIABLE PKG_CONGIG_DIR)
- install(FILES "${KS_DIR}/libkshark.pc"
- DESTINATION ${PKG_CONGIG_DIR}
- COMPONENT libkshark-devel)
-
add_subdirectory(plugins)
set(PLUGINS ${PLUGINS} PARENT_SCOPE)
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-16 17:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-16 17:39 [PATCH 1/3] kernel-shark: Build the plugins together with the GUI Yordan Karadzhov (VMware)
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)
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).