diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-08-15 03:55:48 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-08-15 03:55:48 +0000 |
| commit | 00b3f6e99df7075d56e07edc8a90c4794744f2ec (patch) | |
| tree | 5d3e1ca6097870b3e5c35ac444d58ea344cdf0fa /modules/FindKDE4Internal.cmake | |
| parent | c47e6423b497b2f51b0fda36fbae524b3efa61fb (diff) | |
| download | extra-cmake-modules-00b3f6e99df7075d56e07edc8a90c4794744f2ec.tar.gz extra-cmake-modules-00b3f6e99df7075d56e07edc8a90c4794744f2ec.tar.bz2 | |
-fix indentation
-remove old macros which failed with SEND_ERROR since several weeks already
-deprecated KDE4_CREATE_HTML_HANDBOOK() and added option KDE4_ENABLE_HTMLHANDBOOK instead, if enabled, you get targets "htmlhandbook", which can be used to create the html docs
Alex
CCMAIL:winter@kde.org
Tip of the day: using "make edit_cache" you can easily change cmake settings
svn path=/trunk/KDE/kdelibs/; revision=700205
Diffstat (limited to 'modules/FindKDE4Internal.cmake')
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 33 |
1 files changed, 17 insertions, 16 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) |