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

List:       kde-commits
Subject:    kdesupport/strigi/src/strigicmd
From:       Flavio Castelli <flavio.castelli () gmail ! com>
Date:       2008-03-31 21:02:36
Message-ID: 1206997356.029988.3801.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 792347 by micron:

Added log4cxx support to strigicmd


 M  +9 -1      CMakeLists.txt  
 M  +4 -0      strigicmd.cpp  


--- trunk/kdesupport/strigi/src/strigicmd/CMakeLists.txt #792346:792347
@@ -7,8 +7,16 @@
     ${LIBXML2_INCLUDE_DIR}
 )
 
+set(strigicmd_LIBS streamanalyzer combinedindex strigi_xesam)
+
+IF (ENABLE_LOG4CXX AND LOG4CXX_FOUND)
+    add_definitions(-DHAVE_LOG4CXX)
+    set(strigicmd_LIBS ${strigicmd_LIBS} ${LOG4CXX_LIBRARIES})
+    include_directories( ${LOG4CXX_INCLUDE_DIR} )
+ENDIF (ENABLE_LOG4CXX AND LOG4CXX_FOUND)
+
 add_executable(strigicmd strigicmd.cpp)
 
-target_link_libraries(strigicmd streamanalyzer combinedindex strigi_xesam)
+target_link_libraries(strigicmd ${strigicmd_LIBS})
 
 install(TARGETS strigicmd RUNTIME DESTINATION bin)
--- trunk/kdesupport/strigi/src/strigicmd/strigicmd.cpp #792346:792347
@@ -29,6 +29,7 @@
 #include "query.h"
 #include "queryparser.h"
 #include "xesam2strigi.h"
+#include "../daemon/strigilogging.h"
 #include <algorithm>
 #include <string>
 #include <set>
@@ -662,6 +663,9 @@
     if (argc < 2) { 
         return usage(argc, argv);
     }
+
+    STRIGI_LOG_INIT_BASIC()
+    
     const char* cmd = argv[1];
     if (!strcmp(cmd,"create")) {
         return create(argc, argv);
[prev in list] [next in list] [prev in thread] [next in thread]