From: "Yordan Karadzhov (VMware)" <y.karadz@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org,
"Yordan Karadzhov (VMware)" <y.karadz@gmail.com>
Subject: [PATCH 4/5] kernel-shark: Split the installation in two components
Date: Tue, 5 Jan 2021 17:54:52 +0200 [thread overview]
Message-ID: <20210105155453.41228-5-y.karadz@gmail.com> (raw)
In-Reply-To: <20210105155453.41228-1-y.karadz@gmail.com>
The user can choose to install only the KernelShark GUI via
"install_gui.sh". It is also possible to install the library headers
and this can be done via "install_libkshark-devel.sh".
The changes implemented in this patch are inspired by the talk
"Deep CMake For Library Authors" presented at CppCon 2019 by Craig Scott.
https://crascit.com/2019/10/16/cppcon-2019-deep-cmake-for-library-authors/
Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
---
CMakeLists.txt | 2 +-
build/cmake_uninstall.sh | 23 ++++++++++----
build/install_gui.sh | 1 +
build/install_libkshark-devel.sh | 1 +
src/CMakeLists.txt | 53 ++++++++++++++++++++++++++------
src/plugins/CMakeLists.txt | 3 +-
6 files changed, 65 insertions(+), 18 deletions(-)
create mode 100755 build/install_gui.sh
create mode 100755 build/install_libkshark-devel.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 543d7da..9abacd0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,7 +86,7 @@ set(KS_ICON_FIN KS_icon_fin.svg)
set(KS_LOGO KS_logo_symbol.svg)
set(KS_LOGO_LABEL KS_logo_horizontal.svg)
-set(CMAKE_INSTALL_RPATH "${_LIBDIR}")
+set(CMAKE_INSTALL_RPATH "${_LIBDIR}" "$ORIGIN")
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
if (CMAKE_BUILD_TYPE MATCHES Package)
diff --git a/build/cmake_uninstall.sh b/build/cmake_uninstall.sh
index ae9eab5..0d93a8d 100755
--- a/build/cmake_uninstall.sh
+++ b/build/cmake_uninstall.sh
@@ -4,14 +4,25 @@ CYAN='\e[36m'
PURPLE='\e[35m'
NC='\e[0m' # No Color
+uninstall () {
+ NAME=$1
+ NAME=${NAME##*_}
+ NAME=${NAME%.*}
+ NAME=${NAME/manifest/the project}
+ if [ -e $1 ]
+ then
+ echo -e "${CYAN}Uninstall " $NAME"...${NC}"
+ xargs rm -v < $1
+ rm -f $1
+ fi
+}
+
if [[ $EUID -ne 0 ]]; then
echo -e "${PURPLE}Permission denied${NC}" 1>&2
exit 100
fi
-if [ -e install_manifest.txt ]
-then
- echo -e "${CYAN}Uninstall the project...${NC}"
- xargs rm -v < install_manifest.txt
- rm -f install_manifest.txt
-fi
+for manifest in "$search_dir"${PWD}/install_manifest*
+do
+ uninstall $manifest
+done
diff --git a/build/install_gui.sh b/build/install_gui.sh
new file mode 100755
index 0000000..1583fb9
--- /dev/null
+++ b/build/install_gui.sh
@@ -0,0 +1 @@
+sudo cmake -DCOMPONENT=kernelshark -P cmake_install.cmake
diff --git a/build/install_libkshark-devel.sh b/build/install_libkshark-devel.sh
new file mode 100755
index 0000000..a7e420d
--- /dev/null
+++ b/build/install_libkshark-devel.sh
@@ -0,0 +1 @@
+sudo cmake -DCOMPONENT=libkshark-devel -P cmake_install.cmake
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fe3a3eb..e35b436 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,7 @@
message("\n src ...")
+set(KS_INCLUDS_DESTINATION "${_INSTALL_PREFIX}/include/${KS_APP_NAME}")
+
message(STATUS "libkshark")
add_library(kshark SHARED libkshark.c
libkshark-hash.c
@@ -15,9 +17,25 @@ target_link_libraries(kshark trace::cmd
jsonc::jsonc
${CMAKE_DL_LIBS})
-set_target_properties(kshark PROPERTIES SUFFIX ".so.${KS_VERSION_STRING}")
+set_target_properties(kshark PROPERTIES
+ SOVERSION ${KS_VERSION_MAJOR}
+ VERSION ${KS_VERSION_STRING})
+
+
+install(TARGETS kshark
+ LIBRARY DESTINATION ${_LIBDIR}
+ COMPONENT kernelshark
+ NAMELINK_COMPONENT libkshark-devel
+ INCLUDES DESTINATION ${_INSTALL_PREFIX}/include/${KS_APP_NAME}
+ COMPONENT libkshark-devel
+ ARCHIVE DESTINATION ${_LIBDIR}
+ COMPONENT libkshark-devel)
-install(TARGETS kshark LIBRARY DESTINATION ${_LIBDIR})
+install(FILES "${KS_DIR}/src/libkshark.h"
+ "${KS_DIR}/src/libkshark-model.h"
+ "${KS_DIR}/src/libkshark-plugin.h"
+ DESTINATION ${KS_INCLUDS_DESTINATION}
+ COMPONENT libkshark-devel)
if (OPENGL_FOUND)
@@ -29,9 +47,18 @@ if (OPENGL_FOUND)
${GLUT_LIBRARY}
${OPENGL_LIBRARIES})
- set_target_properties(kshark-plot PROPERTIES SUFFIX ".so.${KS_VERSION_STRING}")
+ set_target_properties(kshark-plot PROPERTIES
+ SOVERSION ${KS_VERSION_MAJOR}
+ VERSION ${KS_VERSION_STRING})
- install(TARGETS kshark-plot LIBRARY DESTINATION ${_LIBDIR})
+ install(TARGETS kshark-plot
+ LIBRARY DESTINATION ${_LIBDIR}
+ COMPONENT kernelshark
+ NAMELINK_COMPONENT libkshark-devel
+ INCLUDES DESTINATION ${_INSTALL_PREFIX}/include/${KS_APP_NAME}
+ COMPONENT libkshark-devel
+ ARCHIVE DESTINATION ${_LIBDIR}
+ COMPONENT libkshark-devel)
endif (OPENGL_FOUND)
@@ -83,21 +110,27 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
target_link_libraries(kshark-record kshark-gui)
install(TARGETS ${KS_APP_NAME} kshark-record kshark-gui
- RUNTIME DESTINATION ${_INSTALL_PREFIX}/bin/
- LIBRARY DESTINATION ${_LIBDIR})
+ RUNTIME DESTINATION ${_INSTALL_PREFIX}/bin/
+ COMPONENT kernelshark
+ LIBRARY DESTINATION ${_LIBDIR}
+ COMPONENT kernelshark)
install(FILES "${KS_DIR}/${KS_APP_NAME}.desktop"
- DESTINATION ${_INSTALL_PREFIX}/share/applications/)
+ DESTINATION ${_INSTALL_PREFIX}/share/applications/
+ COMPONENT kernelshark)
install(FILES "${KS_DIR}/icons/${KS_ICON}"
"${KS_DIR}/icons/${KS_ICON_FIN}"
- DESTINATION ${_INSTALL_PREFIX}/share/icons/${KS_APP_NAME})
+ DESTINATION ${_INSTALL_PREFIX}/share/icons/${KS_APP_NAME}
+ COMPONENT kernelshark)
install(FILES "${KS_DIR}/org.freedesktop.kshark-record.policy"
- DESTINATION /usr/share/polkit-1/actions/)
+ DESTINATION /usr/share/polkit-1/actions/
+ COMPONENT kernelshark)
install(PROGRAMS "${KS_DIR}/bin/kshark-su-record"
- DESTINATION ${_INSTALL_PREFIX}/bin/)
+ DESTINATION ${_INSTALL_PREFIX}/bin/
+ COMPONENT kernelshark)
endif (Qt5Widgets_FOUND AND Qt5Network_FOUND)
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 6c77179..2da73f8 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -28,6 +28,7 @@ BUILD_PLUGIN(NAME missed_events
list(APPEND PLUGIN_LIST "missed_events default") # This plugin will be loaded by default
install(TARGETS sched_events missed_events
- LIBRARY DESTINATION ${KS_PLUGIN_INSTALL_PREFIX})
+ LIBRARY DESTINATION ${KS_PLUGIN_INSTALL_PREFIX}
+ COMPONENT kernelshark)
set(PLUGINS ${PLUGIN_LIST} PARENT_SCOPE)
--
2.25.1
next prev parent reply other threads:[~2021-01-05 15:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-05 15:54 [PATCH 0/5] kernel-shark: Improve the build system Yordan Karadzhov (VMware)
2021-01-05 15:54 ` [PATCH 1/5] kernel-shark: Start using libtracecmd Yordan Karadzhov (VMware)
2021-01-05 15:54 ` [PATCH 2/5] kernel-shark: Add missing SPDX license identifiers Yordan Karadzhov (VMware)
2021-01-05 15:54 ` [PATCH 3/5] kernel-shark: Change default libraries install location Yordan Karadzhov (VMware)
2021-01-05 15:54 ` Yordan Karadzhov (VMware) [this message]
2021-01-05 21:29 ` [PATCH 4/5] kernel-shark: Split the installation in two components Steven Rostedt
2021-01-06 11:20 ` Yordan Karadzhov (VMware)
2021-01-05 15:54 ` [PATCH 5/5] kernel-shark: Fix "github Actions" workflow 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=20210105155453.41228-5-y.karadz@gmail.com \
--to=y.karadz@gmail.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.