KDE/kdelibs

[David Faure]

SVN commit 664536 by dfaure:

Move kconfig_compiler to libexec
Mention bug in FindKDE4Internal when people try configuring a module with a prefix != kde prefix
CCMAIL: kde-buildsystem at kde.org


 M  +3 -2      cmake/modules/FindKDE4Internal.cmake  
 M  +1 -1      kdecore/kconfig_compiler/CMakeLists.txt  


--- trunk/KDE/kdelibs/cmake/modules/FindKDE4Internal.cmake #664535:664536
@@ -483,10 +483,11 @@
    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 )
--- trunk/KDE/kdelibs/kdecore/kconfig_compiler/CMakeLists.txt #664535:664536
@@ -13,7 +13,7 @@
 
 target_link_libraries(kconfig_compiler  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
 
-install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS kconfig_compiler DESTINATION ${LIBEXEC_INSTALL_DIR} )
 
 
 ########### install files ###############