File 0001-Fix-detection-of-helper-tools-on-cross-com... of Package mingw32-kdelibs4

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-detection-of-helper-tools-on-cross-compiling-kde.patch of Package mingw32-kdelibs4 (Revision 6c766fe4e875787ea1d1645db900fecf)

Currently displaying revision 6c766fe4e875787ea1d1645db900fecf , Show latest

From d8d30774afe23e888da580dbabaf1e6b98c0b5a1 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Thu, 23 Jul 2015 12:22:10 +0200
Subject: [PATCH] Fix detection of helper tools on cross compiling kde
 applications.

---
 cmake/modules/FindKDE4Internal.cmake | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
index ecf2522..79e322d 100644
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
@@ -608,14 +608,22 @@ else (_kdeBootStrapping)
    list(GET _importedConfigurations 0 _firstConfig)
 
    if(NOT WINCE)
-   get_target_property(KDE4_KCFGC_EXECUTABLE             ${KDE4_TARGET_PREFIX}kconfig_compiler    LOCATION_${_firstConfig})
-   get_target_property(KDE4_MEINPROC_EXECUTABLE          ${KDE4_TARGET_PREFIX}meinproc4           LOCATION_${_firstConfig})
+   if(NOT KDE4_KCFGC_EXECUTABLE)
+     get_target_property(KDE4_KCFGC_EXECUTABLE             ${KDE4_TARGET_PREFIX}kconfig_compiler    LOCATION_${_firstConfig})
+   endif()
+   if(NOT KDE4_MEINPROC_EXECUTABLE)
+     get_target_property(KDE4_MEINPROC_EXECUTABLE          ${KDE4_TARGET_PREFIX}meinproc4           LOCATION_${_firstConfig})
+   endif()
    else(NOT WINCE)
     set(KDE4_KCFGC_EXECUTABLE             ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
     set(KDE4_MEINPROC_EXECUTABLE          ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/meinproc4 )
    endif(NOT WINCE)
-   get_target_property(KDE4_KAUTH_POLICY_GEN_EXECUTABLE  ${KDE4_TARGET_PREFIX}kauth-policy-gen    LOCATION_${_firstConfig})
-   get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE    ${KDE4_TARGET_PREFIX}makekdewidgets      LOCATION_${_firstConfig})
+   if(NOT KDE4_KAUTH_POLICY_GEN_EXECUTABLE)
+     get_target_property(KDE4_KAUTH_POLICY_GEN_EXECUTABLE  ${KDE4_TARGET_PREFIX}kauth-policy-gen    LOCATION_${_firstConfig})
+   endif()
+   if(NOT KDE4_MAKEKDEWIDGETS_EXECUTABLE)
+     get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE    ${KDE4_TARGET_PREFIX}makekdewidgets      LOCATION_${_firstConfig})
+   endif()
 
    # 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)
-- 
1.8.4.5

Places

File 0001-Fix-detection-of-helper-tools-on-cross-compiling-kde.patch of Package mingw32-kdelibs4 (Revision 6c766fe4e875787ea1d1645db900fecf)

Places