diff options
| author | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-11-21 20:45:21 +0000 |
|---|---|---|
| committer | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-11-21 20:45:21 +0000 |
| commit | 59f265f15a7963534025c143be8f2c3cb8dd464a (patch) | |
| tree | 9080979f263fe72a86d347e9a23249c041c3752f | |
| parent | c281cef3601a597f6deea894c50cbc978efc3afc (diff) | |
| download | tde-cmake-59f265f15a7963534025c143be8f2c3cb8dd464a.tar.gz tde-cmake-59f265f15a7963534025c143be8f2c3cb8dd464a.zip | |
[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/cmake@1199426 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | modules/tde_uic.cmake | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/modules/tde_uic.cmake b/modules/tde_uic.cmake index 541fb9f..15e4709 100644 --- a/modules/tde_uic.cmake +++ b/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}" ) |