From 1ab8856ee073606a2a400ee824870f4bf3f57516 Mon Sep 17 00:00:00 2001
From: samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sun, 21 Nov 2010 20:45:21 +0000
Subject: [PATCH] [kde-common/cmake] make tde_uic usable even if
 TDE_QTPLUGINS_DIR is not set (i.e. kdelibs context)

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

diff --git a/cmake/modules/tde_uic.cmake b/cmake/modules/tde_uic.cmake
index 541fb9f..15e4709 100644
--- a/cmake/modules/tde_uic.cmake
+++ b/cmake/modules/tde_uic.cmake
@@ -14,8 +14,7 @@ get_filename_component( _ui_basename ${UI_FILE} NAME_WE )
 execute_process( COMMAND ${QT_UIC_EXECUTABLE}
   -nounload -tr tr2i18n
   ${UI_FILE}
-  OUTPUT_VARIABLE _ui_h_content
-  ERROR_QUIET )
+  OUTPUT_VARIABLE _ui_h_content )
 
 if( _ui_h_content )
   string( REGEX REPLACE "#ifndef " "#ifndef UI_" _ui_h_content "${_ui_h_content}" )
@@ -23,13 +22,16 @@ if( _ui_h_content )
   file( WRITE ${_ui_basename}.h "${_ui_h_content}" )
 endif( )
 
+if( TDE_QTPLUGINS_DIR )
+  set( L -L ${TDE_QTPLUGINS_DIR} )
+endif( )
+
 execute_process( COMMAND ${QT_UIC_EXECUTABLE}
   -nounload -tr tr2i18n
-  -L ${TDE_QTPLUGINS_DIR}
+  ${L}
   -impl ${_ui_basename}.h
   ${UI_FILE}
-  OUTPUT_VARIABLE _ui_cpp_content
-  ERROR_QUIET )
+  OUTPUT_VARIABLE _ui_cpp_content )
 
 if( _ui_cpp_content )
   string( REGEX REPLACE "tr2i18n\\(\"\"\\)" "QString::null" _ui_cpp_content "${_ui_cpp_content}" )