From 7023c513477eca7832f5ae3c6204a7240c1401c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= Date: Fri, 2 Oct 2020 06:46:31 +0200 Subject: [PATCH] Get rid of CMake dev warnings --- cmake/FindNcursesw.cmake | 18 +++++++++--------- cmake/FindUnistring.cmake | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cmake/FindNcursesw.cmake b/cmake/FindNcursesw.cmake index 88c1d01..0536674 100644 --- a/cmake/FindNcursesw.cmake +++ b/cmake/FindNcursesw.cmake @@ -1,17 +1,17 @@ # Public Domain find_package (PkgConfig REQUIRED) -pkg_check_modules (NCURSESW QUIET ncursesw) +pkg_check_modules (Ncursesw QUIET ncursesw) # OpenBSD doesn't provide a pkg-config file -set (required_vars NCURSESW_LIBRARIES) -if (NOT NCURSESW_FOUND) - find_library (NCURSESW_LIBRARIES NAMES ncursesw) - find_path (NCURSESW_INCLUDE_DIRS ncurses.h) - list (APPEND required_vars NCURSESW_INCLUDE_DIRS) -endif (NOT NCURSESW_FOUND) +set (required_vars Ncursesw_LIBRARIES) +if (NOT Ncursesw_FOUND) + find_library (Ncursesw_LIBRARIES NAMES ncursesw) + find_path (Ncursesw_INCLUDE_DIRS ncurses.h) + list (APPEND required_vars Ncursesw_INCLUDE_DIRS) +endif (NOT Ncursesw_FOUND) include (FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS (NCURSESW DEFAULT_MSG ${required_vars}) +FIND_PACKAGE_HANDLE_STANDARD_ARGS (Ncursesw DEFAULT_MSG ${required_vars}) -mark_as_advanced (NCURSESW_LIBRARIES NCURSESW_INCLUDE_DIRS) +mark_as_advanced (Ncursesw_LIBRARIES Ncursesw_INCLUDE_DIRS) diff --git a/cmake/FindUnistring.cmake b/cmake/FindUnistring.cmake index 6b74efb..6da4e6b 100644 --- a/cmake/FindUnistring.cmake +++ b/cmake/FindUnistring.cmake @@ -1,10 +1,10 @@ # Public Domain -find_path (UNISTRING_INCLUDE_DIRS unistr.h) -find_library (UNISTRING_LIBRARIES NAMES unistring libunistring) +find_path (Unistring_INCLUDE_DIRS unistr.h) +find_library (Unistring_LIBRARIES NAMES unistring libunistring) include (FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS (UNISTRING DEFAULT_MSG - UNISTRING_INCLUDE_DIRS UNISTRING_LIBRARIES) +FIND_PACKAGE_HANDLE_STANDARD_ARGS (Unistring DEFAULT_MSG + Unistring_INCLUDE_DIRS Unistring_LIBRARIES) -mark_as_advanced (UNISTRING_LIBRARIES UNISTRING_INCLUDE_DIRS) +mark_as_advanced (Unistring_LIBRARIES Unistring_INCLUDE_DIRS)