diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-03-20 17:29:56 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-03-20 17:29:56 (GMT) |
| commit | a980fdc96a07bc469e77b37067dc76020d6e02f9 (patch) | |
| tree | 4acee24b963a388662d1cb426abd5ea5bc8e72d7 /Modules/FindPNG.cmake | |
| parent | cfe124500f0c6ac4341ceb8e04c7593a0dc9335b (diff) | |
| download | CMake-a980fdc96a07bc469e77b37067dc76020d6e02f9.zip CMake-a980fdc96a07bc469e77b37067dc76020d6e02f9.tar.gz CMake-a980fdc96a07bc469e77b37067dc76020d6e02f9.tar.bz2 | |
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
Diffstat (limited to 'Modules/FindPNG.cmake')
| -rw-r--r-- | Modules/FindPNG.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake index 861d471..f078242 100644 --- a/Modules/FindPNG.cmake +++ b/Modules/FindPNG.cmake @@ -24,8 +24,7 @@ IF(ZLIB_FOUND) PATHS /usr/lib /usr/local/lib ) - IF (PNG_LIBRARY) - IF (PNG_PNG_INCLUDE_DIR) + IF (PNG_LIBRARY AND 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) + ENDIF (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR) ENDIF(ZLIB_FOUND) + +MARK_AS_ADVANCED(PNG_PNG_INCLUDE_DIR PNG_LIBRARY ) |