Browse Source

Try harder to find ncursesw

master
Přemysl Janouch 3 years ago
parent
commit
c04ab011d1
3 changed files with 27 additions and 5 deletions
  1. 9
    4
      CMakeLists.txt
  2. 17
    0
      cmake/FindNcursesw.cmake
  3. 1
    1
      termo

+ 9
- 4
CMakeLists.txt View File

@@ -17,10 +17,14 @@ set (project_VERSION "${project_VERSION_MAJOR}")
set (project_VERSION "${project_VERSION}.${project_VERSION_MINOR}")
set (project_VERSION "${project_VERSION}.${project_VERSION_PATCH}")

# For custom modules
set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)

# Dependencies
find_package (ZLIB REQUIRED)
find_package (Ncursesw REQUIRED)
find_package (PkgConfig REQUIRED)
pkg_check_modules (dependencies REQUIRED ncursesw glib-2.0 gio-2.0 pango)
pkg_check_modules (dependencies REQUIRED glib-2.0 gio-2.0 pango)

pkg_check_modules (icu icu-uc icu-i18n)
if (NOT icu_FOUND)
@@ -85,11 +89,12 @@ endif (WITH_GTK)

link_directories (${dependencies_LIBRARY_DIRS})
include_directories (${ZLIB_INCLUDE_DIRS} ${icu_INCLUDE_DIRS}
${dependencies_INCLUDE_DIRS} ${Termo_INCLUDE_DIRS})
${dependencies_INCLUDE_DIRS} ${NCURSESW_INCLUDE_DIRS}
${Termo_INCLUDE_DIRS})

# Configuration
include (CheckFunctionExists)
set (CMAKE_REQUIRED_LIBRARIES ${dependencies_LIBRARIES})
set (CMAKE_REQUIRED_LIBRARIES ${NCURSESW_LIBRARIES})
CHECK_FUNCTION_EXISTS ("resizeterm" HAVE_RESIZETERM)

# Localization
@@ -140,7 +145,7 @@ set (project_common_headers

# Project libraries
set (project_common_libraries ${ZLIB_LIBRARIES} ${icu_LIBRARIES}
${dependencies_LIBRARIES} termo-static)
${dependencies_LIBRARIES} ${NCURSESW_LIBRARIES} termo-static)

# Create a common project library so that source files are only compiled once
if (${CMAKE_VERSION} VERSION_GREATER "2.8.7")

+ 17
- 0
cmake/FindNcursesw.cmake View File

@@ -0,0 +1,17 @@
# 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)
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)

+ 1
- 1
termo

@@ -1 +1 @@
Subproject commit 0b5d8ecd0d4119f7fa3e1ef8bc060c6c7124de14
Subproject commit 783b744e8baeb606dd8925547ec0318df3c75237

Loading…
Cancel
Save