aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2007-05-14 08:43:44 +0000
committerDavid Faure <faure@kde.org>2007-05-14 08:43:44 +0000
commit92ed9479edba821033043ce0d49fabcf02e3d25f (patch)
treefc6200a45e4d85f90696c03049953e843e6e23f7
parent0a13d7a037214f43a2a4227c7ccd19dafdffc546 (diff)
downloadextra-cmake-modules-92ed9479edba821033043ce0d49fabcf02e3d25f.tar.gz
extra-cmake-modules-92ed9479edba821033043ce0d49fabcf02e3d25f.tar.bz2
Move kconfig_compiler to libexec
Mention bug in FindKDE4Internal when people try configuring a module with a prefix != kde prefix CCMAIL: kde-buildsystem@kde.org svn path=/trunk/KDE/kdelibs/; revision=664536
-rw-r--r--modules/FindKDE4Internal.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake
index a0bdf18e..0672e5ae 100644
--- a/modules/FindKDE4Internal.cmake
+++ b/modules/FindKDE4Internal.cmake
@@ -483,10 +483,11 @@ else (_kdeBootStrapping)
get_filename_component(KDE4_LIB_DIR ${KDE4_KDECORE_LIBRARY} PATH )
# kpassworddialog.h is new with KDE4
+ # ###### TODO: this is the wrong path to look into. We need the KDE4 include dir, not the one where the current module will be installed
find_path(KDE4_INCLUDE_DIR kpassworddialog.h ${INCLUDE_INSTALL_DIR} NO_DEFAULT_PATH )
- find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
- find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler )
+ find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${LIBEXEC_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler ) # Why do it again?
find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 )