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

List:       kde-commits
Subject:    kdevelop
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2005-04-07 21:47:58
Message-ID: 20050407214758.A7DD3647 () office ! kde ! org
[Download RAW message or body]

CVS commit by neundorf: 


-also build editors/ and vcs/ using cmake

Alex


  M +2 -2      CMakeLists.txt   1.7
  M +3 -5      editors/CMakeLists.txt   1.2
  M +4 -6      editors/editor-chooser/CMakeLists.txt   1.2
  M +4 -6      editors/qeditor/CMakeLists.txt   1.2
  M +0 -4      editors/qeditor/data/CMakeLists.txt   1.2


--- kdevelop/CMakeLists.txt  #1.6:1.7
@@ -14,6 +14,6 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lib/interfaces ${CMAKE_CURRENT_SOURCE_DIR}/lib/util)
 
-SUBDIRS( bdb lib parts languages buildtools)
-# buildtools editors vcs src pics doc mimetypes embedded kdevdesigner )
+SUBDIRS( bdb lib parts languages buildtools editors vcs)
+# src pics doc mimetypes embedded kdevdesigner )
 
 

--- kdevelop/editors/CMakeLists.txt  #1.1:1.2
@@ -1,3 +1,5 @@
-SUBDIRS( editor-chooser $(QEDITOR_SUBDIR) )
+SET(QEDITOR_SUBDIR qeditor)
+
+SUBDIRS( editor-chooser ${QEDITOR_SUBDIR} )
 
 
@@ -11,6 +13,2 @@
 #
 #SUBDIRS = editor-chooser $(QEDITOR_SUBDIR)
-
-#######################
-#previous CMakeLists.txt contents follow:
-

--- kdevelop/editors/editor-chooser/CMakeLists.txt  #1.1:1.2
@@ -1,2 +1,4 @@
+INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/lib/interfaces ${CMAKE_SOURCE_DIR}/lib/util )
+
 SET(kdeveditorchooser_PART_SRCS
 editorchooser_part.cpp
@@ -6,9 +8,9 @@
 KDE_AUTOMOC(${kdeveditorchooser_PART_SRCS})
 
-SET(
+SET( kdeveditorchooser_UI
 editchooser.ui
 )
 
-KDE_ADD_UI_FILES(kdeveditorchooser_PART_SRCS ${kdeveditorchooser_UI}
+KDE_ADD_UI_FILES(kdeveditorchooser_PART_SRCS ${kdeveditorchooser_UI} )
 
 ADD_LIBRARY(kdeveditorchooser SHARED ${kdeveditorchooser_PART_SRCS})
@@ -31,6 +33,2 @@
 #service_DATA = kdeveditorchooser.desktop
 #
-
-#######################
-#previous CMakeLists.txt contents follow:
-

--- kdevelop/editors/qeditor/CMakeLists.txt  #1.1:1.2
@@ -1,4 +1,6 @@
 SUBDIRS( data )
 
+INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/lib/interfaces ${CMAKE_SOURCE_DIR}/lib/compat )
+
 SET(qeditorpart_PART_SRCS
 cindent.cpp
@@ -42,5 +44,5 @@
 KDE_AUTOMOC(${qeditorpart_PART_SRCS})
 
-SET(
+SET( qeditorpart_UI
 generalconfigpage.ui
 gotolinedialog.ui
@@ -49,5 +51,5 @@
 )
 
-KDE_ADD_UI_FILES(qeditorpart_PART_SRCS ${qeditorpart_UI}
+KDE_ADD_UI_FILES(qeditorpart_PART_SRCS ${qeditorpart_UI} )
 
 ADD_LIBRARY(qeditorpart SHARED ${qeditorpart_PART_SRCS})
@@ -88,6 +90,2 @@
 #partrcdir = $(kde_datadir)/qeditorpart
 #partrc_DATA = qeditor_part.rc
-
-#######################
-#previous CMakeLists.txt contents follow:
-

--- kdevelop/editors/qeditor/data/CMakeLists.txt  #1.1:1.2
@@ -5,6 +5,2 @@
 #qeditordata_DATA = highlighting.xml qt.xml
 #qeditordatadir = $(kde_datadir)/qeditorpart/highlight
-
-#######################
-#previous CMakeLists.txt contents follow:
-


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