diff options
| author | Dario Freddi <drf@kde.org> | 2010-03-01 19:20:31 +0000 |
|---|---|---|
| committer | Dario Freddi <drf@kde.org> | 2010-03-01 19:20:31 +0000 |
| commit | 4b989a26ea40d46100fb7883dcec1778eb8d4533 (patch) | |
| tree | 6b79ca6535baff87dcebbebcfa9df4704c3e6b5b /modules/KDE4Macros.cmake | |
| parent | 84ccffd809dc71de314f21cb747d590d246be3ed (diff) | |
| download | extra-cmake-modules-4b989a26ea40d46100fb7883dcec1778eb8d4533.tar.gz extra-cmake-modules-4b989a26ea40d46100fb7883dcec1778eb8d4533.tar.bz2 | |
This commit is a massive backport of: r1091455, r1091811, r1091516, r1091017, r1089968, r1089130 and maybe some others which I forgot.
Basically it makes KAuth's plugins dynamic, except for fake ones. Bottom line: less libraries linked to kdecore and no crashes upon installation problems.
Tested on a clean build of the branch, works great.
svn path=/branches/KDE/4.4/kdelibs/; revision=1097623
Diffstat (limited to 'modules/KDE4Macros.cmake')
| -rw-r--r-- | modules/KDE4Macros.cmake | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index f58b658e..61757c89 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -106,12 +106,6 @@ macro (KDE4_ADD_KCFG_FILES _sources ) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_rel_PATH}) endif(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/${_rel_PATH}") - if (CMAKE_CROSSCOMPILING) - set(IMPORT_KCONFIG_COMPILER_EXECUTABLE "${KDE_HOST_TOOLS_PATH}/ImportKConfigCompilerExecutable.cmake" CACHE FILEPATH "Point it to the export file of kconfig_compiler from a native build") - include(${IMPORT_KCONFIG_COMPILER_EXECUTABLE}) - set(KDE4_KCFGC_EXECUTABLE kconfig_compiler) - endif (CMAKE_CROSSCOMPILING) - # the command for creating the source file from the kcfg file add_custom_command(OUTPUT ${_header_FILE} ${_src_FILE} COMMAND ${KDE4_KCFGC_EXECUTABLE} @@ -289,13 +283,6 @@ macro (KDE4_CREATE_HANDBOOK _docbook) endif (_kdeBootStrapping) file(GLOB _docs *.docbook) - - if (CMAKE_CROSSCOMPILING) - set(IMPORT_MEINPROC4_EXECUTABLE "${KDE_HOST_TOOLS_PATH}/ImportMeinProc4Executable.cmake" CACHE FILEPATH "Point it to the export file of meinproc4 from a native build") - include(${IMPORT_MEINPROC4_EXECUTABLE}) - set(KDE4_MEINPROC_EXECUTABLE meinproc4) - endif (CMAKE_CROSSCOMPILING) - add_custom_command(OUTPUT ${_doc} COMMAND ${KDE4_MEINPROC_EXECUTABLE} --check ${_bootstrapOption} --cache ${_doc} ${_input} DEPENDS ${_docs} ${_KDE4_MEINPROC_EXECUTABLE_DEP} ${_ssheet} @@ -367,12 +354,6 @@ macro (KDE4_CREATE_MANPAGE _docbook _section) set(_bootstrapOption) endif (_kdeBootStrapping) - if (CMAKE_CROSSCOMPILING) - set(IMPORT_MEINPROC4_EXECUTABLE "${KDE_HOST_TOOLS_PATH}/ImportMeinProc4Executable.cmake" CACHE FILEPATH "Point it to the export file of meinproc4 from a native build") - include(${IMPORT_MEINPROC4_EXECUTABLE}) - set(KDE4_MEINPROC_EXECUTABLE meinproc4) - endif (CMAKE_CROSSCOMPILING) - add_custom_command(OUTPUT ${_outdoc} COMMAND ${KDE4_MEINPROC_EXECUTABLE} --stylesheet ${_ssheet} --check ${_bootstrapOption} ${_input} DEPENDS ${_input} ${_KDE4_MEINPROC_EXECUTABLE_DEP} ${_ssheet} |