Attached Files | modules.patch [^] (2,659 bytes) 1969-12-31 19:00 [Show Content] [Hide Content]Index: FindCurses.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCurses.cmake,v
retrieving revision 1.4
diff -u -3 -p -r1.4 FindCurses.cmake
--- FindCurses.cmake 17 Feb 2005 15:42:40 -0000 1.4
+++ FindCurses.cmake 12 Aug 2005 18:58:29 -0000
@@ -2,19 +2,56 @@
# Find the curses include file and library
#
-FIND_PATH(CURSES_INCLUDE_PATH curses.h
-/usr/local/include /usr/include
+FIND_PATH(CURSES_INCLUDE_PATH
+ curses.h
+ /usr/local/include
+ /usr/include
)
-FIND_LIBRARY(CURSES_LIBRARY NAMES curses ncurses
-PATHS /usr/local/lib /usr/lib /lib
+FIND_LIBRARY(CURSES_LIBRARY
+ NAMES curses ncurses
+ PATHS
+ /usr/local/lib
+ /usr/lib
+ /lib
)
-FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr
-PATHS /usr/local/lib /usr/lib /lib
+FIND_LIBRARY(CURSES_EXTRA_LIBRARY
+ cur_colr
+ PATHS
+ /usr/local/lib
+ /usr/lib
+ /lib
)
-FIND_LIBRARY(FORM_LIBRARY form
-PATHS /usr/local/lib /usr/lib /lib
+FIND_LIBRARY(FORM_LIBRARY
+ form
+ PATHS
+ /usr/local/lib
+ /usr/lib
+ /lib
)
+# Need to provide the *_LIBRARIES
+SET(CURSES_LIBRARIES ${CURSES_LIBRARY})
+
+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)
+
+# Proper name is *_INCLUDE_DIR
+SET(CURSES_INCLUDE_DIR ${CURSES_INCLUDE_PATH})
+
+MARK_AS_ADVANCED(
+ CURSES_INCLUDE_PATH
+ CURSES_LIBRARY
+ CURSES_EXTRA_LIBRARY
+ FORM_LIBRARY
+ CURSES_LIBRARIES
+ CURSES_INCLUDE_DIR
+ )
+
Index: FindJPEG.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJPEG.cmake,v
retrieving revision 1.6
diff -u -3 -p -r1.6 FindJPEG.cmake
--- FindJPEG.cmake 7 Apr 2005 18:27:01 -0000 1.6
+++ FindJPEG.cmake 12 Aug 2005 18:58:29 -0000
@@ -29,3 +29,8 @@ ENDIF (JPEG_LIBRARY)
# Deprecated declarations.
SET (NATIVE_JPEG_INCLUDE_PATH ${JPEG_INCLUDE_DIR} )
GET_FILENAME_COMPONENT (NATIVE_JPEG_LIB_PATH ${JPEG_LIBRARY} PATH)
+
+MARK_AS_ADVANCED(
+ JPEG_LIBRARY
+ JPEG_INCLUDE_DIR
+ )
Index: FindZLIB.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindZLIB.cmake,v
retrieving revision 1.4
diff -u -3 -p -r1.4 FindZLIB.cmake
--- FindZLIB.cmake 7 Apr 2005 18:27:01 -0000 1.4
+++ FindZLIB.cmake 12 Aug 2005 18:58:29 -0000
@@ -21,3 +21,8 @@ IF(ZLIB_INCLUDE_DIR)
SET( ZLIB_FOUND "YES" )
ENDIF(ZLIB_LIBRARY)
ENDIF(ZLIB_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(
+ ZLIB_LIBRARY
+ ZLIB_INCLUDE_DIR
+ )
|