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

List:       kde-commits
Subject:    extragear/base/konq-plugins
From:       Helio Chissini de Castro <helio () kde ! org>
Date:       2009-01-22 13:41:02
Message-ID: 1232631662.852680.7266.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 915120 by helio:

- Make independent module build
- Fix libkonq detection
- Disable fsview


 M  +19 -3     CMakeLists.txt  
 M  +1 -1      akregator/CMakeLists.txt  
 M  +2 -2      validators/tidy_validator.cpp  


--- trunk/extragear/base/konq-plugins/CMakeLists.txt #915119:915120
@@ -1,3 +1,18 @@
+project(konq-plugins)
+
+# search packages used by KDE
+find_package(KDE4 REQUIRED)
+find_package(LibKonq REQUIRED)
+include (KDE4Defaults)
+include (MacroLibrary)
+
+add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT_STRICT_ITERATORS)
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+
+if( NOT LIBKONQ_FOUND )
+    MESSAGE(FATAL_ERROR "Install kdebase before to try to compile konq-plugins")
+endif( NOT LIBKONQ_FOUND )
+
 add_subdirectory( crashes ) 
 add_subdirectory( khtmlsettingsplugin ) 
 add_subdirectory( kimgalleryplugin ) 
@@ -9,9 +24,9 @@
 macro_ensure_version( "4.1.60" ${KDE_VERSION} KDE4_INSTALLED_VERSION_OK )
 
 if(KDE4_INSTALLED_VERSION_OK)
-   add_subdirectory( webarchiver )
+    add_subdirectory( webarchiver )
 else(KDE4_INSTALLED_VERSION_OK)
-   MESSAGE(STATUS "webarchiver requires kde trunk")
+    MESSAGE(STATUS "webarchiver requires kde trunk")
 endif(KDE4_INSTALLED_VERSION_OK)
 
 #add_subdirectory( sidebar ) 
@@ -19,7 +34,7 @@
 add_subdirectory( minitools ) 
 add_subdirectory( microformat ) 
 add_subdirectory( autorefresh ) 
-add_subdirectory( fsview ) 
+#add_subdirectory( fsview ) 
 add_subdirectory( searchbar ) 
 MESSAGE(STATUS "remember to readd sidebar")
 add_subdirectory( rellinks ) 
@@ -31,3 +46,4 @@
 
 add_subdirectory( akregator ) 
 
+
--- trunk/extragear/base/konq-plugins/akregator/CMakeLists.txt #915119:915120
@@ -22,7 +22,7 @@
 
 kde4_add_plugin(akregatorkonqfeedicon ${akregatorkonqfeedicon_PART_SRCS})
 
-target_link_libraries(akregatorkonqfeedicon konq ${KDE4_KHTML_LIBS} )
+target_link_libraries(akregatorkonqfeedicon ${LIBKONQ_LIBRARY} ${KDE4_KHTML_LIBS} )
 
 install(TARGETS akregatorkonqfeedicon DESTINATION ${PLUGIN_INSTALL_DIR} )
 
--- trunk/extragear/base/konq-plugins/validators/tidy_validator.cpp #915119:915120
@@ -25,8 +25,8 @@
 
 #include <kdebug.h>
 
-#include <tidy/buffio.h>
-#include <tidy/tidy.h>
+#include <buffio.h>
+#include <tidy.h>
 
 #include <config-konq-validator.h>
 
[prev in list] [next in list] [prev in thread] [next in thread]