From d2cfc2ee81d4560d5484ed4a9a714451b5bc5440 Mon Sep 17 00:00:00 2001 From: Přemysl Eric Janouch
Date: Mon, 24 Jul 2023 11:47:33 +0200 Subject: Deduplicate CMake scripts --- CMakeLists.txt | 3 ++- cmake/FindNcursesw.cmake | 17 ----------------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 cmake/FindNcursesw.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index b90ce2b..3aecea8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,8 @@ endif () add_definitions (-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38) # For custom modules -set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) +set (CMAKE_MODULE_PATH + "${PROJECT_SOURCE_DIR}/cmake;${PROJECT_SOURCE_DIR}/liberty/cmake") # Cross-compilation for Windows, as a proof-of-concept pulled in from logdiag if (WIN32) diff --git a/cmake/FindNcursesw.cmake b/cmake/FindNcursesw.cmake deleted file mode 100644 index 3b3a675..0000000 --- a/cmake/FindNcursesw.cmake +++ /dev/null @@ -1,17 +0,0 @@ -# Public Domain - -find_package (PkgConfig REQUIRED) -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 PATH_SUFFIXES ncurses) - list (APPEND required_vars Ncursesw_INCLUDE_DIRS) -endif (NOT Ncursesw_FOUND) - -include (FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS (Ncursesw DEFAULT_MSG ${required_vars}) - -mark_as_advanced (Ncursesw_LIBRARIES Ncursesw_INCLUDE_DIRS) -- cgit v1.2.3-70-g09d2