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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/meanwhile
From:       Jeremy Kerr <jk () ozlabs ! org>
Date:       2008-11-18 4:35:43
Message-ID: 1226982943.178667.30369.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 885904 by jkerr:

protocols/meanwhile: Update meanwhile build infrastructure

Now what we check for libmeanwhile in the generic cmake modules,
we don't need to re-check in CMakeLists.txt.

Update the includes to suit LIBMEANWHILE_INCLUDE_DIR



 M  +10 -23    CMakeLists.txt  
 M  +1 -1      meanwhileprotocol.cpp  
 M  +11 -11    meanwhilesession.cpp  
 M  +5 -5      meanwhilesession.h  


--- trunk/KDE/kdenetwork/kopete/protocols/meanwhile/CMakeLists.txt #885903:885904
@@ -1,16 +1,12 @@
-INCLUDE(UsePkgConfig)
 
-add_subdirectory( icons ) 
+add_subdirectory( icons )
 
+add_definitions(${LIBMEANWHILE_DEFINITIONS})
+include_directories(${LIBMEANWHILE_INCLUDE_DIR})
+
 ########### next target ###############
 
-kde4_add_ui_files(kopete_meanwhile_ui_SRCS
-   ui/meanwhileaddcontact.ui
-   ui/meanwhileeditaccount.ui
-)
-
 set(kopete_meanwhile_PART_SRCS
-   ${kopete_meanwhile_ui_SRCS}
    meanwhileaccount.cpp
    meanwhileaddcontactpage.cpp
    meanwhileplugin.cpp
@@ -19,31 +15,22 @@
    meanwhileeditaccountwidget.cpp
    meanwhilesession.cpp )
 
-### TODO - make these real configure checks
-find_package(GLIB2)
-PKGCONFIG(meanwhile _meanwhileIncDir _meanwhileLinkDir _meanwhileLinkFlags _meanwhileCflags)
-
-FIND_LIBRARY(MEANWHILE_LIBRARY NAMES meanwhile
-  PATHS
-  ${_meanwhileLinkDir}
-  NO_DEFAULT_PATH
+kde4_add_ui_files(kopete_meanwhile_PART_SRCS
+   ui/meanwhileaddcontact.ui
+   ui/meanwhileeditaccount.ui
 )
 
-### meanwhile.pc sets the wrong "includedir" variable - need to add meanwhile manually
-#include_directories (${_meanwhileIncDir} ${GLIB2_INCLUDE_DIR})
-include_directories (${_meanwhileIncDir}/meanwhile ${GLIB2_INCLUDE_DIR})
-
 kde4_add_plugin(kopete_meanwhile ${kopete_meanwhile_PART_SRCS})
 
 target_link_libraries(kopete_meanwhile
-  ${KDE4_KDECORE_LIBS} ${GLIB2_LIBRARIES} ${MEANWHILE_LIBRARY}
+  ${KDE4_KDECORE_LIBS} ${GLIB2_LIBRARIES} ${LIBMEANWHILE_LIBRARY}
   kopete)
 
-install(TARGETS kopete_meanwhile  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kopete_meanwhile DESTINATION ${PLUGIN_INSTALL_DIR})
 
 ########### install files ###############
 
-install( FILES kopete_meanwhile.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
+install(FILES kopete_meanwhile.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 
 
 
--- trunk/KDE/kdenetwork/kopete/protocols/meanwhile/meanwhileprotocol.cpp #885903:885904
@@ -23,7 +23,7 @@
 #include "kopeteglobal.h"
 #include "kopeteonlinestatusmanager.h"
 
-#include "mw_common.h"
+#include <meanwhile/mw_common.h>
 
 K_PLUGIN_FACTORY( MeanwhileProtocolFactory, registerPlugin<MeanwhileProtocol>(); )
 K_EXPORT_PLUGIN( MeanwhileProtocolFactory( "kopete_meanwhile" ) )
--- trunk/KDE/kdenetwork/kopete/protocols/meanwhile/meanwhilesession.cpp #885903:885904
@@ -29,17 +29,17 @@
 #include "meanwhilesession.h"
 #include "meanwhileprotocol.h"
 
-#include <mw_channel.h>
-#include <mw_message.h>
-#include <mw_error.h>
-#include <mw_service.h>
-#include <mw_session.h>
-#include <mw_srvc_aware.h>
-#include <mw_srvc_conf.h>
-#include <mw_srvc_im.h>
-#include <mw_srvc_store.h>
-#include <mw_cipher.h>
-#include <mw_st_list.h>
+#include <meanwhile/mw_channel.h>
+#include <meanwhile/mw_message.h>
+#include <meanwhile/mw_error.h>
+#include <meanwhile/mw_service.h>
+#include <meanwhile/mw_session.h>
+#include <meanwhile/mw_srvc_aware.h>
+#include <meanwhile/mw_srvc_conf.h>
+#include <meanwhile/mw_srvc_im.h>
+#include <meanwhile/mw_srvc_store.h>
+#include <meanwhile/mw_cipher.h>
+#include <meanwhile/mw_st_list.h>
 //Added by qt3to4:
 #include <Q3ValueList>
 
--- trunk/KDE/kdenetwork/kopete/protocols/meanwhile/meanwhilesession.h #885903:885904
@@ -18,11 +18,11 @@
 #include "meanwhileaccount.h"
 #include "meanwhilecontact.h"
 
-#include <mw_session.h>
-#include <mw_service.h>
-#include <mw_srvc_aware.h>
-#include <mw_srvc_im.h>
-#include <mw_srvc_resolve.h>
+#include <meanwhile/mw_session.h>
+#include <meanwhile/mw_service.h>
+#include <meanwhile/mw_srvc_aware.h>
+#include <meanwhile/mw_srvc_im.h>
+#include <meanwhile/mw_srvc_resolve.h>
 //Added by qt3to4:
 #include <Q3ValueList>
 
[prev in list] [next in list] [prev in thread] [next in thread]