From 1490f9ea119dba0c29fa193619ade3ef4eda2ad5 Mon Sep 17 00:00:00 2001
From: samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sun, 27 Mar 2011 21:56:52 +0000
Subject: [cmake] reworked tqtinterface build system

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common@1226235 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 cmake/modules/TDEMacros.cmake | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'cmake/modules/TDEMacros.cmake')

diff --git a/cmake/modules/TDEMacros.cmake b/cmake/modules/TDEMacros.cmake
index 9474e3c..bbb0cd9 100644
--- a/cmake/modules/TDEMacros.cmake
+++ b/cmake/modules/TDEMacros.cmake
@@ -1,6 +1,6 @@
 #################################################
 #
-#  (C) 2010 Serghei Amelian
+#  (C) 2010-2011 Serghei Amelian
 #  serghei (DOT) amelian (AT) gmail.com
 #
 #  Improvements and feedback are welcome
@@ -207,11 +207,11 @@ macro( tde_add_ui_files _sources )
 
     add_custom_command( OUTPUT ${_ui_basename}.h ${_ui_basename}.cpp
       COMMAND ${CMAKE_COMMAND}
-        -DQT_UIC_EXECUTABLE:FILEPATH=${QT_UIC_EXECUTABLE}
+        -DUIC_EXECUTABLE:FILEPATH=${UIC_EXECUTABLE}
         -DTDE_QTPLUGINS_DIR:FILEPATH=${TDE_QTPLUGINS_DIR}
         -DUI_FILE:FILEPATH=${_ui_absolute_path}
         -P ${CMAKE_MODULE_PATH}/tde_uic.cmake
-      COMMAND ${QT_MOC_EXECUTABLE} ${_ui_basename}.h >> ${_ui_basename}.cpp
+      COMMAND ${MOC_EXECUTABLE} ${_ui_basename}.h >> ${_ui_basename}.cpp
       DEPENDS ${_ui_absolute_path} )
 
   endforeach( _ui_file )
@@ -227,10 +227,10 @@ macro( tde_moc _sources )
 
     get_filename_component( _input_file "${_input_file}" ABSOLUTE )
     get_filename_component( _basename ${_input_file} NAME_WE )
-    set( _output_file "${_basename}.moc.cpp" )
+    set( _output_file "${_basename}.moc" )
     add_custom_command( OUTPUT ${_output_file}
       COMMAND
-        ${TQT_TMOC_EXECUTABLE} ${_input_file} -o ${_output_file}
+        ${TMOC_EXECUTABLE} ${_input_file} -o ${_output_file}
       DEPENDS
         ${_input_file} )
     list( APPEND ${_sources} ${_output_file} )
@@ -286,7 +286,7 @@ macro( tde_automoc )
 
           # moc-ing header
           add_custom_command( OUTPUT ${_moc_file}
-            COMMAND ${TQT_TMOC_EXECUTABLE} ${_header_file} -o ${_moc_file}
+            COMMAND ${TMOC_EXECUTABLE} ${_header_file} -o ${_moc_file}
             DEPENDS ${_header_file} )
 
           # create dependency between source file and moc file
-- 
cgit v1.2.1