aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPřemysl Eric Janouch <p@janouch.name>2020-09-14 18:00:31 +0200
committerPřemysl Eric Janouch <p@janouch.name>2020-09-14 18:00:31 +0200
commitdd3f77a0aaa11fca85e271cc86338c454afcb3c4 (patch)
tree3e8c6ea417d1dfd2b46f7bfeb5de552459522de6
parent0bfb13655c02c75b0e1cc864a81996e58cd5c7b4 (diff)
downloadtermo-dd3f77a0aaa11fca85e271cc86338c454afcb3c4.tar.gz
termo-dd3f77a0aaa11fca85e271cc86338c454afcb3c4.tar.xz
termo-dd3f77a0aaa11fca85e271cc86338c454afcb3c4.zip
Get rid of one CMake dev warning
-rw-r--r--CMakeLists.txt10
-rw-r--r--cmake/FindNcursesw.cmake18
2 files changed, 14 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d13c860..4da6692 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,20 +49,20 @@ set (lib_headers
# Project libraries
# We need ncurses for one of the demos, so we're always looking
-if (NCURSESW_FOUND)
- include_directories (${NCURSESW_INCLUDE_DIRS})
- set (curses_libraries ${NCURSESW_LIBRARIES})
+if (Ncursesw_FOUND)
+ include_directories (${Ncursesw_INCLUDE_DIRS})
+ set (curses_libraries ${Ncursesw_LIBRARIES})
elseif (CURSES_FOUND)
include_directories (${CURSES_INCLUDE_DIR})
set (curses_libraries ${CURSES_LIBRARY})
-endif (NCURSESW_FOUND)
+endif (Ncursesw_FOUND)
if (unibilium_FOUND)
include_directories (${unibilium_INCLUDE_DIRS})
set (lib_libraries ${unibilium_LIBRARIES})
add_definitions (-DHAVE_UNIBILIUM)
elseif (curses_libraries)
- include_directories (${NCURSESW_INCLUDE_DIRS})
+ include_directories (${Ncursesw_INCLUDE_DIRS})
set (lib_libraries ${curses_libraries})
else (CURSES_FOUND)
message (SEND_ERROR "Unibilium not found, Curses not found")
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)