mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 02:10:04 +00:00
Code Issues Projects Releases Wiki Activity

xfce4-hotcorner-plugin: fix library install path

Browse Source 
The library install path may be ${CMAKE_INSTALL_PREFIX}/lib64 rather
than fixed ${CMAKE_INSTALL_PREFIX}/lib. Add a variable in CMakeLists.txt
to make it could be overrode by cmake command line. And it is overridden
with ${baselib} in meta-oe.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Kang Kai
2018-08-06 01:54:01 -07:00
committed by Khem Raj
parent 840814b186
commit d986829312
2 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin/0001-CMakeLists.txt-fix-library-install-path.patch
+39
View File
@@ -0,0 +1,39 @@
Upstream-Status: Submitted [https://github.com/brianhsu/xfce4-hotcorner-plugin/pull/8]
The library install path may be ${CMAKE_INSTALL_PREFIX}/lib64 rather
than fixed ${CMAKE_INSTALL_PREFIX}/lib. Provide a variable to make it
could override by cmake command line.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
CMakeLists.txt | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e193787..84cb52d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,8 +10,9 @@ include(GNUInstallDirs)
PKG_CHECK_MODULES(GTK REQUIRED libxfce4panel-1.0 libxfce4ui-1 libwnck-3.0)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(BASE_LIB_PATH "lib" CACHE STRING "base library install path")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BASE_LIB_PATH})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BASE_LIB_PATH})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS})
@@ -28,7 +29,7 @@ ADD_LIBRARY(hotcorner SHARED src/hotcorner.c src/util.c)
TARGET_LINK_LIBRARIES(hotcorner ${GTK_LIBRARIES})
-INSTALL(TARGETS hotcorner LIBRARY DESTINATION lib/xfce4/panel/plugins/)
+INSTALL(TARGETS hotcorner LIBRARY DESTINATION ${BASE_LIB_PATH}/xfce4/panel/plugins/)
INSTALL(FILES hotcorner.desktop DESTINATION share/xfce4/panel/plugins/)
GETTEXT_CREATE_TRANSLATIONS(po/xfce4-hotcorner-plugin.pot ALL po/zh_TW.po)
--
2.11.0
meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin_0.0.2.bb
+4 -1
View File
@@ -6,6 +6,9 @@ inherit xfce-panel-plugin cmake
DEPENDS += "libwnck3"
SRC_URI = "https://github.com/brianhsu/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz"
SRC_URI = "https://github.com/brianhsu/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \
file://0001-CMakeLists.txt-fix-library-install-path.patch"
SRC_URI[md5sum] = "ac31b45cda1867cb6bd69bb285638263"
SRC_URI[sha256sum] = "942684c92f96a158e1417e597947f822769ac56aa1993a8c9f166ee633ef2b8d"
EXTRA_OECMAKE = "-DBASE_LIB_PATH=${baselib}"