Remove tmoc

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

4 files changed, 2 insertions, 66 deletions

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index a3bba25..2bb25d9 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -72,48 +72,15 @@ endif( )
 qt_message( "  QT_BINARY_DIR : ${QT_BINARY_DIR}" )
 
 
-# find moc
-if( DEFINED MOC_EXECUTABLE )
-  if( IS_DIRECTORY "${MOC_EXECUTABLE}" OR NOT EXISTS "${MOC_EXECUTABLE}" )
-    tde_message_fatal( "moc was NOT found.\n MOC_EXECUTABLE may not be set correctly." )
-  endif( )
-else( )
-  find_program( MOC_EXECUTABLE NAMES tqmoc moc-qt3 moc HINTS "${QT_BINARY_DIR}" )
-  if( NOT MOC_EXECUTABLE )
-    tde_message_fatal( "moc was NOT found.\n Please check if your Qt${QT_VERSION} is correctly installed." )
-  endif( )
-endif( )
-
-# attempt to run moc, to check which qt version is using
-execute_process( COMMAND ${MOC_EXECUTABLE} -v ERROR_VARIABLE __output
-  RESULT_VARIABLE __result ERROR_STRIP_TRAILING_WHITESPACE )
-
-if( __result EQUAL 1 )
-  string( REGEX MATCH "^.*Qt (.+)\\)$" __dummy  "${__output}" )
-  set( __version  "${CMAKE_MATCH_1}" )
-  if( NOT __version )
-    tde_message_fatal( "Invalid response from moc:\n ${__output}" )
-  endif( )
-else( )
-  tde_message_fatal( "Unable to run moc!\n Qt${VERSION} are correctly installed?\n LD_LIBRARY_PATH are correctly set?" )
-endif( )
-
-qt_message( "  MOC_EXECUTABLE: ${MOC_EXECUTABLE} (using Qt ${CMAKE_MATCH_1})" )
-
-if( QT_VERSION STREQUAL "3" AND NOT "${CMAKE_MATCH_1}" VERSION_LESS "4" )
-  tde_message_fatal( "Strange, you want TQt3, but your moc using Qt>=4." )
-endif( )
-
-
 # find uic (only for Qt3)
 if( DEFINED UIC_EXECUTABLE )
 	if( IS_DIRECTORY "${UIC_EXECUTABLE}" OR NOT EXISTS "${UIC_EXECUTABLE}" )
-		tde_message_fatal( "uic was NOT found.\n MOC_EXECUTABLE may not be set correctly" )
+		tde_message_fatal( "uic was NOT found.\n Please make sure TQt is correctly installed (1)." )
 	endif( )
 else( )
 	find_program( UIC_EXECUTABLE NAMES tquic uic-qt3 uic HINTS "${QT_BINARY_DIR}" )
 	if( NOT UIC_EXECUTABLE )
-		tde_message_fatal( "uic was NOT found.\n Please check if your Qt${QT_VERSION} is correctly installed." )
+		tde_message_fatal( "uic was NOT found.\n Please make sure TQt is correctly installed (2)." )
 	endif( )
 endif( )
 qt_message( "  UIC_EXECUTABLE: ${UIC_EXECUTABLE}" )
diff --git a/qtinterface/CMakeLists.txt b/qtinterface/CMakeLists.txt
index ba75186..d029e71 100644
--- a/qtinterface/CMakeLists.txt
+++ b/qtinterface/CMakeLists.txt
@@ -35,15 +35,6 @@ install( FILES
     ${IFACE}/tqmodules.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
-##### tqt tools #################################
-
-configure_file( ${IFACE}/tmoc.cmake tmoc @ONLY )
-
-install( PROGRAMS
-    ${CMAKE_CURRENT_BINARY_DIR}/tmoc
-  DESTINATION ${BIN_INSTALL_DIR} )
-
-
 ##### tqt pkgconfig #############################
 
 string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_EXEC_PREFIX ${EXEC_INSTALL_PREFIX} )
@@ -64,7 +55,6 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/tqtqui.pc DESTINATION ${PKGCONFIG_INS
 
 ##### tqt (shared) ##############################
 
-
 tde_add_library( tqt SHARED
   SOURCES ${IFACE}/tqapplication.cpp
   VERSION 4.2.0
diff --git a/qtinterface/interface_tqt3/tmoc.cmake b/qtinterface/interface_tqt3/tmoc.cmake
deleted file mode 100755
index 55f23fa..0000000
--- a/qtinterface/interface_tqt3/tmoc.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-#
-# Very simple moc wrapper, for using with cmake
-#
-
-if [ -z "$1" ]; then
-	echo "Usage: tmoc <input_file> -o <out_file>"
-else
-	input_file="$1"
-	out_file="$3"
-	cat "${input_file}" | \
-	@MOC_EXECUTABLE@ | \
-	sed "/#include <tqmetaobject.h>/ i\\
-#undef TQT_NO_COMPAT\\
-#include \"${input_file}\"\\
-" \
-	> "${out_file}"
-fi
diff --git a/qtinterface/tqt.pc.cmake b/qtinterface/tqt.pc.cmake
index e47cabd..d042216 100644
--- a/qtinterface/tqt.pc.cmake
+++ b/qtinterface/tqt.pc.cmake
@@ -3,8 +3,6 @@ exec_prefix=@PC_EXEC_PREFIX@
 libdir=@PC_LIB_DIR@
 includedir=@PC_INCLUDE_DIR@
 
-tmoc_executable=@BIN_INSTALL_DIR@/tmoc
-moc_executable=@MOC_EXECUTABLE@
 uic_executable=@UIC_EXECUTABLE@
 
 Name: TQt