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

List:       kde-commits
Subject:    KDE/kdepim/korganizer
From:       Volker Krause <vkrause () kde ! org>
Date:       2010-05-04 13:52:43
Message-ID: 20100504135243.2FBDFAC8AB () svn ! kde ! org
[Download RAW message or body]

SVN commit 1122690 by vkrause:

korgac builds without Qt3Support

 M  +2 -3      CMakeLists.txt  
 M  +1 -1      korgac/CMakeLists.txt  
 M  +1 -1      korgac/tests/CMakeLists.txt  


--- trunk/KDE/kdepim/korganizer/CMakeLists.txt #1122689:1122690
@@ -55,10 +55,10 @@
 add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
 
 add_subdirectory( interfaces )
-if (QT_QT3SUPPORT_FOUND)
 add_subdirectory( korgac )
 add_subdirectory( pixmaps )
 add_subdirectory( sounds )
+if (QT_QT3SUPPORT_FOUND)
 add_subdirectory( plugins )
 add_subdirectory( kcmconfigs )
 add_subdirectory( incidenceeditor )
@@ -284,8 +284,8 @@
 set_target_properties(korganizerprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} \
SOVERSION ${GENERIC_LIB_SOVERSION} )  
 install(TARGETS korganizerprivate ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY \
NAMELINK_SKIP) +endif (QT_QT3SUPPORT_FOUND)
 
-
 ########### install files ###############
 
 install( FILES korganizer.knsrc  DESTINATION  ${CONFIG_INSTALL_DIR})
@@ -301,4 +301,3 @@
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/ical2vcal DESTINATION \
${BIN_INSTALL_DIR})  
 install( FILES org.kde.Korganizer.Calendar.xml org.kde.korganizer.Korganizer.xml \
                DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
-endif (QT_QT3SUPPORT_FOUND)
--- trunk/KDE/kdepim/korganizer/korgac/CMakeLists.txt #1122689:1122690
@@ -37,10 +37,10 @@
 	${KDEPIMLIBS_AKONADI_KCAL_LIBS}
 	${KDEPIMLIBS_MAILTRANSPORT_LIBRARY}
 	akonadi-kcal_next
-       	korganizerprivate 
 	korganizer_eventviewer
 	korganizer_core
   kdepim
+  kdepimdbusinterfaces
 	)
 
 install(TARGETS korgac ${INSTALL_TARGETS_DEFAULT_ARGS})
--- trunk/KDE/kdepim/korganizer/korgac/tests/CMakeLists.txt #1122689:1122690
@@ -15,5 +15,5 @@
 
 kde4_add_executable(testalarmdlg TEST ${testalarmdlg_SRCS})
 
-target_link_libraries(testalarmdlg ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} \
${KDEPIMLIBS_KCAL_LIBS} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} \
${KDEPIMLIBS_AKONADI_KCAL_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBRARY} \
korganizer_eventviewer korganizerprivate korganizer_core akonadi-kcal_next) \
+target_link_libraries(testalarmdlg ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} \
${KDEPIMLIBS_KCAL_LIBS} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} \
${KDEPIMLIBS_AKONADI_KCAL_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBRARY} \
korganizer_eventviewer korganizer_core akonadi-kcal_next kdepimdbusinterfaces)  


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