File 0001-Add-cross-compile-support-for-kconfig_comp... of Package mingw32-kconfig

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Add-cross-compile-support-for-kconfig_compiler-and-k.patch of Package mingw32-kconfig (Revision 0b0eef11f9a8d1206b1336c7addda98c)

Currently displaying revision 0b0eef11f9a8d1206b1336c7addda98c , Show latest

From 9d1dba7933834357d9b2a3c7b31a1523eceaf1cd Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed, 23 Dec 2015 23:16:57 +0100
Subject: [PATCH 1/2] Add cross compile support for kconfig_compiler and
 kconf_update.

---
 KF5ConfigConfig.cmake.in            | 6 ++++++
 src/kconf_update/CMakeLists.txt     | 8 +++++++-
 src/kconfig_compiler/CMakeLists.txt | 2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/KF5ConfigConfig.cmake.in b/KF5ConfigConfig.cmake.in
index f8e5eb0..93c9557 100644
--- a/KF5ConfigConfig.cmake.in
+++ b/KF5ConfigConfig.cmake.in
@@ -16,5 +16,11 @@ if(CMAKE_CROSSCOMPILING AND KF5_HOST_TOOLING)
     include("${KCONFIGCOMPILER_PATH}")
 else()
     include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigCompilerTargets.cmake")
+    if(CMAKE_CROSSCOMPILING AND KCONFIG_COMPILER_EXECUTABLE)
+        set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION_NONE ${KCONFIG_COMPILER_EXECUTABLE})
+    endif()
+    if(CMAKE_CROSSCOMPILING AND KCONF_UPDATE_EXECUTABLE)
+        set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION_NONE ${KCONF_UPDATE_EXECUTABLE})
+    endif()
 endif()
 include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigMacros.cmake")
diff --git a/src/kconf_update/CMakeLists.txt b/src/kconf_update/CMakeLists.txt
index 63a19b4..0479ca7 100644
--- a/src/kconf_update/CMakeLists.txt
+++ b/src/kconf_update/CMakeLists.txt
@@ -8,11 +8,17 @@ set(kconf_update_SRCS
                                 CATEGORY_NAME kf5.kconfig.update)
 
 add_executable(kconf_update ${kconf_update_SRCS})
-add_executable(KF5::kconf_update ALIAS kconf_update)
 target_link_libraries(kconf_update Qt5::Core KF5::ConfigCore)
 include(ECMMarkNonGuiExecutable)
 ecm_mark_nongui_executable(kconf_update)
 
+if(CMAKE_CROSSCOMPILING AND KCONF_UPDATE_EXECUTABLE)
+    add_executable(KF5::kconf_update IMPORTED GLOBAL)
+    set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION ${KCONF_UPDATE_EXECUTABLE})
+else()
+    add_executable(KF5::kconf_update ALIAS kconf_update)
+endif()
+
 file(
   GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kconf-exec.h
   CONTENT "#define KCONF_UPDATE_EXECUTABLE \"$<TARGET_FILE:kconf_update>\""
diff --git a/src/kconfig_compiler/CMakeLists.txt b/src/kconfig_compiler/CMakeLists.txt
index dc0a08d..c47e6d0 100644
--- a/src/kconfig_compiler/CMakeLists.txt
+++ b/src/kconfig_compiler/CMakeLists.txt
@@ -12,6 +12,8 @@ if(CMAKE_TOOLCHAIN_FILE)
     if(BUILD_TESTING)
         message(WARNING "Testing should be disabled on cross-compilation")
     endif()
+    add_executable(KF5::kconfig_compiler IMPORTED GLOBAL)
+    set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION ${KCONFIG_COMPILER_EXECUTABLE})
 else()
     add_executable(KF5::kconfig_compiler ALIAS kconfig_compiler)
 endif()
-- 
1.8.4.5

Places

File 0001-Add-cross-compile-support-for-kconfig_compiler-and-k.patch of Package mingw32-kconfig (Revision 0b0eef11f9a8d1206b1336c7addda98c)

Places