tqt-replace is no longer required

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/98/head
Michele Calgaro 10 months ago
parent ea17fae58d
commit b2d2b46723
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -68,17 +68,6 @@ if( NOT TQT_FOUND )
tqt_message( " uic path: ${UIC_EXECUTABLE}" ) tqt_message( " uic path: ${UIC_EXECUTABLE}" )
# tqt-replace script
set( TQT_REPLACE_SCRIPT "${TQT_PREFIX}/bin/tqt-replace"
CACHE FILEPATH "TQt replace script path" )
if( NOT EXISTS ${TQT_REPLACE_SCRIPT} )
tde_message_fatal( "tqt-replace not found!\n Check tqt installation." )
endif( )
tqt_message( " tqt-replace path: ${TQT_REPLACE_SCRIPT}" )
# check if tqt is usable # check if tqt is usable
tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} ) set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} )

@ -19,12 +19,10 @@ get_filename_component( _ui_basename ${UI_FILE} NAME_WE )
# FIXME this will working only on out-of-source mode # FIXME this will working only on out-of-source mode
set( local_ui_file ${_ui_basename}.ui ) set( local_ui_file ${_ui_basename}.ui )
configure_file( ${UI_FILE} ${local_ui_file} COPYONLY ) configure_file( ${UI_FILE} ${local_ui_file} COPYONLY )
tde_execute_process( COMMAND ${TQT_REPLACE_SCRIPT} ${local_ui_file} )
# ui.h extension file, if exists # ui.h extension file, if exists
if( EXISTS "${UI_FILE}.h" ) if( EXISTS "${UI_FILE}.h" )
configure_file( ${UI_FILE}.h ${local_ui_file}.h COPYONLY ) configure_file( ${UI_FILE}.h ${local_ui_file}.h COPYONLY )
tde_execute_process( COMMAND ${TQT_REPLACE_SCRIPT} ${local_ui_file}.h )
endif( ) endif( )
if( TDE_TQTPLUGINS_DIR ) if( TDE_TQTPLUGINS_DIR )

Loading…
Cancel
Save