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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete
From:       Michaël Larouche <michael.larouche () kdemail ! net>
Date:       2006-03-31 19:43:51
Message-ID: 1143834231.026445.15414.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 525095 by mlarouche:

Trying to build bare Kopete executable with CMake

Fail because libkopete (kopete in CMake context) is the same name as the executable \
that we trying to link (I try renaming (lib)kopete to (lib)kopetelib and it's worked)



 M  +1 -0      CMakeLists.txt  
 M  +48 -9     kopete/CMakeLists.txt  
 M  +1 -2      kopete/contactlist/CMakeLists.txt  
 M  +1 -3      kopete/contactlist/kopetecontactlistview.cpp  
 M  +0 -1      kopete/kopeteapplication.cpp  
 M  +0 -1      kopete/kopetewindow.cpp  


--- trunk/KDE/kdenetwork/kopete/CMakeLists.txt #525094:525095
@@ -10,6 +10,7 @@
 
 include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} \
${CMAKE_CURRENT_BINARY_DIR}  )  
+project(kopete)
 
 ########### install files ###############
 
--- trunk/KDE/kdenetwork/kopete/kopete/CMakeLists.txt #525094:525095
@@ -1,18 +1,53 @@
 kde4_header()
 
-add_subdirectory( addaccountwizard ) 
-add_subdirectory( addcontactwizard ) 
-add_subdirectory( config ) 
-add_subdirectory( contactlist ) 
-add_subdirectory( chatwindow ) 
-add_subdirectory( kconf_update ) 
+#add_subdirectory( addaccountwizard ) 
+#add_subdirectory( addcontactwizard ) 
+#add_subdirectory( config ) RENABLE
+#add_subdirectory( contactlist ) 
+#add_subdirectory( chatwindow ) RENABLE
+#add_subdirectory( kconf_update ) 
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} \
${CMAKE_CURRENT_BINARY_DIR}  ) +include_directories( ${KDE4_INCLUDE_DIR} \
${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  \
+${CMAKE_SOURCE_DIR}/kopete/libkopete/  +${CMAKE_BINARY_DIR}/kopete/libkopete/ 
+${CMAKE_SOURCE_DIR}/kopete/libkopete/ui/ 
+${CMAKE_BINARY_DIR}/kopete/libkopete/ui/ 
+${CMAKE_SOURCE_DIR}/kopete/libkopete/private 
+${CMAKE_CURRENT_SOURCE_DIR}/addaccountwizard 
+${CMAKE_CURRENT_SOURCE_DIR}/contactlist/ 
+${CMAKE_CURRENT_BINARY_DIR}/contactlist/ 
+${CMAKE_CURRENT_SOURCE_DIR}/config/plugins/ 
+)
 
+link_directories( ${CMAKE_BINARY_DIR}/kopete/libkopete/ )
 
 ########### next target ###############
 
+# Add account Wizard
+set( addaccountwizard_SRCS addaccountwizard/addaccountwizard.cpp )
+kde4_add_ui3_files(addaccountwizard_SRCS addaccountwizard/addaccountwizardpage1.ui \
addaccountwizard/addaccountwizardpage2.ui addaccountwizard/addaccountwizardpage3.ui) \
+ +# Contact List
+set(kopetecontactlist_SRCS 
+contactlist/kopetemetacontactlvi.cpp 
+contactlist/kopetestatusgroupviewitem.cpp 
+contactlist/kopetegroupviewitem.cpp 
+contactlist/kopetecontactlistview.cpp 
+contactlist/kopetelviprops.cpp 
+contactlist/kopeteaddrbookexport.cpp 
+contactlist/customnotificationprops.cpp 
+contactlist/kopetegrouplistaction.cpp 
+contactlist/kabcexport.cpp 
+)
+kde4_add_ui3_files(kopetecontactlist_SRCS contactlist/kopetegvipropswidget.ui \
contactlist/kopetemetalvipropswidget.ui contactlist/kopeteaddrbookexportui.ui \
contactlist/kabcexport_base.ui) +
+# Configure plugins
+set(kopetepluginconfig_SRCS \
${CMAKE_CURRENT_SOURCE_DIR}/config/plugins/kopetepluginconfig.cpp) +
 set(kopete_SRCS 
+   ${addaccountwizard_SRCS}
+   ${kopetecontactlist_SRCS}
+   ${kopetepluginconfig_SRCS}
    main.cpp 
    kopeteapplication.cpp 
    kopeteiface.cpp 
@@ -25,14 +60,18 @@
 
 kde4_automoc(${kopete_SRCS})
 
-kde4_add_ui_files(kopete_SRCS groupkabcselectorwidget.ui )
+kde4_add_ui3_files(kopete_SRCS groupkabcselectorwidget.ui )
 
 kde4_add_dcop_skels(kopete_SRCS kopeteiface.h kimiface.h )
 
 kde4_add_executable(kopete ${kopete_SRCS})
 
-target_link_libraries(kopete  ${KDE4_KDECORE_LIBS} ktexteditor knotifyconfig \
kopeteaddcontactwizard kopeteaddaccountwizard kopetecontactlist kopetepluginconfig \
kopete kopeteui ) +target_link_libraries(kopete ${KDE4_KDE3SUPPORT_LIBS} ktexteditor \
knotifyconfig kopete )  
+if(X11_Xrender_FOUND)
+  target_link_libraries(kopete ${X11_Xrender_LIB})
+endif(X11_Xrender_FOUND)
+
 install_targets(/bin kopete )
 
 
--- trunk/KDE/kdenetwork/kopete/kopete/contactlist/CMakeLists.txt #525094:525095
@@ -1,6 +1,6 @@
 kde4_header()
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} \
${CMAKE_CURRENT_BINARY_DIR}  ) +include_directories( ${KDE4_INCLUDE_DIR} \
${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )  
 
 ########### next target ###############
@@ -12,7 +12,6 @@
 kde4_footer()
 
 
-
 #original Makefile.am contents follow:
 
 #METASOURCES = AUTO
--- trunk/KDE/kdenetwork/kopete/kopete/contactlist/kopetecontactlistview.cpp \
#525094:525095 @@ -56,9 +56,7 @@
 #include <kdeversion.h>
 #include <kinputdialog.h>
 
-#include "addcontactwizard.h"
 #include "addcontactpage.h"
-#include "chatmessagepart.h"
 #include "kopeteaccount.h"
 #include "kopeteaccountmanager.h"
 #include "kopetecontactlist.h"
@@ -793,7 +791,7 @@
 
 void KopeteContactListView::slotShowAddContactDialog()
 {
-	( new AddContactWizard( Kopete::UI::Global::mainWidget() ) )->show();
+// 	( new AddContactWizard( Kopete::UI::Global::mainWidget() ) )->show();
 }
 
 void KopeteContactListView::slotSettingsChanged( void )
--- trunk/KDE/kdenetwork/kopete/kopete/kopeteapplication.cpp #525094:525095
@@ -45,7 +45,6 @@
 #include "kopeteuiglobal.h"
 #include "kopetewindow.h"
 #include "kopeteviewmanager.h"
-#include "videodevice.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- trunk/KDE/kdenetwork/kopete/kopete/kopetewindow.cpp #525094:525095
@@ -62,7 +62,6 @@
 #include <kdialog.h>
 
 #include "addcontactpage.h"
-#include "addcontactwizard.h"
 #include "addressbooklinkwidget.h"
 #include "groupkabcselectorwidget.h"
 #include "kabcexport.h"


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