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 | |
| 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
| -rw-r--r-- | Modules/AddFileDependencies.cmake | 16 | ||||
| -rw-r--r-- | Modules/FindPNG.cmake | 8 | ||||
| -rw-r--r-- | Modules/KDE3Macros.cmake | 4 |
3 files changed, 22 insertions, 6 deletions
diff --git a/Modules/AddFileDependencies.cmake b/Modules/AddFileDependencies.cmake new file mode 100644 index 0000000..0ea6470 --- /dev/null +++ b/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) 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 ) diff --git a/Modules/KDE3Macros.cmake b/Modules/KDE3Macros.cmake index 99dfb5f..17e4384 100644 --- a/Modules/KDE3Macros.cmake +++ b/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) |