|
 |
d8c1b05 |
diff --git a/Makefile b/Makefile
|
|
|
d8c1b05 |
index 2bcc383..159b87f 100644
|
|
|
d8c1b05 |
--- a/Makefile
|
|
|
d8c1b05 |
+++ b/Makefile
|
|
|
d8c1b05 |
@@ -262,7 +262,7 @@ all_cmd: $(CMD_TARGETS)
|
|
|
d8c1b05 |
CMAKE_COMMAND = /usr/bin/cmake
|
|
|
d8c1b05 |
|
|
|
d8c1b05 |
$(kshark-dir)/build/Makefile: $(kshark-dir)/CMakeLists.txt
|
|
|
d8c1b05 |
- $(Q) cd $(kshark-dir)/build && $(CMAKE_COMMAND) -D_INSTALL_PREFIX=$(prefix) ..
|
|
|
d8c1b05 |
+ $(Q) cd $(kshark-dir)/build && $(CMAKE_COMMAND) -D_INSTALL_PREFIX=$(prefix) -D_LIBDIR=$(libdir) ..
|
|
|
d8c1b05 |
|
|
|
d8c1b05 |
gui: force $(CMD_TARGETS) $(kshark-dir)/build/Makefile
|
|
|
d8c1b05 |
$(Q)$(MAKE) $(S) -C $(kshark-dir)/build
|
|
|
d8c1b05 |
diff --git a/kernel-shark/CMakeLists.txt b/kernel-shark/CMakeLists.txt
|
|
|
d8c1b05 |
index 145b058..bf24ed6 100644
|
|
|
d8c1b05 |
--- a/kernel-shark/CMakeLists.txt
|
|
|
d8c1b05 |
+++ b/kernel-shark/CMakeLists.txt
|
|
|
d8c1b05 |
@@ -30,17 +30,21 @@ if (Qt5Widgets_FOUND)
|
|
|
d8c1b05 |
|
|
|
d8c1b05 |
endif (Qt5Widgets_FOUND)
|
|
|
d8c1b05 |
|
|
|
d8c1b05 |
-set(LIBRARY_OUTPUT_PATH "${KS_DIR}/lib")
|
|
|
d8c1b05 |
-set(EXECUTABLE_OUTPUT_PATH "${KS_DIR}/bin")
|
|
|
d8c1b05 |
-
|
|
|
d8c1b05 |
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -pthread -fPIC")
|
|
|
d8c1b05 |
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -std=c++11 -pthread -fPIC")
|
|
|
d8c1b05 |
-
|
|
|
d8c1b05 |
if(NOT _INSTALL_PREFIX)
|
|
|
d8c1b05 |
set(_INSTALL_PREFIX "/usr/local")
|
|
|
d8c1b05 |
endif()
|
|
|
d8c1b05 |
|
|
|
d8c1b05 |
-set(KS_PLUGIN_INSTALL_PREFIX ${_INSTALL_PREFIX}/lib/${KS_APP_NAME}/plugins/)
|
|
|
d8c1b05 |
+if (NOT _LIBDIR)
|
|
|
d8c1b05 |
+ set(_LIBDIR "${_INSTALL_PREFIX}/lib")
|
|
|
d8c1b05 |
+endif (NOT _LIBDIR)
|
|
|
d8c1b05 |
+
|
|
|
d8c1b05 |
+set(LIBRARY_OUTPUT_PATH "${KS_DIR}/${_LIBDIR}")
|
|
|
d8c1b05 |
+set(EXECUTABLE_OUTPUT_PATH "${KS_DIR}/${_INSTALL_PREFIX}/bin")
|
|
|
d8c1b05 |
+
|
|
|
d8c1b05 |
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -pthread -fPIC")
|
|
|
d8c1b05 |
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -std=c++11 -pthread -fPIC")
|
|
|
d8c1b05 |
+
|
|
|
d8c1b05 |
+set(KS_PLUGIN_INSTALL_PREFIX ${_LIBDIR}/${KS_APP_NAME}/plugins/)
|
|
|
d8c1b05 |
set(KS_ICON ksharkicon.png)
|
|
|
d8c1b05 |
|
|
|
d8c1b05 |
if (NOT _DEBUG)
|
|
|
d8c1b05 |
@@ -50,7 +54,7 @@ if (NOT _DEBUG)
|
|
|
d8c1b05 |
|
|
|
d8c1b05 |
endif (NOT _DEBUG)
|
|
|
d8c1b05 |
|
|
|
d8c1b05 |
-SET(CMAKE_INSTALL_RPATH "${_INSTALL_PREFIX}/lib/${KS_APP_NAME}/")
|
|
|
d8c1b05 |
+SET(CMAKE_INSTALL_RPATH "${_LIBDIR}/${KS_APP_NAME}/")
|
|
|
d8c1b05 |
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
|
|
|
d8c1b05 |
|
|
|
d8c1b05 |
include_directories(${KS_DIR}/src/
|
|
|
d8c1b05 |
diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt
|
|
|
d8c1b05 |
index 6cbc00f..b790c7a 100644
|
|
|
d8c1b05 |
--- a/kernel-shark/src/CMakeLists.txt
|
|
|
d8c1b05 |
+++ b/kernel-shark/src/CMakeLists.txt
|
|
|
d8c1b05 |
@@ -79,7 +79,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
|
|
|
d8c1b05 |
|
|
|
d8c1b05 |
install(TARGETS ${KS_APP_NAME} kshark-record kshark kshark-plot kshark-gui
|
|
|
d8c1b05 |
RUNTIME DESTINATION ${_INSTALL_PREFIX}/bin/
|
|
|
d8c1b05 |
- LIBRARY DESTINATION ${_INSTALL_PREFIX}/lib/${KS_APP_NAME}/)
|
|
|
d8c1b05 |
+ LIBRARY DESTINATION ${_LIBDIR}/${KS_APP_NAME}/)
|
|
|
d8c1b05 |
|
|
|
d8c1b05 |
install(FILES "${KS_DIR}/${KS_APP_NAME}.desktop"
|
|
|
d8c1b05 |
DESTINATION ${_INSTALL_PREFIX}/share/applications/)
|