diff options
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 33 | ||||
| -rw-r--r-- | modules/KDE4Macros.cmake | 44 |
2 files changed, 29 insertions, 48 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 8ce4a045..6029d9e5 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -423,27 +423,27 @@ else (_kdeBootStrapping) find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets ) - # allow searching cmake modules in all given kde install locations (KDEDIRS based) - execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) - file(TO_CMAKE_PATH "${_data_DIR}" _data_DIR) - foreach(dir ${_data_DIR}) - set (apath "${dir}/cmake/modules") - if (EXISTS "${apath}") - set (included 0) - string(TOLOWER "${apath}" _apath) - # ignore already added pathes, case insensitive - foreach(adir ${CMAKE_MODULE_PATH}) + # allow searching cmake modules in all given kde install locations (KDEDIRS based) + execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + file(TO_CMAKE_PATH "${_data_DIR}" _data_DIR) + foreach(dir ${_data_DIR}) + set (apath "${dir}/cmake/modules") + if (EXISTS "${apath}") + set (included 0) + string(TOLOWER "${apath}" _apath) + # ignore already added pathes, case insensitive + foreach(adir ${CMAKE_MODULE_PATH}) string(TOLOWER "${adir}" _adir) if ("${_adir}" STREQUAL "${_apath}") - set (included 1) + set (included 1) endif ("${_adir}" STREQUAL "${_apath}") - endforeach(adir) - if (NOT included) + endforeach(adir) + if (NOT included) message(STATUS "Adding ${apath} to CMAKE_MODULE_PATH") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${apath}") - endif (NOT included) - endif (EXISTS "${apath}") - endforeach(dir) + endif (NOT included) + endif (EXISTS "${apath}") + endforeach(dir) endif (_kdeBootStrapping) @@ -452,6 +452,7 @@ endif (_kdeBootStrapping) option(KDE4_ENABLE_FINAL "Enable final all-in-one compilation") option(KDE4_BUILD_TESTS "Build the tests") +option(KDE4_ENABLE_HTMLHANDBOOK "Create targets htmlhandbook for creating the html versions of the docbook docs") if( KDE4_ENABLE_FINAL) add_definitions(-DKDE_USE_FINAL) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 878194c6..2ddd8d70 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -276,6 +276,15 @@ macro (KDE4_CREATE_HANDBOOK _docbook) ) add_custom_target(handbook ALL DEPENDS ${_doc}) + if(KDE4_ENABLE_HTMLHANDBOOK) + set(_htmlDoc ${CMAKE_CURRENT_SOURCE_DIR}/index.html) + add_custom_command(OUTPUT ${_doc} + COMMAND ${KDE4_MEINPROC_EXECUTABLE} --check ${_bootstrapOption} -o ${_doc} ${_input} + DEPENDS ${_input} ${_KDE4_MEINPROC_EXECUTABLE_DEP} ${_ssheet} + ) + add_custom_target(htmlhandbook DEPENDS ${_doc}) + endif(KDE4_ENABLE_HTMLHANDBOOK) + # kde4_create_handbook(<docbook file> [INSTALL_DESTINATION <dir>] [SUBDIR <subdir>] ) # e.g. kde4_create_handbook(index.docbook) # kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en ) @@ -310,27 +319,6 @@ macro (KDE4_CREATE_HANDBOOK _docbook) endmacro (KDE4_CREATE_HANDBOOK) -macro (KDE4_CREATE_HTML_HANDBOOK _docbook) - get_filename_component(_input ${_docbook} ABSOLUTE) - set(_doc ${CMAKE_CURRENT_SOURCE_DIR}/index.html) - - set(_bootstrapOption) - #Bootstrap - if (_kdeBootStrapping) - set(_ssheet ${CMAKE_SOURCE_DIR}/kdoctools/customization/kde-chunk.xsl) - set(_bootstrapOption "--srcdir=${CMAKE_SOURCE_DIR}/kdoctools/") - else (_kdeBootStrapping) - set(_ssheet ${DATA_INSTALL_DIR}/ksgmltools2/customization/kde-chunk.xsl) - endif (_kdeBootStrapping) - - add_custom_command(OUTPUT ${_doc} - COMMAND ${KDE4_MEINPROC_EXECUTABLE} --check ${_bootstrapOption} -o ${_doc} ${_input} - DEPENDS ${_input} ${_KDE4_MEINPROC_EXECUTABLE_DEP} ${_ssheet} - ) - add_custom_target(htmlhandbook ALL DEPENDS ${_doc}) -endmacro (KDE4_CREATE_HTML_HANDBOOK) - - macro (KDE4_CREATE_MANPAGE _docbook) get_filename_component(_input ${_docbook} ABSOLUTE) set(_doc ${CMAKE_CURRENT_SOURCE_DIR}/index.1) @@ -910,16 +898,8 @@ macro(KDE4_CREATE_EXPORTS_HEADER _outputFile _libName) endmacro(KDE4_CREATE_EXPORTS_HEADER _outputFile _libName) -macro (KDE4_INSTALL_XDG_MIMETYPES) - message(SEND_ERROR "KDE4_INSTALL_XDG_MIMETYPES() is deprecated, see kdelibs/mimetypes/CMakeLists.txt for an example") -endmacro (KDE4_INSTALL_XDG_MIMETYPES) - -macro (KDE4_AUTOMOC) - message(SEND_ERROR "KDE4_AUTOMOC() is not required anymore for automoc, please remove it") -endmacro (KDE4_AUTOMOC) - -MACRO (KDE4_INSTALL_LIBTOOL_FILE) - message(SEND_ERROR "KDE4_INSTALL_LIBTOOL_FILE() is deprecated, please remove it") -ENDMACRO (KDE4_INSTALL_LIBTOOL_FILE) +macro (KDE4_CREATE_HTML_HANDBOOK _docbook) + message(STATUS "KDE4_CREATE_HTML_HANDBOOK() is deprecated. Enable the option KDE4_ENABLE_HTMLHANDBOOK instead, this will give you targets htmlhandbook for creating the html help.") +endmacro (KDE4_CREATE_HTML_HANDBOOK) |