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

List:       kde-commits
Subject:    [kdepim/akregator_port] /: Allow krss to build without kdepim.
From:       Christophe Giboudeaux <cgiboudeaux () gmail ! com>
Date:       2011-07-27 12:12:13
Message-ID: 20110727121213.1041EA612A () git ! kde ! org
[Download RAW message or body]

Git commit 88969c06a46e6e02a767842bdc82e05a4444c15f by Christophe Giboudeaux.
Committed on 25/12/2010 at 17:26.
Pushed by cgiboudeaux into branch 'akregator_port'.

Allow krss to build without kdepim.

M  +2    -0    krss/rssitem.h
M  +1    -1    examples/feeditemmodel_example/CMakeLists.txt
M  +1    -0    krss/item.h
M  +1    -1    krss/tests/CMakeLists.txt
M  +1    -1    krss/CMakeLists.txt
M  +17   -1    CMakeLists.txt

http://commits.kde.org/kdepim/88969c06a46e6e02a767842bdc82e05a4444c15f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f91c74..544c07f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,28 @@
 project(krss)
 
+#kdelibs
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+#kdepimlibs
+find_package(KdepimLibs 4.5.85 REQUIRED)
+include_directories(${KDEPIMLIBS_INCLUDE_DIRS})
+
+#akonadi
+find_package(Akonadi REQUIRED)
+include_directories(${AKONADI_INCLUDE_DIR})
+
+# Boost
+find_package(Boost REQUIRED)
+
+
 if (KRSS_ENABLE_PROTOBUF_SERIALIZER)
     find_package(ProtocolBuffers REQUIRED)
     add_definitions( -DKRSS_ENABLE_PROTOBUF_SERIALIZER)
     include_directories( ${PROTOBUF_INCLUDE_DIR} )
 endif (KRSS_ENABLE_PROTOBUF_SERIALIZER)
 
-include_directories( ${Boost_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} \
${CMAKE_CURRENT_BINARY_DIR} ) +include_directories( ${Boost_INCLUDE_DIR} \
${QT_INCLUDES} ${krss_SOURCE_DIR} ${krss_BINARY_DIR} )  
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS} \
-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" )  add_subdirectory(krss)
diff --git a/examples/feeditemmodel_example/CMakeLists.txt \
b/examples/feeditemmodel_example/CMakeLists.txt index 9ce6b16..57ea749 100644
--- a/examples/feeditemmodel_example/CMakeLists.txt
+++ b/examples/feeditemmodel_example/CMakeLists.txt
@@ -4,7 +4,7 @@ set(feeditemmodel_example_SRCS
     main.cpp
 )
 
-include_directories( ${CMAKE_SOURCE_DIR}/krss )
+include_directories( ${krss_SOURCE_DIR} )
 
 kde4_add_executable(example_feeditemmodel ${feeditemmodel_example_SRCS} )
 
diff --git a/krss/CMakeLists.txt b/krss/CMakeLists.txt
index 1d37b11..fe66d50 100644
--- a/krss/CMakeLists.txt
+++ b/krss/CMakeLists.txt
@@ -163,7 +163,7 @@ set(krss_PRIVATE_LIB_HDRS
 )
 
 # WARNING: we depend on the dbus interface description from krss/krssresource
-qt4_add_dbus_interface(krss_LIB_SRCS \
${CMAKE_SOURCE_DIR}/krss/krssresource/org.kde.krss.xml krssinterface) \
+qt4_add_dbus_interface(krss_LIB_SRCS \
${krss_SOURCE_DIR}/krssresource/org.kde.krss.xml krssinterface)  \
kde4_add_ui_files(krss_LIB_SRCS ui/netfeedcreatedialog.ui ui/feedpropertiesdialog.ui \
ui/tagpropertieswidget.ui)  
 kde4_add_library(krss SHARED ${krss_LIB_SRCS})
diff --git a/krss/item.h b/krss/item.h
index d970a76..5bd82b7 100644
--- a/krss/item.h
+++ b/krss/item.h
@@ -274,4 +274,5 @@ private:
 Q_DECLARE_OPERATORS_FOR_FLAGS( KRss::Item::Status )
 Q_DECLARE_METATYPE( KRss::Item::Status )
 
+
 #endif // KRSS_ITEM_H
diff --git a/krss/rssitem.h b/krss/rssitem.h
index 543b1be..6427ac1 100644
--- a/krss/rssitem.h
+++ b/krss/rssitem.h
@@ -122,4 +122,6 @@ private:
 
 } // namespace KRss
 
+Q_DECLARE_METATYPE( KRss::RssItem )
+
 #endif // KRSS_RSSITEM_H
diff --git a/krss/tests/CMakeLists.txt b/krss/tests/CMakeLists.txt
index 64a6800..23235e2 100644
--- a/krss/tests/CMakeLists.txt
+++ b/krss/tests/CMakeLists.txt
@@ -38,7 +38,7 @@ add_simple_test(testitem testitem.cpp)
 add_simple_test(testcategory testcategory.cpp)
 add_simple_test(testperson testperson.cpp)
 add_simple_test(testenclosure testenclosure.cpp)
-add_simple_test(testhelper testhelper.cpp ${CMAKE_SOURCE_DIR}/krss/krss/helper.cpp)
+add_simple_test(testhelper testhelper.cpp ${krss_SOURCE_DIR}/krss/helper.cpp)
 add_akonadi_isolated_test(tagprovidertest tagprovidertest.cpp)
 
 kde4_add_executable(itemimporter itemimporter.cpp)


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