BUG: don't include MacroLibrary.cmake, but add a cmake module which implements ADD_FILE_DEPENDENCIES()

ENH: mark the variables from FindPNG.cmake as advanced

Alex

Modules/AddFileDependencies.cmake

@@ -0,0 +1,16 @@
+# - ADD_FILE_DEPENDENCIES(source_file depend_files...)
+# Adds the given files as dependencies to source_file
+#
+
+MACRO(ADD_FILE_DEPENDENCIES _file)
+
+   GET_SOURCE_FILE_PROPERTY(_deps ${_file} OBJECT_DEPENDS)
+   IF (_deps)
+      SET(_deps ${_deps} ${ARGN})
+   ELSE (_deps)
+      SET(_deps ${ARGN})
+   ENDIF (_deps)
+
+   SET_SOURCE_FILES_PROPERTIES(${_file} PROPERTIES OBJECT_DEPENDS "${_deps}")
+
+ENDMACRO(ADD_FILE_DEPENDENCIES)

Modules/FindPNG.cmake

@@ -24,8 +24,7 @@ IF(ZLIB_FOUND)
     PATHS /usr/lib /usr/local/lib
   )
 
-  IF (PNG_LIBRARY)
+  IF (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)
-    IF (PNG_PNG_INCLUDE_DIR)
       # png.h includes zlib.h. Sigh.
       SET(PNG_INCLUDE_DIR ${PNG_PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
       SET(PNG_LIBRARIES ${PNG_LIBRARY} ${ZLIB_LIBRARY})
@@ -39,7 +38,8 @@ IF(ZLIB_FOUND)
         ENDIF(BUILD_SHARED_LIBS)
       ENDIF (CYGWIN)
 
-    ENDIF (PNG_PNG_INCLUDE_DIR)
+  ENDIF (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)
-  ENDIF (PNG_LIBRARY)
 
 ENDIF(ZLIB_FOUND)
+
+MARK_AS_ADVANCED(PNG_PNG_INCLUDE_DIR PNG_LIBRARY )

Modules/KDE3Macros.cmake

@@ -18,7 +18,7 @@
 
 #neundorf@kde.org
 
-INCLUDE(MacroLibrary)
+INCLUDE(AddFileDependencies)
 
 #create the kidl and skeletion file for dcop stuff
 #usage: KDE_ADD_COP_SKELS(foo_SRCS ${dcop_headers})
@@ -226,7 +226,7 @@ MACRO(KDE3_AUTOMOC)
                   DEPENDS ${_header}
                )
 
-               MACRO_ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc})
+               ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc})
 
             ENDFOREACH (_current_MOC_INC)
          ENDIF(_match)