From 58b0e317847994fdce6371605161ddac70a02eb3 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Wed, 15 Aug 2007 09:43:01 -0400 Subject: [PATCH] COMP: ccmake requires ncurses, according to Berk and since it doesn't build on NetBSD where there are separate curses and ncurses libraries, and where the curses library is found, which doesn't work for ccmake while the existing ncurses library would work. With this change it should be possible to test whether the found curses lib provides ncurses functionality. Alex --- CMakeLists.txt | 1 + Modules/FindCurses.cmake | 79 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 74 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be426c6dd..3a2ce3500 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -317,6 +317,7 @@ MACRO (CMAKE_BUILD_UTILITIES) #--------------------------------------------------------------------- # Use curses? IF (UNIX) + SET(CURSES_NEED_NCURSES TRUE) FIND_PACKAGE(Curses QUIET) IF (CURSES_LIBRARY) OPTION(BUILD_CursesDialog "Build the CMake Curses Dialog ccmake" ON) diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake index 1e53dbfdc..e4ca1407d 100644 --- a/Modules/FindCurses.cmake +++ b/Modules/FindCurses.cmake @@ -1,13 +1,72 @@ # - Find the curses include file and library # +# CURSES_FOUND - system has Curses +# CURSES_INCLUDE_DIR - the Curses include directory +# CURSES_LIBRARIES - The libraries needed to use Curses +# +# Set CURSES_NEED_NCURSES to TRUE before the FIND_PACKAGE() command if NCurses +# functionality is required. -FIND_PATH(CURSES_INCLUDE_PATH curses.h ) +FIND_LIBRARY(CURSES_CURSES_LIBRARY NAMES curses ) -FIND_LIBRARY(CURSES_LIBRARY NAMES curses ncurses ) +FIND_LIBRARY(CURSES_NCURSES_LIBRARY NAMES ncurses ) +SET(CURSES_USE_NCURSES FALSE) + +IF(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_LIBRARY) + SET(CURSES_USE_NCURSES TRUE) +ENDIF(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_LIBRARY) + + +# Not sure the logic is correct here. +# If NCurses is required, use the function wsyncup() to check if the library +# has NCurses functionality (at least this is where it breaks on NetBSD). +# If wsyncup is in curses, use this one. +# If not, try to find ncurses and check if this has the symbol. +# Once the ncurses library is found, search the ncurses.h header first, but +# some web pages also say that even with ncurses there is not always a ncurses.h: +# http://osdir.com/ml/gnome.apps.mc.devel/2002-06/msg00029.html +# So at first try ncurses.h, if not found, try to find curses.h under the same +# prefix as the library was found, if still not found, try curses.h with the +# default search paths. +IF(CURSES_CURSES_LIBRARY AND CURSES_NEED_NCURSES) + INCLUDE(CheckLibraryExists) + CHECK_LIBRARY_EXISTS("${CURSES_CURSES_LIBRARY}" wsyncup "" CURSES_CURSES_HAS_WSYNCUP) + + IF(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_HAS_WSYNCUP) + CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}" wsyncup "" CURSES_NCURSES_HAS_WSYNCUP) + IF( CURSES_NCURSES_HAS_WSYNCUP) + SET(CURSES_USE_NCURSES TRUE) + ENDIF( CURSES_NCURSES_HAS_WSYNCUP) + ENDIF(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_HAS_WSYNCUP) + +ENDIF(CURSES_CURSES_LIBRARY AND CURSES_NEED_NCURSES) + + +IF(NOT CURSES_USE_NCURSES) + FIND_PATH(CURSES_CURSES_INCLUDE_PATH curses.h ) + SET(CURSES_INCLUDE_PATH "${CURSES_CURSES_INCLUDE_PATH}") + SET(CURSES_LIBRARY "${CURSES_CURSES_LIBRARY}") + GET_FILENAME_COMPONENT(_cursesLibDir "${CURSES_CURSES_LIBRARY}" PATH) + GET_FILENAME_COMPONENT(_cursesParentDir "${_cursesLibDir}" PATH) +ELSE(NOT CURSES_USE_NCURSES) +# we need to find ncurses + FIND_PATH(CURSES_NCURSES_INCLUDE_PATH ncurses.h ncurses/ncurses.h ncurses/curses.h) + GET_FILENAME_COMPONENT(_cursesLibDir "${CURSES_NCURSES_LIBRARY}" PATH) + GET_FILENAME_COMPONENT(_cursesParentDir "${_cursesLibDir}" PATH) + FIND_PATH(CURSES_NCURSES_INCLUDE_PATH curses.h PATHS "${_cursesParentDir}/include" NO_DEFAULT_PATH) + FIND_PATH(CURSES_NCURSES_INCLUDE_PATH curses.h) + + SET(CURSES_INCLUDE_PATH "${CURSES_NCURSES_INCLUDE_PATH}") + SET(CURSES_LIBRARY "${CURSES_NCURSES_LIBRARY}") +ENDIF(NOT CURSES_USE_NCURSES) + + +FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr PATHS "${_cursesLibDir}" NO_DEFAULT_PATH) FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr ) -FIND_LIBRARY(FORM_LIBRARY form ) +FIND_LIBRARY(CURSES_FORM_LIBRARY form PATHS "${_cursesLibDir}" NO_DEFAULT_PATH) +FIND_LIBRARY(CURSES_FORM_LIBRARY form ) # Need to provide the *_LIBRARIES SET(CURSES_LIBRARIES ${CURSES_LIBRARY}) @@ -16,9 +75,9 @@ IF(CURSES_EXTRA_LIBRARY) SET(CURSES_LIBRARIES ${CURSES_LIBRARIES} ${CURSES_EXTRA_LIBRARY}) ENDIF(CURSES_EXTRA_LIBRARY) -IF(FORM_LIBRARY) - SET(CURSES_LIBRARIES ${CURSES_LIBRARIES} ${FORM_LIBRARY}) -ENDIF(FORM_LIBRARY) +IF(CURSES_FORM_LIBRARY) + SET(CURSES_LIBRARIES ${CURSES_LIBRARIES} ${CURSES_FORM_LIBRARY}) +ENDIF(CURSES_FORM_LIBRARY) # Proper name is *_INCLUDE_DIR SET(CURSES_INCLUDE_DIR ${CURSES_INCLUDE_PATH}) @@ -28,13 +87,21 @@ SET(CURSES_INCLUDE_DIR ${CURSES_INCLUDE_PATH}) INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Curses DEFAULT_MSG CURSES_LIBRARY CURSES_INCLUDE_PATH) +# for compatibility +SET(FORM_LIBRARY "${CURSES_FORM_LIBRARY}") MARK_AS_ADVANCED( CURSES_INCLUDE_PATH CURSES_LIBRARY + CURSES_CURSES_INCLUDE_PATH + CURSES_CURSES_LIBRARY + CURSES_NCURSES_INCLUDE_PATH + CURSES_NCURSES_LIBRARY CURSES_EXTRA_LIBRARY FORM_LIBRARY CURSES_LIBRARIES CURSES_INCLUDE_DIR + CURSES_CURSES_HAS_WSYNCUP + CURSES_NCURSES_HAS_WSYNCUP )