[Cmake-commits] [cmake-commits] hoffman committed FindCurses.cmake 1.17 1.18

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv12766

Modified Files:
	FindCurses.cmake 
Log Message:
ENH: fix curses on haiku


Index: FindCurses.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCurses.cmake,v
retrieving revision 1.17
retrieving revision 1.18
diff -C 2 -d -r1.17 -r1.18
*** FindCurses.cmake	18 Sep 2008 19:23:00 -0000	1.17
--- FindCurses.cmake	3 Dec 2008 21:13:15 -0000	1.18
***************
*** 16,20 ****
  
  FIND_LIBRARY(CURSES_NCURSES_LIBRARY NAMES ncurses )
- 
  SET(CURSES_USE_NCURSES FALSE)
  
--- 16,19 ----
***************
*** 81,99 ****
    # 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
    # only put ncurses include and library into 
    # variables if they are found
    IF(CURSES_NCURSES_INCLUDE_PATH AND CURSES_NCURSES_LIBRARY)
! 
      SET(CURSES_INCLUDE_PATH "${CURSES_NCURSES_INCLUDE_PATH}" 
!       CACHE FILEPATH "The curses include path")
      SET(CURSES_LIBRARY "${CURSES_NCURSES_LIBRARY}" 
!       CACHE FILEPATH "The curses library")
    ENDIF(CURSES_NCURSES_INCLUDE_PATH AND CURSES_NCURSES_LIBRARY)
  
  ENDIF(NOT CURSES_USE_NCURSES)
  
- 
- 
  FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
  FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr )
--- 80,109 ----
    # 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
+   # however if the value of the variable has NOTFOUND in it, then 
+   # it is OK to force, and we need to force in order to have it work.
    # a cache wqith these variables set
    # only put ncurses include and library into 
    # variables if they are found
+   IF(NOT CURSES_NCURSES_INCLUDE_PATH AND CURSES_HAVE_NCURSES_NCURSES_H)
+     GET_FILENAME_COMPONENT(CURSES_NCURSES_INCLUDE_PATH 
+       "${CURSES_HAVE_NCURSES_NCURSES_H}" PATH)
+   ENDIF(NOT CURSES_NCURSES_INCLUDE_PATH AND CURSES_HAVE_NCURSES_NCURSES_H)
    IF(CURSES_NCURSES_INCLUDE_PATH AND CURSES_NCURSES_LIBRARY)
!     SET( FORCE_IT )
!     IF(CURSES_INCLUDE_PATH MATCHES NOTFOUND)
!       SET(FORCE_IT FORCE)
!     ENDIF(CURSES_INCLUDE_PATH MATCHES NOTFOUND)
      SET(CURSES_INCLUDE_PATH "${CURSES_NCURSES_INCLUDE_PATH}" 
!       CACHE FILEPATH "The curses include path" ${FORCE_IT})
!     SET( FORCE_IT)
!     IF(CURSES_LIBRARY MATCHES NOTFOUND)
!       SET(FORCE_IT FORCE)
!     ENDIF(CURSES_LIBRARY MATCHES NOTFOUND)
      SET(CURSES_LIBRARY "${CURSES_NCURSES_LIBRARY}" 
!       CACHE FILEPATH "The curses library" ${FORCE_IT})
    ENDIF(CURSES_NCURSES_INCLUDE_PATH AND CURSES_NCURSES_LIBRARY)
  
  ENDIF(NOT CURSES_USE_NCURSES)
  
  FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
  FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr )