diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2010-05-25 20:11:41 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2010-05-25 20:11:41 +0000 |
| commit | 9c04b56b227844fdf61609289140aac39b82ab5e (patch) | |
| tree | 3e7398d495003dbe7018d3dd8da8c7a4f9364b18 | |
| parent | 95be475812349e24080db442bc908bacf6e8f5df (diff) | |
| download | extra-cmake-modules-9c04b56b227844fdf61609289140aac39b82ab5e.tar.gz extra-cmake-modules-9c04b56b227844fdf61609289140aac39b82ab5e.tar.bz2 | |
-disable the crosscompiling code again, it is not in shape to be released with 4.5.
I exchanged emails on this with Harald, but unfortunately he didn't find the time to finish
this for 4.5. Guess we'll get it in good shape for 4.6 then (or maybe a 4.5.x)
Harald: could you please update the KDE_on_Maemo/MADDE page on techbase accordingly ?
Alex
CCMAIL: harry@kdevelop.org
svn path=/trunk/KDE/kdelibs/; revision=1130617
| -rw-r--r-- | modules/KDE4Macros.cmake | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index a2cba7c2..bf130ab8 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -106,11 +106,11 @@ 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) +# 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} @@ -290,11 +290,11 @@ macro (KDE4_CREATE_HANDBOOK _docbook) 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) +# 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} @@ -367,11 +367,11 @@ 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) +# 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} |