summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-21 00:01:25 +0000
committersamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-21 00:01:25 +0000
commit0358575487235c36da305e7c72f2e567340e041c (patch)
tree63389873a68655adb29385a5cc25a29624fb85bb
parentc0183f5dc9ab729936e3e6a392feafb260fae817 (diff)
downloadtdevelop-0358575487235c36da305e7c72f2e567340e041c.tar.gz
tdevelop-0358575487235c36da305e7c72f2e567340e041c.zip
[kdevelop] sync with new cmake macros
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1228608 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--ConfigureChecks.cmake1
-rw-r--r--kdevdesigner/designer/CMakeLists.txt2
-rw-r--r--lib/interfaces/extensions/CMakeLists.txt4
-rw-r--r--vcs/CMakeLists.txt2
-rw-r--r--vcs/cvsservice/CMakeLists.txt2
5 files changed, 5 insertions, 6 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 29125f87..76e3bef1 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -52,6 +52,5 @@ endif( )
# required stuff
-find_package( Qt )
find_package( TQt )
find_package( TDE )
diff --git a/kdevdesigner/designer/CMakeLists.txt b/kdevdesigner/designer/CMakeLists.txt
index dfd7f914..c88e9c32 100644
--- a/kdevdesigner/designer/CMakeLists.txt
+++ b/kdevdesigner/designer/CMakeLists.txt
@@ -96,7 +96,7 @@ tde_moc( SRCS
)
-tde_add_kpart( libkdevdesignerpart AUTOMOC
+tde_add_kpart( libkdevdesignerpart
SOURCES ${SRCS}
LINK
kdevqui-static shared-static kinterfacedesigner-static
diff --git a/lib/interfaces/extensions/CMakeLists.txt b/lib/interfaces/extensions/CMakeLists.txt
index d7c9cbf1..238e6a2e 100644
--- a/lib/interfaces/extensions/CMakeLists.txt
+++ b/lib/interfaces/extensions/CMakeLists.txt
@@ -39,12 +39,12 @@ install( FILES
add_custom_command( OUTPUT codebrowserfrontend.moc.cpp
COMMAND
- ${TQT_TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/codebrowserfrontend.h -o codebrowserfrontend.moc.cpp
+ ${TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/codebrowserfrontend.h -o codebrowserfrontend.moc.cpp
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/codebrowserfrontend.h )
add_custom_command( OUTPUT kdevversioncontrol.moc.cpp
COMMAND
- ${TQT_TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/kdevversioncontrol.h -o kdevversioncontrol.moc.cpp
+ ${TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/kdevversioncontrol.h -o kdevversioncontrol.moc.cpp
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/kdevversioncontrol.h )
tde_add_library( kdevextensions STATIC_PIC AUTOMOC
diff --git a/vcs/CMakeLists.txt b/vcs/CMakeLists.txt
index 8ec61b98..c2112360 100644
--- a/vcs/CMakeLists.txt
+++ b/vcs/CMakeLists.txt
@@ -10,6 +10,6 @@
#################################################
tde_conditional_add_subdirectory( WITH_VCS_CLEARCASE clearcase )
-tde_conditional_add_subdirectory( WITH_VCS_CVSSERVICE cvsservice )
+#tde_conditional_add_subdirectory( WITH_VCS_CVSSERVICE cvsservice )
tde_conditional_add_subdirectory( WITH_VCS_PERFORCE perforce )
tde_conditional_add_subdirectory( WITH_VCS_SUBVERSION subversion )
diff --git a/vcs/cvsservice/CMakeLists.txt b/vcs/cvsservice/CMakeLists.txt
index a924f251..c6e0a0b8 100644
--- a/vcs/cvsservice/CMakeLists.txt
+++ b/vcs/cvsservice/CMakeLists.txt
@@ -9,7 +9,7 @@
#
#################################################
-tde_message_fatal( "csvservice is not done yet" )
+# tde_message_fatal( "csvservice is not done yet" )
add_subdirectory( integrator )