From: Michal Sojka <michal.sojka@cvut.cz>
To: "Yordan Karadzhov (VMware)" <y.karadz@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>,
linux-trace-devel@vger.kernel.org,
Michal Sojka <michal.sojka@cvut.cz>
Subject: [PATCH 1/4] kernel-shark: Allow specifying PKG_CONFIG_DIR on cmake command line
Date: Wed, 17 Mar 2021 17:40:58 +0100 [thread overview]
Message-ID: <20210317164101.30848-2-michal.sojka@cvut.cz> (raw)
In-Reply-To: <20210317164101.30848-1-michal.sojka@cvut.cz>
On some distributions (e.g. NixOS), it is not possible to write files
to directories owned by different packages. For this reason, we cannot
always install libkshark.pc file to the directory reported by
pkg-config.
This commit allows to specify where to install the .pc file on cmake
commandline via -DPKG_CONGIG_DIR=... When specified, automatic
detection of .pc install directory is skipped.
Signed-off-by: Michal Sojka <michal.sojka@cvut.cz>
---
src/CMakeLists.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1e86e9c..b81d7d9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -134,8 +134,10 @@ 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)
+ if (NOT PKG_CONGIG_DIR)
+ execute_process(COMMAND bash "-c" "pkg-config --variable pc_path pkg-config | cut -f 1 -d: -z"
+ OUTPUT_VARIABLE PKG_CONGIG_DIR)
+ endif (NOT PKG_CONGIG_DIR)
install(FILES "${KS_DIR}/libkshark.pc"
DESTINATION ${PKG_CONGIG_DIR}
COMPONENT libkshark-devel)
--
2.30.1
next prev parent reply other threads:[~2021-03-17 16:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-17 16:40 [PATCH 0/4] kernel-shark: CMake changes Michal Sojka
2021-03-17 16:40 ` Michal Sojka [this message]
2021-03-17 16:40 ` [PATCH 2/4] kernel-shark: Allow specifying TT_FONT_FILE on cmake command line Michal Sojka
2021-03-17 16:41 ` [PATCH 3/4] kernel-shark: Allow installing polkit policy separately Michal Sojka
2021-03-17 16:41 ` [PATCH 4/4] kernel-shark: Do not use sudo in install_gui.sh + update README Michal Sojka
2021-03-23 13:45 ` [PATCH 0/4] kernel-shark: CMake changes 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=20210317164101.30848-2-michal.sojka@cvut.cz \
--to=michal.sojka@cvut.cz \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=y.karadz@gmail.com \
/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).