File 0001-Add-cross-compile-support-to-KDE_INSTALL_D... of Package mingw64-kdelibs4

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Add-cross-compile-support-to-KDE_INSTALL_DIR-and-QT_.patch of Package mingw64-kdelibs4 (Revision c447c676abb184c17c05a40ef395581e)

Currently displaying revision c447c676abb184c17c05a40ef395581e , Show latest

From bdfcb326bc4372407871e65a352a0488a973e7f7 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Thu, 23 Jul 2015 22:24:02 +0200
Subject: [PATCH] Add cross compile support to KDE_INSTALL_DIR and
 QT_INSTALL_DIR.

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

diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
index 88a719b..83884c6 100644
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
@@ -563,10 +563,14 @@ else (_kdeBootStrapping)
       # on win32 the install dir is determined on runtime not install time
       # KDELIBS_INSTALL_DIR and QT_INSTALL_DIR are used in KDELibsDependencies.cmake to setup
       # kde install paths and library dependencies
-      get_filename_component(_DIR ${KDE4_KDECONFIG_EXECUTABLE} PATH )
-      get_filename_component(KDE4_INSTALL_DIR ${_DIR} PATH )
-      get_filename_component(_DIR ${QT_QMAKE_EXECUTABLE} PATH )
-      get_filename_component(QT_INSTALL_DIR ${_DIR} PATH )
+      if(NOT KDE4_INSTALL_DIR)
+        get_filename_component(_DIR ${KDE4_KDECONFIG_EXECUTABLE} PATH )
+        get_filename_component(KDE4_INSTALL_DIR ${_DIR} PATH )
+      endif()
+      if(NOT QT_INSTALL_DIR)
+        get_filename_component(_DIR ${QT_QMAKE_EXECUTABLE} PATH )
+        get_filename_component(QT_INSTALL_DIR ${_DIR} PATH )
+      endif()
    endif (WIN32)
 
    # These files contain information about the installed kdelibs, Alex
-- 
1.8.4.5

Places

File 0001-Add-cross-compile-support-to-KDE_INSTALL_DIR-and-QT_.patch of Package mingw64-kdelibs4 (Revision c447c676abb184c17c05a40ef395581e)

Places