kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: fix #6993 

FindCurses.cmake is now almost exactly reverted back to the state when
CURSES_LIBRARY and CURSES_INCLUDE_PATH where set for compatibility but not
in the cache. It is important that CURSES_CURSES_LIBRARY and
CURSES_NCURSES_LIBRARY really contain the path to these files.
Later on CURSES_LIBRARY is set to the one of the two which will be
used as curses library. This is now done in the cache, without FORCE.
So preloading the cache still seems to work (at least what I tested).

Alex
This commit is contained in:
Alexander Neundorf 2008-05-10 19:07:47 -04:00
parent 071725a1c1
commit b837ade944
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Modules/FindCurses.cmake
View File

@ -12,15 +12,15 @@
# Set CURSES_NEED_NCURSES to TRUE before the FIND_PACKAGE() command if NCurses # Set CURSES_NEED_NCURSES to TRUE before the FIND_PACKAGE() command if NCurses
# functionality is required. # functionality is required.
FIND_LIBRARY(CURSES_LIBRARY NAMES curses ) FIND_LIBRARY(CURSES_CURSES_LIBRARY NAMES curses )
FIND_LIBRARY(CURSES_NCURSES_LIBRARY NAMES ncurses ) FIND_LIBRARY(CURSES_NCURSES_LIBRARY NAMES ncurses )
SET(CURSES_USE_NCURSES FALSE) SET(CURSES_USE_NCURSES FALSE)
IF(CURSES_NCURSES_LIBRARY AND NOT CURSES_LIBRARY) IF(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_LIBRARY)
SET(CURSES_USE_NCURSES TRUE) SET(CURSES_USE_NCURSES TRUE)
ENDIF(CURSES_NCURSES_LIBRARY AND NOT CURSES_LIBRARY) ENDIF(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_LIBRARY)
# Not sure the logic is correct here. # Not sure the logic is correct here.
@ -34,9 +34,9 @@ ENDIF(CURSES_NCURSES_LIBRARY AND NOT CURSES_LIBRARY)
# So at first try ncurses.h, if not found, try to find curses.h under the same # 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 # prefix as the library was found, if still not found, try curses.h with the
# default search paths. # default search paths.
IF(CURSES_LIBRARY AND CURSES_NEED_NCURSES) IF(CURSES_CURSES_LIBRARY AND CURSES_NEED_NCURSES)
INCLUDE(CheckLibraryExists) INCLUDE(CheckLibraryExists)
CHECK_LIBRARY_EXISTS("${CURSES_LIBRARY}" wsyncup "" CURSES_CURSES_HAS_WSYNCUP) CHECK_LIBRARY_EXISTS("${CURSES_CURSES_LIBRARY}" wsyncup "" CURSES_CURSES_HAS_WSYNCUP)
IF(CURSES_NCURSES_LIBRARY AND NOT 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) CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}" wsyncup "" CURSES_NCURSES_HAS_WSYNCUP)
@ -45,15 +45,19 @@ IF(CURSES_LIBRARY AND CURSES_NEED_NCURSES)
ENDIF( CURSES_NCURSES_HAS_WSYNCUP) ENDIF( CURSES_NCURSES_HAS_WSYNCUP)
ENDIF(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_HAS_WSYNCUP) ENDIF(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_HAS_WSYNCUP)
ENDIF(CURSES_LIBRARY AND CURSES_NEED_NCURSES) ENDIF(CURSES_CURSES_LIBRARY AND CURSES_NEED_NCURSES)
IF(NOT CURSES_USE_NCURSES) IF(NOT CURSES_USE_NCURSES)
FIND_FILE(CURSES_HAVE_CURSES_H curses.h ) FIND_FILE(CURSES_HAVE_CURSES_H curses.h )
FIND_PATH(CURSES_INCLUDE_PATH curses.h ) FIND_PATH(CURSES_CURSES_H_PATH curses.h )
GET_FILENAME_COMPONENT(_cursesLibDir "${CURSES_CURSES_LIBRARY}" PATH)
GET_FILENAME_COMPONENT(_cursesLibDir "${CURSES_LIBRARY}" PATH)
GET_FILENAME_COMPONENT(_cursesParentDir "${_cursesLibDir}" PATH) GET_FILENAME_COMPONENT(_cursesParentDir "${_cursesLibDir}" PATH)
# for compatibility with older FindCurses.cmake this has to be in the cache
# FORCE must not be used since this would break builds which preload a cache wqith these variables set
SET(CURSES_INCLUDE_PATH "${CURSES_CURSES_H_PATH}" CACHE FILEPATH "The curses include path")
SET(CURSES_LIBRARY "${CURSES_CURSES_LIBRARY}" CACHE FILEPATH "The curses library")
ELSE(NOT CURSES_USE_NCURSES) ELSE(NOT CURSES_USE_NCURSES)
# we need to find ncurses # we need to find ncurses
GET_FILENAME_COMPONENT(_cursesLibDir "${CURSES_NCURSES_LIBRARY}" PATH) GET_FILENAME_COMPONENT(_cursesLibDir "${CURSES_NCURSES_LIBRARY}" PATH)
@ -69,21 +73,25 @@ ELSE(NOT CURSES_USE_NCURSES)
FIND_PATH(CURSES_NCURSES_INCLUDE_PATH curses.h PATHS "${_cursesParentDir}/include" NO_DEFAULT_PATH) FIND_PATH(CURSES_NCURSES_INCLUDE_PATH curses.h PATHS "${_cursesParentDir}/include" NO_DEFAULT_PATH)
FIND_PATH(CURSES_NCURSES_INCLUDE_PATH curses.h) FIND_PATH(CURSES_NCURSES_INCLUDE_PATH curses.h)
SET(CURSES_INCLUDE_PATH "${CURSES_NCURSES_INCLUDE_PATH}") # for compatibility with older FindCurses.cmake this has to be in the cache
SET(FORCE_ARG "") # FORCE must not be used since this would break builds which preload a cache wqith these variables set
IF("${CURSES_LIBRARY}" STREQUAL "CURSES_LIBRARY-NOTFOUND") SET(CURSES_INCLUDE_PATH "${CURSES_NCURSES_INCLUDE_PATH}" CACHE FILEPATH "The curses include path")
SET(FORCE_ARG "FORCE") SET(CURSES_LIBRARY "${CURSES_NCURSES_LIBRARY}" CACHE FILEPATH "The curses library")
ENDIF("${CURSES_LIBRARY}" STREQUAL "CURSES_LIBRARY-NOTFOUND")
SET(CURSES_LIBRARY "${CURSES_NCURSES_LIBRARY}" CACHE FILEPATH "path to curses" ${FORCE_ARG})
ENDIF(NOT CURSES_USE_NCURSES) ENDIF(NOT CURSES_USE_NCURSES)
FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr PATHS "${_cursesLibDir}" NO_DEFAULT_PATH) FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr PATHS "${_cursesLibDir}" NO_DEFAULT_PATH)
FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr ) FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr )
FIND_LIBRARY(CURSES_FORM_LIBRARY form PATHS "${_cursesLibDir}" NO_DEFAULT_PATH) FIND_LIBRARY(CURSES_FORM_LIBRARY form PATHS "${_cursesLibDir}" NO_DEFAULT_PATH)
FIND_LIBRARY(CURSES_FORM_LIBRARY form ) FIND_LIBRARY(CURSES_FORM_LIBRARY form )
# for compatibility with older FindCurses.cmake this has to be in the cache
# FORCE must not be used since this would break builds which preload a cache wqith these variables set
SET(FORM_LIBRARY "${CURSES_FORM_LIBRARY}" CACHE FILEPATH "The curses form library")
# Need to provide the *_LIBRARIES # Need to provide the *_LIBRARIES
SET(CURSES_LIBRARIES ${CURSES_LIBRARY}) SET(CURSES_LIBRARIES ${CURSES_LIBRARY})
@ -103,14 +111,11 @@ SET(CURSES_INCLUDE_DIR ${CURSES_INCLUDE_PATH})
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Curses DEFAULT_MSG CURSES_LIBRARY CURSES_INCLUDE_PATH) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Curses DEFAULT_MSG CURSES_LIBRARY CURSES_INCLUDE_PATH)
# for compatibility
SET(FORM_LIBRARY "${CURSES_FORM_LIBRARY}")
MARK_AS_ADVANCED( MARK_AS_ADVANCED(
CURSES_INCLUDE_PATH CURSES_INCLUDE_PATH
CURSES_LIBRARY CURSES_LIBRARY
CURSES_CURSES_INCLUDE_PATH CURSES_CURSES_INCLUDE_PATH
CURSES_LIBRARY CURSES_CURSES_LIBRARY
CURSES_NCURSES_INCLUDE_PATH CURSES_NCURSES_INCLUDE_PATH
CURSES_NCURSES_LIBRARY CURSES_NCURSES_LIBRARY
CURSES_EXTRA_LIBRARY CURSES_EXTRA_LIBRARY