From af59771b9b846e6eb52a9f15cc1be4d06a0ac833 Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Thu, 8 Sep 2005 11:38:55 -0400
Subject: [PATCH] ENH: clean up some stuff

---
 Modules/FindCurses.cmake | 53 ++++++++++++++++++++++++++++++++++------
 Modules/FindJPEG.cmake   |  5 ++++
 Modules/FindZLIB.cmake   |  5 ++++
 3 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake
index ba4f3bb78..3e379869a 100644
--- a/Modules/FindCurses.cmake
+++ b/Modules/FindCurses.cmake
@@ -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
+  )
+
diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake
index e81e8bf9e..ef596ed6f 100644
--- a/Modules/FindJPEG.cmake
+++ b/Modules/FindJPEG.cmake
@@ -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
+  )
diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake
index cb23b6dec..d5bca3fda 100644
--- a/Modules/FindZLIB.cmake
+++ b/Modules/FindZLIB.cmake
@@ -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
+  )