On 21.02.20 г. 15:57 ч., sztsian@xxxxxxxxx wrote:
From: "Ziqian SUN (Zamir)" <sztsian@xxxxxxxxx> The trace-cmd makefile supports install lib into a different name like lib64. Now this patch implemented the same in kernel-shark. Change since v2: Drop the change of LIBRARY_OUTPUT_PATH as well Change since v1: Drop the change of EXECUTABLE_OUTPUT_PATH and fix set command to lower case. Signed-off-by: Ziqian SUN (Zamir) <sztsian@xxxxxxxxx>
Thanks Zamir! Reviewed-by: Yordan Karadzhov (VMware) <y.karadz@xxxxxxxxx>
--- Makefile | 2 +- kernel-shark/CMakeLists.txt | 8 ++++++-- kernel-shark/src/CMakeLists.txt | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index a3facaa..2f9620e 100644 --- a/Makefile +++ b/Makefile @@ -297,7 +297,7 @@ CMAKE_COMMAND = /usr/bin/cmake BUILD_TYPE ?= RelWithDebInfo$(kshark-dir)/build/Makefile: $(kshark-dir)/CMakeLists.txt- $(Q) cd $(kshark-dir)/build && $(CMAKE_COMMAND) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -D_INSTALL_PREFIX=$(prefix) .. + $(Q) cd $(kshark-dir)/build && $(CMAKE_COMMAND) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -D_INSTALL_PREFIX=$(prefix) -D_LIBDIR=$(libdir) ..gui: force $(CMD_TARGETS) $(kshark-dir)/build/Makefile$(Q)$(MAKE) $(S) -C $(kshark-dir)/build diff --git a/kernel-shark/CMakeLists.txt b/kernel-shark/CMakeLists.txt index 8786b83..1c9ac2e 100644 --- a/kernel-shark/CMakeLists.txt +++ b/kernel-shark/CMakeLists.txt @@ -17,6 +17,10 @@ if (NOT _INSTALL_PREFIX) set(_INSTALL_PREFIX "/usr/local") endif (NOT _INSTALL_PREFIX)+if (NOT _LIBDIR)+ set(_LIBDIR "${_INSTALL_PREFIX}/lib") +endif (NOT _LIBDIR) + include(${KS_DIR}/build/FindTraceCmd.cmake) include(${KS_DIR}/build/FindJSONC.cmake)@@ -54,14 +58,14 @@ if (NOT CMAKE_CXX_FLAGS_PACKAGE)set(CMAKE_CXX_FLAGS_PACKAGE "-O3") endif (NOT CMAKE_CXX_FLAGS_PACKAGE)-set(KS_PLUGIN_INSTALL_PREFIX ${_INSTALL_PREFIX}/lib/${KS_APP_NAME}/plugins/)+set(KS_PLUGIN_INSTALL_PREFIX ${_LIBDIR}/${KS_APP_NAME}/plugins/)set(KS_ICON KS_icon_shark.svg)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 "${_INSTALL_PREFIX}/lib/${KS_APP_NAME}/")+set(CMAKE_INSTALL_RPATH "${_LIBDIR}/${KS_APP_NAME}/")if (CMAKE_BUILD_TYPE MATCHES Package) diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txtindex 33b5db8..9666b18 100644 --- a/kernel-shark/src/CMakeLists.txt +++ b/kernel-shark/src/CMakeLists.txt @@ -15,7 +15,7 @@ target_link_libraries(kshark ${TRACEEVENT_LIBRARY}set_target_properties(kshark PROPERTIES SUFFIX ".so.${KS_VERSION_STRING}") -install(TARGETS kshark LIBRARY DESTINATION ${_INSTALL_PREFIX}/lib/${KS_APP_NAME})+install(TARGETS kshark LIBRARY DESTINATION ${_LIBDIR}/${KS_APP_NAME})if (OPENGL_FOUND AND GLUT_FOUND) @@ -29,7 +29,7 @@ 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})+ install(TARGETS kshark-plot LIBRARY DESTINATION ${_LIBDIR}/${KS_APP_NAME})endif (OPENGL_FOUND AND GLUT_FOUND) @@ -85,7 +85,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND) install(TARGETS ${KS_APP_NAME} kshark-record kshark-guiRUNTIME DESTINATION ${_INSTALL_PREFIX}/bin/ - LIBRARY DESTINATION ${_INSTALL_PREFIX}/lib/${KS_APP_NAME}/) + LIBRARY DESTINATION ${_LIBDIR}/${KS_APP_NAME}/)install(FILES "${KS_DIR}/${KS_APP_NAME}.desktop"DESTINATION ${_INSTALL_PREFIX}/share/applications/)
|