[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/devtools/kdevelop4-extra-plugins/automake
From:       Robert Gruber <rgruber () users ! sourceforge ! net>
Date:       2009-05-21 21:34:49
Message-ID: 1242941689.975666.4535.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 971185 by rgruber:

Added possibility to define the build directory in the 
project configuration


 M  +18 -4     CMakeLists.txt  
 A             automakeconfig.kcfg  
 A             automakeconfig.kcfgc  
 M  +2 -3      automakeimporter.cpp  
 A             kcm_kdevautomake_settings.desktop  
 A             settings (directory)  
 A             settings/automakebuildsettings.ui  
 A             settings/automakepreferences.cpp   [License: GPL (v2+)]
 A             settings/automakepreferences.h   [License: GPL (v2+)]


--- trunk/playground/devtools/kdevelop4-extra-plugins/automake/CMakeLists.txt \
#971184:971185 @@ -35,14 +35,28 @@
 )
 
 
+set( automakesettings_SRCS
+  settings/automakepreferences.cpp
+)
+
+set( automakesettings_UI
+  settings/automakebuildsettings.ui
+)
+
+
 kde4_add_plugin(kdevautomakeimporter ${kdevautomakeimporter_PART_SRCS})
 target_link_libraries(kdevautomakeimporter ${KDE4_KDECORE_LIBS} kdevautomakeparser \
${KDEVPLATFORM_LANGUAGE_LIBRARY} ${KDEVPLATFORM_INTERFACES_LIBRARY} \
${KDEVPLATFORM_PROJECT_LIBRARY} )  
-install(TARGETS kdevautomakeimporter DESTINATION ${PLUGIN_INSTALL_DIR} )
+kde4_add_kcfg_files( automakesettings_SRCS automakeconfig.kcfgc )
+kde4_add_ui_files( automakesettings_SRCS ${automakesettings_UI} )
+kde4_add_plugin( kcm_kdevautomake_settings ${automakesettings_SRCS} )
+target_link_libraries( kcm_kdevautomake_settings ${KDE4_KIO_LIBS}
+                       ${KDEVPLATFORM_INTERFACES_LIBRARY} \
${KDEVPLATFORM_PROJECT_LIBRARY} ${KDE4_KIO_LIBRARY} )  
 
-########### install files ###############
+install(TARGETS kdevautomakeimporter DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kcm_kdevautomake_settings DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(FILES kcm_kdevautomake_settings.desktop DESTINATION ${SERVICES_INSTALL_DIR} \
) +install(FILES kdevautomakeimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
-install( FILES kdevautomakeimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
-
--- trunk/playground/devtools/kdevelop4-extra-plugins/automake/automakeimporter.cpp \
#971184:971185 @@ -75,9 +75,8 @@
         }
     }
 
-    /// @todo somehow let the user define the build directory
-    ///       for now buildDir=projectDir
-    KUrl buildDir = m_projectRoot[item->project()];
+    KConfigGroup automakeGrp = \
item->project()->projectConfiguration()->group("Automake"); +    KUrl buildDir = \
automakeGrp.readEntry( "CurrentBuildDir", KUrl() );  
     if (buildDir.isValid()) {
         // If a separat buildDir is defined we need to locate the directory that


[prev in list] [next in list] [prev in thread] [next in thread]