diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-01-18 19:44:49 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-01-18 19:44:49 +0000 |
| commit | ebc83eb65f94d6903b7aa928867f47567c04399d (patch) | |
| tree | 4610590f165990d383a90155be493c558bf29fd2 | |
| parent | 3e66a2ffd7de1f61236fbf85b1e313692d2b48de (diff) | |
| download | extra-cmake-modules-ebc83eb65f94d6903b7aa928867f47567c04399d.tar.gz extra-cmake-modules-ebc83eb65f94d6903b7aa928867f47567c04399d.tar.bz2 | |
-add the dependency to meinproc when building kdelibs to the meinproc macro, so meinproc gets created before the rule is executed
-remove the unnecessary if() around the find_program() calls, they in any way do nothing if it was found already
-add docs for the new meinproc macro to FindKDE4Internal.cmake
Alex
svn path=/trunk/KDE/kdelibs/; revision=625047
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 20 | ||||
| -rw-r--r-- | modules/KDE4Macros.cmake | 2 |
2 files changed, 9 insertions, 13 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index b1ac495d..7a852b26 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -181,6 +181,9 @@ # Installs all png and svgz files in the current directory to the icon # directoy given in path, in the subdirectory for the given icon theme. # +# KDE4_CREATE_HTML_HANDBOOK( <docbookfile1> ... <docbookfileN> +# Create the HTML documentation using meinproc from the listed docbook files +# # _KDE4_PLATFORM_INCLUDE_DIRS is used only internally # _KDE4_PLATFORM_DEFINITIONS is used only internally # @@ -343,6 +346,7 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kernel/kglobal.h) # when building kdelibs, make the kcfg rules depend on the binaries... set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler) set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets) + set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc) set(KDE4_INSTALLED_VERSION_OK TRUE) @@ -351,6 +355,7 @@ else(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kernel/kglobal.h) # ... but NOT otherwise set( _KDE4_KCONFIG_COMPILER_DEP) set( _KDE4_MAKEKDEWIDGETS_DEP) + set( _KDE4_MEINPROC_EXECUTABLE_DEP) # Check the version of kde. KDE4_KDECONFIG_EXECUTABLE was set by FindKDE4 exec_program(${KDE4_KDECONFIG_EXECUTABLE} ARGS "--version" OUTPUT_VARIABLE kdeconfig_output ) @@ -477,10 +482,7 @@ else(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kernel/kglobal.h) /opt/kde4/bin NO_DEFAULT_PATH ) - - if (NOT KDE4_KCFGC_EXECUTABLE) - find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler ) - endif (NOT KDE4_KCFGC_EXECUTABLE) + find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler ) find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc PATHS ${KDE4_BIN_INSTALL_DIR} @@ -489,10 +491,7 @@ else(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kernel/kglobal.h) /opt/kde4/bin NO_DEFAULT_PATH ) - - if (NOT KDE4_MEINPROC_EXECUTABLE) - find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc ) - endif (NOT KDE4_MEINPROC_EXECUTABLE) + find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc ) find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} @@ -501,10 +500,7 @@ else(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kernel/kglobal.h) /opt/kde4/bin NO_DEFAULT_PATH ) - - if (NOT KDE4_MAKEKDEWIDGETS_EXECUTABLE) - find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets ) - endif (NOT KDE4_MAKEKDEWIDGETS_EXECUTABLE) + find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets ) endif(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kernel/kglobal.h) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 19e83c9d..cc491c4c 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -231,7 +231,7 @@ macro (KDE4_CREATE_HTML_HANDBOOK) add_custom_command(OUTPUT ${_doc} COMMAND ${KDE4_MEINPROC_EXECUTABLE} ARGS -o ${_doc} ${_input} - DEPENDS ${_input} + DEPENDS ${_input} ${_KDE4_MEINPROC_EXECUTABLE_DEP} ) endforeach (_current_FILE) endmacro (KDE4_CREATE_HTML_HANDBOOK) |