From 6d31f8f7fef1adf294950fe73755e53d6eb99837 Mon Sep 17 00:00:00 2001 From: Maximiliano Curia Date: Thu, 25 Jan 2018 11:02:56 -0300 Subject: [PATCH] Allow packagers set kconfig_compiler install dir Origin: Debian Bug-Debian: https://bugs.debian.org/887452 Last-Update: 2018-01-25 Gbp-Pq: Name Allow-packagers-set-kconfig_compiler-install-dir.patch --- CMakeLists.txt | 3 +++ src/kconfig_compiler/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93fc508..3b0e426 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,6 +74,9 @@ endif() include (ECMPoQmTools) ecm_install_po_files_as_qm(poqm) +# allow kconfig_compiler install dir to be set as a configure argument +set(KCONFIG_COMPILER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR_KF}" CACHE STRING + "Set directory for kconfig compiler tool") # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF6Config") diff --git a/src/kconfig_compiler/CMakeLists.txt b/src/kconfig_compiler/CMakeLists.txt index e9cadf7..a07f268 100644 --- a/src/kconfig_compiler/CMakeLists.txt +++ b/src/kconfig_compiler/CMakeLists.txt @@ -25,4 +25,4 @@ target_link_libraries(kconfig_compiler Qt6::Xml) ecm_mark_nongui_executable(kconfig_compiler) -install(TARGETS kconfig_compiler EXPORT KF6ConfigCompilerTargets DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF}) +install(TARGETS kconfig_compiler EXPORT KF6ConfigCompilerTargets DESTINATION ${KCONFIG_COMPILER_INSTALL_DIR}) -- 2.30.2