summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlava Barinov <v.barinov@samsung.com>2019-12-19 14:40:49 (GMT)
committerSlava Barinov <v.barinov@samsung.com>2019-12-19 15:14:19 (GMT)
commit68663ebb150a41248e12a461dd5b699f63566048 (patch)
tree1201f6b8f2d1d98b6320e51a6c9591f9a402159a
parentd2ec2bfa846b86b38ca52b93fa141c7a6cf394d5 (diff)
downloadcmake-sandbox/vbarinov/tizen_6.0_build.zip
cmake-sandbox/vbarinov/tizen_6.0_build.tar.gz
cmake-sandbox/vbarinov/tizen_6.0_build.tar.bz2
Signed-off-by: Slava Barinov <v.barinov@samsung.com>
-rw-r--r--Modules/FindCurses.cmake8
-rw-r--r--Source/CursesDialog/form/CMakeLists.txt3
2 files changed, 11 insertions, 0 deletions
diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake
index 09d1ba4..81fb757 100644
--- a/Modules/FindCurses.cmake
+++ b/Modules/FindCurses.cmake
@@ -133,6 +133,9 @@ find_library(CURSES_EXTRA_LIBRARY cur_colr )
find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}")
find_library(CURSES_FORM_LIBRARY form )
+find_library(CURSES_TINFO_LIBRARY tinfo HINTS "${_cursesLibDir}")
+find_library(CURSES_TINFO_LIBRARY tinfo )
+
# for compatibility with older FindCurses.cmake this has to be in the cache
# FORCE must not be used since this would break builds which preload a cache
# qith these variables set
@@ -150,6 +153,10 @@ if(CURSES_FORM_LIBRARY)
set(CURSES_LIBRARIES ${CURSES_LIBRARIES} ${CURSES_FORM_LIBRARY})
endif()
+if(CURSES_TINFO_LIBRARY)
+ set(CURSES_LIBRARIES ${CURSES_LIBRARIES} ${CURSES_TINFO_LIBRARY})
+endif()
+
# Proper name is *_INCLUDE_DIR
set(CURSES_INCLUDE_DIR ${CURSES_INCLUDE_PATH})
@@ -168,6 +175,7 @@ mark_as_advanced(
CURSES_NCURSES_LIBRARY
CURSES_EXTRA_LIBRARY
FORM_LIBRARY
+ CURSES_TINFO_LIBRARY
CURSES_LIBRARIES
CURSES_INCLUDE_DIR
CURSES_CURSES_HAS_WSYNCUP
diff --git a/Source/CursesDialog/form/CMakeLists.txt b/Source/CursesDialog/form/CMakeLists.txt
index 4e07fa0..e9cf30a 100644
--- a/Source/CursesDialog/form/CMakeLists.txt
+++ b/Source/CursesDialog/form/CMakeLists.txt
@@ -64,3 +64,6 @@ target_link_libraries(cmForm ${CURSES_LIBRARY})
if(CURSES_EXTRA_LIBRARY)
target_link_libraries(cmForm ${CURSES_EXTRA_LIBRARY})
endif()
+if(CURSES_TINFO_LIBRARY)
+ target_link_libraries(cmForm ${CURSES_TINFO_LIBRARY})
+endif()