diff options
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) | 
