aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYordan Karadzhov (VMware) <y.karadz@gmail.com>2019-07-05 17:10:31 +0300
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2019-07-08 08:30:17 -0400
commit850572f03ce41d5839f86b6291aa6bef051c09ff (patch)
treee13ed2988d7a9f2fb2932f856d1a802c8e719c47
parente0a189679760fabb206068bfd9b40c6427d8d432 (diff)
downloadtrace-cmd-850572f03ce41d5839f86b6291aa6bef051c09ff.tar.gz
kernel-shark: Separate the target instalation instructions
Having all target installation destinations given in one instruction may result in an error in the case when some of the third-party dependencies are missing. This will happen because you are trying to install a target that hasn't been built. Link: http://lore.kernel.org/linux-trace-devel/20190705141031.20239-3-y.karadz@gmail.com Reviewed-by: Slavomir Kaslev <kaslevs@vmware.com> Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-rw-r--r--kernel-shark/src/CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt
index 6cbc00fa..12289933 100644
--- a/kernel-shark/src/CMakeLists.txt
+++ b/kernel-shark/src/CMakeLists.txt
@@ -14,6 +14,8 @@ target_link_libraries(kshark ${CMAKE_DL_LIBS}
set_target_properties(kshark PROPERTIES SUFFIX ".so.${KS_VERSION_STRING}")
+install(TARGETS kshark LIBRARY DESTINATION ${_INSTALL_PREFIX}/lib/${KS_APP_NAME})
+
if (OPENGL_FOUND AND GLUT_FOUND)
message(STATUS "libkshark-plot")
@@ -26,6 +28,8 @@ if (OPENGL_FOUND AND GLUT_FOUND)
set_target_properties(kshark-plot PROPERTIES SUFFIX ".so.${KS_VERSION_STRING}")
+ install(TARGETS kshark-plot LIBRARY DESTINATION ${_INSTALL_PREFIX}/lib/${KS_APP_NAME})
+
endif (OPENGL_FOUND AND GLUT_FOUND)
if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
@@ -77,7 +81,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
add_executable(kshark-record kshark-record.cpp)
target_link_libraries(kshark-record kshark-gui)
- install(TARGETS ${KS_APP_NAME} kshark-record kshark kshark-plot kshark-gui
+ install(TARGETS ${KS_APP_NAME} kshark-record kshark-gui
RUNTIME DESTINATION ${_INSTALL_PREFIX}/bin/
LIBRARY DESTINATION ${_INSTALL_PREFIX}/lib/${KS_APP_NAME}/)