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

List:       kde-commits
Subject:    KDE/kdewebdev/klinkstatus/src
From:       Paulo Moura Guedes <moura () kdewebdev ! org>
Date:       2007-10-31 17:44:34
Message-ID: 1193852674.465706.31779.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 731436 by mojo:

Make libtidy dependency optional in KLinkStatus

 M  +13 -7     CMakeLists.txt  
 M  +2 -0      engine/linkstatus.h  
 M  +2 -0      engine/linkstatushelper.cpp  
 M  +2 -0      ui/treeview.cpp  


--- trunk/KDE/kdewebdev/klinkstatus/src/CMakeLists.txt #731435:731436
@@ -22,10 +22,6 @@
     ${CMAKE_SOURCE_DIR}/klinkstatus/src/engine/interfaces/isearchmanager.cpp 
 )
 
-set(libtidy_SRCS
-    ${CMAKE_SOURCE_DIR}/klinkstatus/src/tidy/markupvalidator.cpp
-)
-    
 set(libui_SRCS 
 	${CMAKE_SOURCE_DIR}/klinkstatus/src/ui/documentrootdialog.cpp 
 	${CMAKE_SOURCE_DIR}/klinkstatus/src/ui/klshistorycombo.cpp
@@ -49,12 +45,14 @@
     ${CMAKE_BINARY_DIR}/klinkstatus/src 
     ${LIBXML2_INCLUDE_DIR}
     ${LIBXSLT_INCLUDE_DIR}
-    ${LIBTIDY_INCLUDE_DIR}
     ${KDE4_INCLUDE_DIR}
     ${KDE4_INCLUDE_DIR}/threadweaver
     ${QT_INCLUDES}
 )
 
+if(LIBTIDY_FOUND)
+    include_directories(${LIBTIDY_INCLUDE_DIR})
+endif(LIBTIDY_FOUND)
 
 ########### next target ###############
 
@@ -62,7 +60,6 @@
     ${libutils_SRCS} 
     ${libparser_SRCS} 
     ${libengine_SRCS}
-    ${libtidy_SRCS}
     ${libuisettings_SRCS}
     ${libui_SRCS} 
     global.cpp 
@@ -71,6 +68,11 @@
     klsfactory.cpp
 )
 
+if(LIBTIDY_FOUND)
+	set(libtidy_SRCS ${CMAKE_SOURCE_DIR}/klinkstatus/src/tidy/markupvalidator.cpp)
+    set(klinkstatuspart_PART_SRCS klinkstatuspart_PART_SRCS ${libtidy_SRCS})
+endif(LIBTIDY_FOUND)
+
 kde4_add_ui_files(klinkstatuspart_PART_SRCS
    ${CMAKE_SOURCE_DIR}/klinkstatus/src/ui/sessionwidgetbase.ui
    ${CMAKE_SOURCE_DIR}/klinkstatus/src/ui/unreferreddocumentswidget.ui
@@ -92,7 +94,6 @@
 target_link_libraries(klinkstatuspart
     ${LIBXML2_LIBRARIES}
     ${LIBXSLT_LIBRARIES}
-    ${LIBTIDY_LIBRARIES}
     ${KDE4_KDECORE_LIBS} 
     ${KDE4_KPARTS_LIBS} 
     ${KDE4_KIO_LIBS}
@@ -100,6 +101,11 @@
     ${KDE4_THREADWEAVER_LIBRARY}
 )
 
+if(LIBTIDY_FOUND)
+    target_link_libraries(klinkstatuspart ${LIBTIDY_LIBRARIES})
+endif(LIBTIDY_FOUND)
+
+
 install(TARGETS klinkstatuspart  DESTINATION ${PLUGIN_INSTALL_DIR})
 
 install(FILES engine/interfaces/org.kdewebdev.klinkstatus.ISearchManager.xml \
                DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
--- trunk/KDE/kdewebdev/klinkstatus/src/engine/linkstatus.h #731435:731436
@@ -30,7 +30,9 @@
 class QDomElement;
 
 #include "parser/http.h"
+#ifdef HAVE_LIBTIDY
 #include "tidy/markupvalidator.h"
+#endif
 class Node;
 class TreeView;
 class TreeViewItem;
--- trunk/KDE/kdewebdev/klinkstatus/src/engine/linkstatushelper.cpp #731435:731436
@@ -203,10 +203,12 @@
 
 void LinkStatusHelper::validateMarkup(LinkStatus* linkstatus)
 {
+#ifdef HAVE_LIBTIDY
     Tidy::MarkupValidator markup_validator(linkstatus->absoluteUrl(), \
linkstatus->docHtml());  markup_validator.validate();
     
     (linkstatus->tidy_info_).has_errors = markup_validator.hasErrors();
     (linkstatus->tidy_info_).has_warnings = markup_validator.hasWarnings();
 //     tidy_messages_ = markup_validator.messages();
+#endif
 }
--- trunk/KDE/kdewebdev/klinkstatus/src/ui/treeview.cpp #731435:731436
@@ -38,7 +38,9 @@
 
 #include "engine/linkstatus.h"
 #include "engine/linkfilter.h"
+#ifdef HAVE_LIBTIDY
 #include "tidy/markupvalidator.h"
+#endif
 #include "global.h"
 #include "klsconfig.h"
 


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