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

List:       kde-commits
Subject:    KDE/kdevelop
From:       Matt Rogers <mattr () kde ! org>
Date:       2006-09-02 16:33:38
Message-ID: 1157214818.153447.24021.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 580092 by mattr:

Depend on external threadweaver. It it only looked for in the KDE
includes directory and the KDE libs directory, since we expect it to
become a part of kdelibs soon




 M  +1 -0      CMakeLists.txt  
 A             cmake/modules/FindThreadWeaver.cmake  
 M  +1 -1      languages/cpp/CMakeLists.txt  
 M  +1 -1      languages/csharp/CMakeLists.txt  
 M  +1 -1      languages/java/CMakeLists.txt  
 M  +1 -2      lib/CMakeLists.txt  
 M  +6 -5      lib/kdevbackgroundparser.cpp  
 D             lib/weaver (directory)  


--- trunk/KDE/kdevelop/CMakeLists.txt #580091:580092
@@ -7,6 +7,7 @@
 include (MacroLibrary)
 
 find_package(BerkeleyDB REQUIRED)
+find_package(ThreadWeaver REQUIRED)
 
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DHAVE_CONFIG_H=1)
 link_directories (${KDE4_LIB_DIR})
--- trunk/KDE/kdevelop/languages/cpp/CMakeLists.txt #580091:580092
@@ -3,7 +3,7 @@
 add_subdirectory(duchain)
 #add_subdirectory(app_templates)
 
-include_directories( ${CMAKE_TOP_BUILD_DIR}/ ${CMAKE_SOURCE_DIR}/lib \
${CMAKE_SOURCE_DIR}/lib/weaver ${CMAKE_SOURCE_DIR}/lib/editor \
${CMAKE_SOURCE_DIR}/languages/cpp/duchain ${CMAKE_SOURCE_DIR}/languages/cpp/parser \
+include_directories( ${CMAKE_TOP_BUILD_DIR}/ ${CMAKE_SOURCE_DIR}/lib \
${THREADWEAVER_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/lib/editor \
${CMAKE_SOURCE_DIR}/languages/cpp/duchain ${CMAKE_SOURCE_DIR}/languages/cpp/parser  )
 
 
--- trunk/KDE/kdevelop/languages/csharp/CMakeLists.txt #580091:580092
@@ -1,7 +1,7 @@
 
 add_subdirectory(parser)
 
-include_directories( ${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/lib/weaver
+include_directories( ${CMAKE_SOURCE_DIR}/lib ${THREADWEAVER_INCLUDE_DIR}
     )
 
 
--- trunk/KDE/kdevelop/languages/java/CMakeLists.txt #580091:580092
@@ -1,7 +1,7 @@
 
 add_subdirectory(parser)
 
-include_directories( ${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/lib/weaver
+include_directories( ${CMAKE_SOURCE_DIR}/lib ${THREADWEAVER_INCLUDE_DIR}
     )
 
 
--- trunk/KDE/kdevelop/lib/CMakeLists.txt #580091:580092
@@ -1,12 +1,11 @@
 
-add_subdirectory(weaver)
 add_subdirectory(util)
 add_subdirectory(widgets)
 add_subdirectory(debugger)
 add_subdirectory(projectmanager)
 add_subdirectory(settings)
 
-include_directories( ${CMAKE_SOURCE_DIR}/lib/util ${CMAKE_SOURCE_DIR}/lib/widgets \
${CMAKE_SOURCE_DIR}/lib/weaver ${CMAKE_SOURCE_DIR}/lib/editor \
${CMAKE_SOURCE_DIR}/lib/backgroundparser ${CMAKE_SOURCE_DIR}/lib/interfaces ) \
+include_directories( ${CMAKE_SOURCE_DIR}/lib/util ${CMAKE_SOURCE_DIR}/lib/widgets \
${THREADWEAVER_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/lib/editor \
${CMAKE_SOURCE_DIR}/lib/backgroundparser ${CMAKE_SOURCE_DIR}/lib/interfaces )  
 ########### next target ###############
 
--- trunk/KDE/kdevelop/lib/kdevbackgroundparser.cpp #580091:580092
@@ -51,10 +51,11 @@
 #include <ktexteditor/smartinterface.h>
 #include <ktexteditor/document.h>
 
-#include <weaver/State.h>
-#include <weaver/ThreadWeaver.h>
-#include <weaver/JobCollection.h>
-#include <weaver/DebuggingAids.h>
+//ThreadWeaver includes
+#include <State.h>
+#include <ThreadWeaver.h>
+#include <JobCollection.h>
+#include <DebuggingAids.h>
 
 #include "kdevparserdependencypolicy.h"
 
@@ -63,7 +64,7 @@
         m_delay( 500 ),
         m_modelsToCache( 0 ),
         m_progressBar( new QProgressBar ),
-        m_weaver( new Weaver( this, 2 ) ),
+        m_weaver( new Weaver( this ) ),
         m_dependencyPolicy( new KDevParserDependencyPolicy ),
         m_mutex(new QMutex()),
         m_waitForJobCreation(new QWaitCondition)


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