[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim
From: Andreas Holzammer <andy () kdab ! com>
Date: 2010-12-02 15:48:57
Message-ID: 20101202154857.E9969AC8A6 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1202876 by aholzammer:
build the strigidaemon together with the plugins static for wince
A cmake/modules/FindCLucene.cmake
A cmake/modules/FindIconv.cmake
A cmake/modules/FindLibDBus.cmake
M +7 -0 strigi-analyzer/CMakeLists.txt
M +10 -2 strigi-analyzer/ctg/CMakeLists.txt
M +4 -0 strigi-analyzer/ctg/ctgendanalyzer.h
M +7 -2 strigi-analyzer/ics/CMakeLists.txt
M +4 -0 strigi-analyzer/ics/icsendanalyzer.h
M +9 -2 strigi-analyzer/mail/CMakeLists.txt
M +7 -2 strigi-analyzer/mail/mailendanalyzer.cpp
M +6 -1 strigi-analyzer/mail/mailendanalyzer.h
M +2 -0 strigi-analyzer/mail/messageanalyzer.cpp
M +4 -0 strigi-analyzer/mail/messageanalyzer.h
A strigi-analyzer/strigidaemon_static (directory)
A strigi-analyzer/strigidaemon_static/CMakeLists.txt
A strigi-analyzer/strigidaemon_static/dummy.cpp [License: UNKNOWN]
M +10 -2 strigi-analyzer/vcf/CMakeLists.txt
M +4 -0 strigi-analyzer/vcf/vcfendanalyzer.h
--- trunk/KDE/kdepim/strigi-analyzer/CMakeLists.txt #1202875:1202876
@@ -1,3 +1,7 @@
+if(WINCE)
+add_definitions(-DSTRIGI_STATIC)
+endif(WINCE)
+
macro_bool_to_01(STRIGI_NEEDS_SIGNED_CHAR STRIGI_NEEDS_SIGNED_CHAR_01)
configure_file(config-strigi.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-strigi.h )
@@ -8,3 +12,6 @@
add_subdirectory( vcf )
add_subdirectory( ics )
add_subdirectory( mail )
+if(WINCE)
+add_subdirectory( strigidaemon_static )
+endif(WINCE)
--- trunk/KDE/kdepim/strigi-analyzer/ctg/CMakeLists.txt #1202875:1202876
@@ -3,8 +3,16 @@
include_directories(${CMAKE_SOURCE_DIR}/strigi-analyzer ${STRIGI_INCLUDE_DIR})
add_definitions(-DMAKE_PIMSTRIGIANALYZER_LIB)
+if(WINCE)
+kde4_add_library(ctg STATIC ${ctgendanalyzer_SRCS})
+else(WINCE)
kde4_add_library(ctg MODULE ${ctgendanalyzer_SRCS})
+endif(WINCE)
-target_link_libraries(ctg ${KDE4_KFILE_LIBS} ${QT_QTCORE_LIBRARY} \
${STRIGI_STREAMS_LIBRARY} ${STRIGI_STREAMANALYZER_LIBRARY} ${KDEPIMLIBS_KABC_LIBS}) \
+target_link_libraries(ctg ${QT_QTCORE_LIBRARY} ${STRIGI_STREAMS_LIBRARY} \
${STRIGI_STREAMANALYZER_LIBRARY} ${KDEPIMLIBS_KABC_LIBS}) +if(NOT WINCE)
+target_link_libraries(ctg ${KDE4_KFILE_LIBS})
+endif(NOT WINCE)
set_target_properties(ctg PROPERTIES PREFIX strigiea_)
-install(TARGETS ctg LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi)
+install(TARGETS ctg LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}/strigi)
--- trunk/KDE/kdepim/strigi-analyzer/ctg/ctgendanalyzer.h #1202875:1202876
@@ -68,6 +68,10 @@
std::list<Strigi::StreamEndAnalyzerFactory*> streamEndAnalyzerFactories() const;
};
+#ifndef _WIN32_WCE
STRIGI_ANALYZER_FACTORY( CtgFactoryFactory )
+#else
+EXPORT_PLUGIN(Strigi_Plugin_Ctg,CtgFactoryFactory)
+#endif
#endif
--- trunk/KDE/kdepim/strigi-analyzer/ics/CMakeLists.txt #1202875:1202876
@@ -4,9 +4,14 @@
# kde4_add_library just defines MAKE_ICS_LIB which is not really unique
add_definitions(-DMAKE_PIMSTRIGIANALYZER_LIB)
+if(WINCE)
+kde4_add_library(ics STATIC ${icsendanalyzer_SRCS})
+else(WINCE)
kde4_add_library(ics MODULE ${icsendanalyzer_SRCS})
+endif(WINCE)
target_link_libraries(ics ${STRIGI_STREAMANALYZER_LIBRARY} ${STRIGI_STREAMS_LIBRARY} \
${KDEPIMLIBS_KCALCORE_LIBS} ${KDE4_KIO_LIBS} ) +
set_target_properties(ics PROPERTIES PREFIX strigiea_)
-install(TARGETS ics LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi)
-
+install(TARGETS ics LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}/strigi)
--- trunk/KDE/kdepim/strigi-analyzer/ics/icsendanalyzer.h #1202875:1202876
@@ -86,6 +86,10 @@
KComponentData componentData;
};
+#ifndef _WIN32_WCE
STRIGI_ANALYZER_FACTORY( IcsFactoryFactory )
+#else
+EXPORT_PLUGIN(Strigi_Plugin_Ics,IcsFactoryFactory)
+#endif
#endif
--- trunk/KDE/kdepim/strigi-analyzer/mail/CMakeLists.txt #1202875:1202876
@@ -15,17 +15,24 @@
include_directories(${CMAKE_SOURCE_DIR}/strigi-analyzer ${STRIGI_INCLUDE_DIR})
add_definitions(-DMAKE_PIMSTRIGIANALYZER_LIB)
+if(WINCE)
+kde4_add_library(mail STATIC ${mailendanalyzer_SRCS})
+else(WINCE)
kde4_add_library(mail MODULE ${mailendanalyzer_SRCS})
+endif(WINCE)
target_link_libraries(mail
messagecore
messageviewer
- ${KDE4_KFILE_LIBS}
${QT_QTCORE_LIBRARY}
${STRIGI_STREAMS_LIBRARY}
${STRIGI_STREAMANALYZER_LIBRARY}
${KDEPIMLIBS_KMIME_LIBS}
)
+if (NOT WINCE)
+target_link_libraries(mail ${KDE4_KFILE_LIBS} )
+endif(NOT WINCE)
set_target_properties(mail PROPERTIES PREFIX strigiea_)
-install(TARGETS mail LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi)
+install(TARGETS mail LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}/strigi)
endif ()
--- trunk/KDE/kdepim/strigi-analyzer/mail/mailendanalyzer.cpp #1202875:1202876
@@ -35,6 +35,8 @@
#include <QtCore/QEventLoop>
+using namespace StrigiEndAnalyzer;
+
static int s_fakeArgumentCount = 1;
static char* s_fakeArgumentVector[2] = { "mailendanalyzer", NULL };
@@ -178,5 +180,8 @@
return list;
}
-STRIGI_ANALYZER_FACTORY( MailFactoryFactory )
-
+#ifndef _WIN32_WCE
+STRIGI_ANALYZER_FACTORY( StrigiEndAnalyzer::MailFactoryFactory )
+#else
+EXPORT_PLUGIN(Strigi_Plugin_Mail,StrigiEndAnalyzer::MailFactoryFactory)
+#endif
--- trunk/KDE/kdepim/strigi-analyzer/mail/mailendanalyzer.h #1202875:1202876
@@ -35,9 +35,12 @@
#include <QtCore/QString>
-class MailEndAnalyzerFactory;
class QCoreApplication;
+namespace StrigiEndAnalyzer {
+
+class MailEndAnalyzerFactory;
+
class PIMSTRIGI_ANALYZER_EXPORT MailEndAnalyzer : public Strigi::StreamEndAnalyzer
{
public:
@@ -109,4 +112,6 @@
KComponentData componentData;
};
+}
+
#endif
--- trunk/KDE/kdepim/strigi-analyzer/mail/messageanalyzer.cpp #1202875:1202876
@@ -36,6 +36,8 @@
#include <boost/scoped_ptr.hpp>
+using namespace StrigiEndAnalyzer;
+
MessageAnalyzer::MessageAnalyzer( const KMime::Message::Ptr &message, \
MailEndAnalyzer* analyzer ) : m_analyzer( analyzer ),
m_message( message ),
--- trunk/KDE/kdepim/strigi-analyzer/mail/messageanalyzer.h #1202875:1202876
@@ -36,6 +36,8 @@
class ObjectTreeParser;
}
+namespace StrigiEndAnalyzer {
+
class MessageAnalyzer : public QObject, public MessageViewer::EmptySource
{
Q_OBJECT
@@ -69,4 +71,6 @@
MessageViewer::ObjectTreeParser *m_otp;
};
+}
+
#endif
--- trunk/KDE/kdepim/strigi-analyzer/vcf/CMakeLists.txt #1202875:1202876
@@ -4,8 +4,16 @@
# kde4_add_library just defines MAKE_VCF_LIB which is not really unique
add_definitions(-DMAKE_PIMSTRIGIANALYZER_LIB)
+if(WINCE)
+kde4_add_library(vcf STATIC ${vcfendanalyzer_SRCS})
+else(WINCE)
kde4_add_library(vcf MODULE ${vcfendanalyzer_SRCS})
+endif(WINCE)
-target_link_libraries(vcf ${KDE4_KFILE_LIBS} ${QT_QTCORE_LIBRARY} \
${STRIGI_STREAMS_LIBRARY} ${STRIGI_STREAMANALYZER_LIBRARY} ${KDEPIMLIBS_KABC_LIBS}) \
+target_link_libraries(vcf ${QT_QTCORE_LIBRARY} ${STRIGI_STREAMS_LIBRARY} \
${STRIGI_STREAMANALYZER_LIBRARY} ${KDEPIMLIBS_KABC_LIBS}) +if(NOT WINCE)
+target_link_libraries(vcf ${KDE4_KFILE_LIBS})
+endif(NOT WINCE)
set_target_properties(vcf PROPERTIES PREFIX strigiea_)
-install(TARGETS vcf LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi)
+install(TARGETS vcf LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}/strigi)
--- trunk/KDE/kdepim/strigi-analyzer/vcf/vcfendanalyzer.h #1202875:1202876
@@ -90,6 +90,10 @@
std::list<Strigi::StreamEndAnalyzerFactory*> streamEndAnalyzerFactories() const;
};
+#ifndef _WIN32_WCE
STRIGI_ANALYZER_FACTORY( VcfFactoryFactory )
+#else
+EXPORT_PLUGIN(Strigi_Plugin_Vcf,VcfFactoryFactory)
+#endif
#endif
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic