This is the very first patch from a series of patches that will
introduce KernelShark 2.0. The new version will take advantage
of the definition of Data streams and will imply significant
changes in the low level C API, used by the KernelShark GUI. As
a consequence of the API modifications, significant changes are
needed in every source file of the project. Because, we want to
avoid having a huge and ugly single commit that will be extremely
hard to review, we will introduce a regression. We will first
disable the compilation of all sub-components of KernelShark,
except the API itself. This is done by bypassing the search of
the necessary third party components (OpenGL and Qt). Later we
will introduce the changes of the API in several sub-steps and
will re-enable one by one the modified components of the GUI.
Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@xxxxxxxxx>
---
CMakeLists.txt | 10 ++++----
build/deff.h.cmake | 14 ++---------
examples/CMakeLists.txt | 54 ++++++++++++++++++++---------------------
src/CMakeLists.txt | 6 ++---
4 files changed, 37 insertions(+), 47 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c95249e9..ccca95c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,12 +26,12 @@ include(${KS_DIR}/build/FindJSONC.cmake)
find_package(Doxygen)
-set(OpenGL_GL_PREFERENCE LEGACY)
-find_package(OpenGL)
-find_package(GLUT)
+# set(OpenGL_GL_PREFERENCE LEGACY)
+# find_package(OpenGL)
+# find_package(GLUT)
-find_package(Qt5Widgets 5.7.1)
-find_package(Qt5Network)
+# find_package(Qt5Widgets 5.7.1)
+# find_package(Qt5Network)
if (Qt5Widgets_FOUND)
message(STATUS "Found Qt5Widgets: (version ${Qt5Widgets_VERSION})")
diff --git a/build/deff.h.cmake b/build/deff.h.cmake
index 79726ff6..e398c0ca 100644
--- a/build/deff.h.cmake
+++ b/build/deff.h.cmake
@@ -23,17 +23,7 @@
/** "pkexec" executable. */
#cmakedefine DO_AS_ROOT "@DO_AS_ROOT@"
-#ifdef __cplusplus
-
- #include <QString>
-
- /**
- * String containing semicolon-separated list of plugin names.
- * The plugins to be loaded when KernelShark starts are tagged
- * with "default".
- */
- const QString plugins = "@PLUGINS@";
-
-#endif /* __cplusplus */
+/** Semicolon-separated list of plugin names. */
+#define KS_BUILTIN_PLUGINS "@PLUGINS@"
#endif // _KS_CONFIG_H
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 032f3057..f6ed8978 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -4,30 +4,30 @@ message(STATUS "dataload")
add_executable(dload dataload.c)
target_link_libraries(dload kshark)
-message(STATUS "datafilter")
-add_executable(dfilter datafilter.c)
-target_link_libraries(dfilter kshark)
-
-message(STATUS "datahisto")
-add_executable(dhisto datahisto.c)
-target_link_libraries(dhisto kshark)
-
-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 (Qt5Widgets_FOUND)
-
- message(STATUS "widgetdemo")
- add_executable(widgetdemo widgetdemo.cpp)
- target_link_libraries(widgetdemo kshark-gui)
-
- message(STATUS "cmd_split")
- add_executable(cmd_split cmd_split.cpp)
- target_link_libraries(cmd_split kshark-gui)
-
-endif (Qt5Widgets_FOUND)
+# message(STATUS "datafilter")
+# add_executable(dfilter datafilter.c)
+# target_link_libraries(dfilter kshark)
+#
+# message(STATUS "datahisto")
+# add_executable(dhisto datahisto.c)
+# target_link_libraries(dhisto kshark)
+#
+# 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 (Qt5Widgets_FOUND)
+#
+# message(STATUS "widgetdemo")
+# add_executable(widgetdemo widgetdemo.cpp)
+# target_link_libraries(widgetdemo kshark-gui)
+#
+# message(STATUS "cmd_split")
+# add_executable(cmd_split cmd_split.cpp)
+# target_link_libraries(cmd_split kshark-gui)
+#
+# endif (Qt5Widgets_FOUND)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4d4f37b1..2bdab1a5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,10 +3,10 @@ message("\n src ...")
message(STATUS "libkshark")
add_library(kshark SHARED libkshark.c
libkshark-hash.c
- libkshark-model.c
+# libkshark-model.c
libkshark-plugin.c
libkshark-tepdata.c
- libkshark-configio.c
+# libkshark-configio.c
libkshark-collection.c)
target_link_libraries(kshark ${TRACECMD_LIBRARY}
@@ -101,7 +101,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
endif (Qt5Widgets_FOUND AND Qt5Network_FOUND)
-add_subdirectory(plugins)
+# add_subdirectory(plugins)
find_program(DO_AS_ROOT pkexec)
--
2.25.1
|