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

libyui-ncurses: fix ncurses find module

Browse Source 
This makes the module look in the standard locations instead of only some
hard coded ones.

Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Pascal Bach
2018-10-30 14:29:57 +01:00
committed by Khem Raj
parent 2417acf4f0
commit 8d7a7ad330
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-graphics/libyui/libyui-ncurses/0003-Simplify-ncurses-finding-module.patch
+35
View File
@@ -0,0 +1,35 @@
From c2291fe28dc5682f81804941512431642975cf21 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@siemens.com>
Date: Mon, 29 Oct 2018 18:17:32 +0100
Subject: [PATCH] Simplify ncurses finding module
CMake will automatically look in the right locations, there is no need to
re-implement the logic with a for loop and NO_DEFAULT_PATH.
It is already done like this to file the headers.
Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/73]
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
---
cmake/Modules/FindCurses6.cmake | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/cmake/Modules/FindCurses6.cmake b/cmake/Modules/FindCurses6.cmake
index 0bf02c3..e298d5d 100644
--- a/cmake/Modules/FindCurses6.cmake
+++ b/cmake/Modules/FindCurses6.cmake
@@ -5,11 +5,9 @@
# CURSES6_LIBRARIES - The libraries needed to use Curses6
# CURSES6_DEFINITIONS - Compiler switches required for using Curses6
-FOREACH(path ${CMAKE_LIBRARY_PATH} /usr/${LIB_DIR})
- FIND_LIBRARY(CURSES6_NCURSESW_LIBRARY NAMES ncursesw PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH)
- FIND_LIBRARY(CURSES6_PANELW_LIBRARY NAMES panelw PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH)
- FIND_LIBRARY(CURSES6_TINFO_LIBRARY NAMES tinfo PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH)
-ENDFOREACH()
+FIND_LIBRARY(CURSES6_NCURSESW_LIBRARY NAMES ncursesw PATH_SUFFIXES ncurses6)
+FIND_LIBRARY(CURSES6_PANELW_LIBRARY NAMES panelw PATH_SUFFIXES ncurses6)
+FIND_LIBRARY(CURSES6_TINFO_LIBRARY NAMES tinfo PATH_SUFFIXES ncurses6)
SET(CURSES6_LIBRARIES ${CURSES6_NCURSESW_LIBRARY} ${CURSES6_PANELW_LIBRARY})
# tinfo is optional (in 12.1 is not there)
meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb
+1
View File
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
SRC_URI = "git://github.com/libyui/libyui-ncurses.git \
file://0001-Use-override-consistently.patch \
file://0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch \
file://0003-Simplify-ncurses-finding-module.patch \
"
SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch"