[Kde-bindings] KDE/kdebindings

[Arno Rehn]

SVN commit 680114 by arnorehn:

* Made a seperate assembly out of the QScintilla namespace.

CCMAIL: kde-bindings at kde.org



 M  +1 -1      cmake/modules/FindSmokeQt.cmake  
 M  +15 -9     csharp/qyoto/CMakeLists.txt  
 M  +4 -0      csharp/qyoto/ChangeLog  
 A             csharp/qyoto/src/AssemblyInfoQScintilla2.cs  


--- trunk/KDE/kdebindings/cmake/modules/FindSmokeQt.cmake #680113:680114
@@ -2,7 +2,7 @@
 #
 # defines
 #
-# SMOKE_FOUND - system has mono, mcs, gmcs and gacutil
+# SMOKE_FOUND - smoke was found on the system
 # SMOKE_INCLUDE_DIR - where to find the smoke headers
 # SMOKE_LIBRARY - where to find the smoke library
 
--- trunk/KDE/kdebindings/csharp/qyoto/CMakeLists.txt #680113:680114
@@ -1,5 +1,9 @@
 PROJECT (qyoto)
 
+# find Qt4
+IF (NOT QT4_FOUND)
+	FIND_PACKAGE (Qt4 REQUIRED)
+ENDIF (NOT QT4_FOUND)
 FIND_PACKAGE (QScintilla)
 INCLUDE (CSharpMacros)
 
@@ -21,18 +25,12 @@
 	opengl/*.cs
 	uitools/*.cs
 	qdbus/*.cs)
-IF (QSCINTILLA_FOUND)
-	MESSAGE (STATUS "Found QScintilla2, compiling Qyoto with QScintilla2 support")
-	SET(SRC_CS ${SRC_CS} qsci/*.cs)
-ENDIF (QSCINTILLA_FOUND)
+	
+SET(SRC_SCINTILLA src/AssemblyInfoQScintilla2.cs
+	qsci/*.cs)
 
 SET(KEYFILE ${CMAKE_CURRENT_SOURCE_DIR}/key.snk)
 
-# find Qt4
-IF (NOT QT4_FOUND)
-	FIND_PACKAGE (Qt4 REQUIRED)
-ENDIF (NOT QT4_FOUND)
-
 SET( UICS_EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/tools/uics/uics )
 SET( CSRCC_EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/tools/csrcc/csrcc )
 
@@ -46,6 +44,14 @@
 
 ADD_DEPENDENCIES (qt-dotnet qyoto)
 
+IF (QSCINTILLA_FOUND)
+	MESSAGE (STATUS "Found QScintilla2, compiling Qyoto with QScintilla2 support (SMOKE has to be built with support for it, too)")
+	SET(CS_FLAGS -debug -define:DEBUG -warn:0 -keyfile:${KEYFILE} -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll)
+	ADD_CS_LIBRARY(qscintilla "${SRC_SCINTILLA}" ALL)
+	ADD_DEPENDENCIES (qscintilla qt-dotnet)
+	INSTALL_GAC(qscintilla)
+ENDIF (QSCINTILLA_FOUND)
+
 INSTALL(TARGETS qyoto LIBRARY DESTINATION lib)
 INSTALL_GAC(qt-dotnet)
 
--- trunk/KDE/kdebindings/csharp/qyoto/ChangeLog #680113:680114
@@ -1,3 +1,7 @@
+2007-06-25  Arno Rehn  <arno at arnorehn.de>
+
+	* Made a seperate assembly out of the QScintilla namespace.
+
 2007-06-19  Richard Dale  <rdale at foton.es>
 
 	* Moved the QScintilla classes to a QScintilla namespace instead of