diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-25 16:41:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-25 16:41:07 -0600 |
| commit | 975cc10f8bfcab94ff4e641775473095af0e778a (patch) | |
| tree | 1d7e1e100ab31d9c6be4325842d119b4a64fb252 /modules/tde_uic.cmake | |
| parent | 8e6f203f9221d336edfa84b2e3eba6205a30c816 (diff) | |
| download | tde-cmake-975cc10f8bfcab94ff4e641775473095af0e778a.tar.gz tde-cmake-975cc10f8bfcab94ff4e641775473095af0e778a.zip | |
Fix vague build errors due to blind execution in CMake
This closes Bug 874
Thanks to Aleksey Midenkov for the patch!
Diffstat (limited to 'modules/tde_uic.cmake')
| -rw-r--r-- | modules/tde_uic.cmake | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/modules/tde_uic.cmake b/modules/tde_uic.cmake index 7e6210e..e4c438b 100644 --- a/modules/tde_uic.cmake +++ b/modules/tde_uic.cmake @@ -9,24 +9,27 @@ # ################################################# +set( CMAKE_MODULE_PATH "${MASTER_SOURCE_DIR}/cmake/modules" ) +include( TDEMacros ) + get_filename_component( _ui_basename ${UI_FILE} NAME_WE ) # FIXME this will working only on out-of-source mode set( local_ui_file ${_ui_basename}.ui ) configure_file( ${UI_FILE} ${local_ui_file} COPYONLY ) -execute_process( COMMAND tqt-replace ${local_ui_file} ) +tde_execute_process( COMMAND tqt-replace ${local_ui_file} ) # ui.h extension file, if exists if( EXISTS "${UI_FILE}.h" ) configure_file( ${UI_FILE}.h ${local_ui_file}.h COPYONLY ) - execute_process( COMMAND tqt-replace ${local_ui_file}.h ) + tde_execute_process( COMMAND tqt-replace ${local_ui_file}.h ) endif( ) if( TDE_QTPLUGINS_DIR ) set( L -L ${TDE_QTPLUGINS_DIR} ) endif( ) -execute_process( COMMAND ${UIC_EXECUTABLE} +tde_execute_process( COMMAND ${UIC_EXECUTABLE} -nounload -tr tr2i18n ${L} ${local_ui_file} @@ -42,7 +45,7 @@ if( _ui_h_content ) file( WRITE ${_ui_basename}.h "${_ui_h_content}" ) endif( ) -execute_process( COMMAND ${UIC_EXECUTABLE} +tde_execute_process( COMMAND ${UIC_EXECUTABLE} -nounload -tr tr2i18n ${L} -impl ${_ui_basename}.h |