Attachment #457 for bug #882

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 882
Collapse All | Expand All




  COMMAND pkg-config tqt --variable=tmoc_executable
  OUTPUT_VARIABLE TMOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )

if( NOT EXISTS ${TMOC_EXECUTABLE} )
  tde_message_fatal( "tmoc is not found!\n tqt is correctly installed?" )
else( )
  tde_message_fatal( "Path to tmoc is not set.\n tqt is correctly installed?" )
endif( )

tqt_message( "  tmoc path: ${TMOC_EXECUTABLE}" )


# moc_executable
tde_execute_process(
  COMMAND pkg-config tqt --variable=moc_executable
  OUTPUT_VARIABLE MOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )

if( NOT EXISTS ${MOC_EXECUTABLE} )
  tqt_message( "  moc path: ${MOC_EXECUTABLE}" )
else( )
  tde_message_fatal( "Path to moc is not set.\n tqt is correctly installed?" )
endif( )

tqt_message( "  moc path: ${MOC_EXECUTABLE}" )


# uic_executable
tde_execute_process(
  COMMAND pkg-config tqt --variable=uic_executable
  OUTPUT_VARIABLE UIC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )

if( NOT EXISTS ${UIC_EXECUTABLE} )
  tde_message_fatal( "uic not found!\n tqt is correctly installed?" )
endif( )

tqt_message( "  uic path: ${UIC_EXECUTABLE}" )


# tqt-replace script
set( TQT_REPLACE_SCRIPT "${TQT_PREFIX}/bin/tqt-replace" )

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
tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )




  list( APPEND ${REST} ${ARGN} )
  list( FIND ${REST} ${ARG_NAME} _arg_idx)
  if( NOT ${_arg_idx} EQUAL -1 )
    list( APPEND ${REST} ___ensure_list___ )
    list( REMOVE_AT ${REST} ${_arg_idx} )
    list( REMOVE_ITEM ${REST} ___ensure_list___ )
    set( _i 0 )
    while( ${_i} LESS ${COUNT} )
      list( GET ${REST} ${_arg_idx} _arg )

  tde_get_arg( MESSAGE 1 _message _rest_args ${ARGV} )
  tde_get_arg( RESULT_VARIABLE 1 _result_variable _tmp ${_rest_args} )
  tde_get_arg( COMMAND 1 _command _tmp ${_rest_args} )
  tde_get_arg( OUTPUT_VARIABLE 1 _output_variable _tmp ${_rest_args} )
  tde_get_arg( CACHE 3 _cache _rest_args2 ${_rest_args} )

  # handle optional FORCE parameter
  if( DEFINED _cache )
    list( GET _cache 2 _tmp )
    if( _tmp STREQUAL FORCE )
      set( _rest_args ${_rest_args2} )
    else()
      tde_get_arg( CACHE 2 _cache _rest_args ${_rest_args} )
    endif()
  endif()

  if( NOT DEFINED _result_variable )
    list( APPEND _rest_args RESULT_VARIABLE _exec_result )
    set( _result_variable _exec_result )
  endif()

  execute_process( ${_rest_args} )

  if( DEFINED _output_variable AND DEFINED _cache )
    set( ${_output_variable} ${${_output_variable}} CACHE ${_cache} )
  endif()

  if( ${_result_variable} )
    if( DEFINED _message )
      tde_message_fatal( ${_message} )
    else()
      if( ${${_result_variable}} MATCHES "^[0-9]+$" )
        set( ${_result_variable} "status ${${_result_variable}} returned!" )
      endif()
      tde_message_fatal( "Error executing '${_command}': ${${_result_variable}}" )
    endif()
  endif()
endmacro( tde_execute_process )

    add_custom_command( OUTPUT ${_ui_basename}.h ${_ui_basename}.cpp
      COMMAND ${CMAKE_COMMAND}
        -DUIC_EXECUTABLE:FILEPATH=${UIC_EXECUTABLE}
        -DTQT_REPLACE_SCRIPT:FILEPATH=${TQT_REPLACE_SCRIPT}
        -DTDE_QTPLUGINS_DIR:FILEPATH=${TDE_QTPLUGINS_DIR}
        -DUI_FILE:FILEPATH=${_ui_absolute_path}
        -DMASTER_SOURCE_DIR:FILEPATH=${CMAKE_SOURCE_DIR}

Lines 35-40 macro( tde_setup_paths ) Link Here

(-)a/modules/TDESetupPaths.cmake (+1 lines)
35	_tde_internal_setup_path( SBIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/sbin" "The install dir for system executables (default ${EXEC_INSTALL_PREFIX}/sbin)" )	35	_tde_internal_setup_path( SBIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/sbin" "The install dir for system executables (default ${EXEC_INSTALL_PREFIX}/sbin)" )
36	_tde_internal_setup_path( LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" "The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})" )	36	_tde_internal_setup_path( LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" "The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})" )
37	_tde_internal_setup_path( LIBEXEC_INSTALL_DIR "${LIB_INSTALL_DIR}/trinity/libexec" "The subdirectory relative to the install prefix where libraries will be installed (default is ${LIB_INSTALL_DIR}/trinity/libexec)" )	37	_tde_internal_setup_path( LIBEXEC_INSTALL_DIR "${LIB_INSTALL_DIR}/trinity/libexec" "The subdirectory relative to the install prefix where libraries will be installed (default is ${LIB_INSTALL_DIR}/trinity/libexec)" )
		38	_tde_internal_setup_path( PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" "The install dir for pkg-config metadata files" )
38	_tde_internal_setup_path( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" "The subdirectory to the header prefix" )	39	_tde_internal_setup_path( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" "The subdirectory to the header prefix" )
39		40
40	_tde_internal_setup_path( CMAKE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/cmake" "The install dir for cmake import modules" )	41	_tde_internal_setup_path( CMAKE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/cmake" "The install dir for cmake import modules" )




# 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 )
tde_execute_process( COMMAND ${TQT_REPLACE_SCRIPT} ${local_ui_file} )

# ui.h extension file, if exists
if( EXISTS "${UI_FILE}.h" )
  configure_file( ${UI_FILE}.h ${local_ui_file}.h COPYONLY )
  tde_execute_process( COMMAND ${TQT_REPLACE_SCRIPT} ${local_ui_file}.h )
endif( )

if( TDE_QTPLUGINS_DIR )

Return to bug 882

Lines 42-50 macro( tde_get_arg ARG_NAME COUNT RETURN REST ) Link Here

(-)a/modules/TDEMacros.cmake (-4 / +22 lines)
42	list( APPEND ${REST} ${ARGN} )	42	list( APPEND ${REST} ${ARGN} )
43	list( FIND ${REST} ${ARG_NAME} _arg_idx)	43	list( FIND ${REST} ${ARG_NAME} _arg_idx)
44	if( NOT ${_arg_idx} EQUAL -1 )	44	if( NOT ${_arg_idx} EQUAL -1 )
45	list( APPEND ${REST} ___ensure_list___ )
46	list( REMOVE_AT ${REST} ${_arg_idx} )	45	list( REMOVE_AT ${REST} ${_arg_idx} )
47	list( REMOVE_ITEM ${REST} ___ensure_list___ )
48	set( _i 0 )	46	set( _i 0 )
49	while( ${_i} LESS ${COUNT} )	47	while( ${_i} LESS ${COUNT} )
50	list( GET ${REST} ${_arg_idx} _arg )	48	list( GET ${REST} ${_arg_idx} _arg )
Lines 66-84 macro( tde_execute_process ) Link Here
66	tde_get_arg( MESSAGE 1 _message _rest_args ${ARGV} )	64	tde_get_arg( MESSAGE 1 _message _rest_args ${ARGV} )
67	tde_get_arg( RESULT_VARIABLE 1 _result_variable _tmp ${_rest_args} )	65	tde_get_arg( RESULT_VARIABLE 1 _result_variable _tmp ${_rest_args} )
68	tde_get_arg( COMMAND 1 _command _tmp ${_rest_args} )	66	tde_get_arg( COMMAND 1 _command _tmp ${_rest_args} )
		67	tde_get_arg( OUTPUT_VARIABLE 1 _output_variable _tmp ${_rest_args} )
		68	tde_get_arg( CACHE 3 _cache _rest_args2 ${_rest_args} )
		69
		70	# handle optional FORCE parameter
		71	if( DEFINED _cache )
		72	list( GET _cache 2 _tmp )
		73	if( _tmp STREQUAL FORCE )
		74	set( _rest_args ${_rest_args2} )
		75	else()
		76	tde_get_arg( CACHE 2 _cache _rest_args ${_rest_args} )
		77	endif()
		78	endif()
		79
69	if( NOT DEFINED _result_variable )	80	if( NOT DEFINED _result_variable )
70	list( APPEND _rest_args RESULT_VARIABLE _exec_result )	81	list( APPEND _rest_args RESULT_VARIABLE _exec_result )
71	set( _result_variable _exec_result )	82	set( _result_variable _exec_result )
72	endif()	83	endif()
		84
73	execute_process( ${_rest_args} )	85	execute_process( ${_rest_args} )
		86
		87	if( DEFINED _output_variable AND DEFINED _cache )
		88	set( ${_output_variable} ${${_output_variable}} CACHE ${_cache} )
		89	endif()
		90
74	if( ${_result_variable} )	91	if( ${_result_variable} )
75	if( DEFINED _message )	92	if( DEFINED _message )
76	message( FATAL_ERROR ${_message} )	93	tde_message_fatal( ${_message} )
77	else()	94	else()
78	if( ${${_result_variable}} MATCHES "^[0-9]+$" )	95	if( ${${_result_variable}} MATCHES "^[0-9]+$" )
79	set( ${_result_variable} "status ${${_result_variable}} returned!" )	96	set( ${_result_variable} "status ${${_result_variable}} returned!" )
80	endif()	97	endif()
81	message( FATAL_ERROR "Error executing '${_command}': ${${_result_variable}}" )	98	tde_message_fatal( "Error executing '${_command}': ${${_result_variable}}" )
82	endif()	99	endif()
83	endif()	100	endif()
84	endmacro( tde_execute_process )	101	endmacro( tde_execute_process )
Lines 268-273 macro( tde_add_ui_files _sources ) Link Here
268	add_custom_command( OUTPUT ${_ui_basename}.h ${_ui_basename}.cpp	285	add_custom_command( OUTPUT ${_ui_basename}.h ${_ui_basename}.cpp
269	COMMAND ${CMAKE_COMMAND}	286	COMMAND ${CMAKE_COMMAND}
270	-DUIC_EXECUTABLE:FILEPATH=${UIC_EXECUTABLE}	287	-DUIC_EXECUTABLE:FILEPATH=${UIC_EXECUTABLE}
		288	-DTQT_REPLACE_SCRIPT:FILEPATH=${TQT_REPLACE_SCRIPT}
271	-DTDE_QTPLUGINS_DIR:FILEPATH=${TDE_QTPLUGINS_DIR}	289	-DTDE_QTPLUGINS_DIR:FILEPATH=${TDE_QTPLUGINS_DIR}
272	-DUI_FILE:FILEPATH=${_ui_absolute_path}	290	-DUI_FILE:FILEPATH=${_ui_absolute_path}
273	-DMASTER_SOURCE_DIR:FILEPATH=${CMAKE_SOURCE_DIR}	291	-DMASTER_SOURCE_DIR:FILEPATH=${CMAKE_SOURCE_DIR}

Lines 17-28 get_filename_component( _ui_basename ${UI_FILE} NAME_WE ) Link Here

(-)a/modules/tde_uic.cmake (-2 / +2 lines)
17	# FIXME this will working only on out-of-source mode	17	# FIXME this will working only on out-of-source mode
18	set( local_ui_file ${_ui_basename}.ui )	18	set( local_ui_file ${_ui_basename}.ui )
19	configure_file( ${UI_FILE} ${local_ui_file} COPYONLY )	19	configure_file( ${UI_FILE} ${local_ui_file} COPYONLY )
20	tde_execute_process( COMMAND tqt-replace ${local_ui_file} )	20	tde_execute_process( COMMAND ${TQT_REPLACE_SCRIPT} ${local_ui_file} )
21		21
22	# ui.h extension file, if exists	22	# ui.h extension file, if exists
23	if( EXISTS "${UI_FILE}.h" )	23	if( EXISTS "${UI_FILE}.h" )
24	configure_file( ${UI_FILE}.h ${local_ui_file}.h COPYONLY )	24	configure_file( ${UI_FILE}.h ${local_ui_file}.h COPYONLY )
25	tde_execute_process( COMMAND tqt-replace ${local_ui_file}.h )	25	tde_execute_process( COMMAND ${TQT_REPLACE_SCRIPT} ${local_ui_file}.h )
26	endif( )	26	endif( )
27		27
28	if( TDE_QTPLUGINS_DIR )	28	if( TDE_QTPLUGINS_DIR )

Lines 24-59 tde_execute_process( Link Here

(-)a/modules/FindTQt.cmake (-11 / +21 lines)
24	COMMAND pkg-config tqt --variable=tmoc_executable	24	COMMAND pkg-config tqt --variable=tmoc_executable
25	OUTPUT_VARIABLE TMOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )	25	OUTPUT_VARIABLE TMOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )
26		26
27	if( TMOC_EXECUTABLE )	27	if( NOT EXISTS ${TMOC_EXECUTABLE} )
28	tqt_message( " tmoc path: ${TMOC_EXECUTABLE}" )	28	tde_message_fatal( "tmoc is not found!\n tqt is correctly installed?" )
29	else( )
30	tde_message_fatal( "Path to tmoc is not set.\n tqt is correctly installed?" )
31	endif( )	29	endif( )
32		30
		31	tqt_message( " tmoc path: ${TMOC_EXECUTABLE}" )
		32
33		33
34	# moc_executable	34	# moc_executable
35	tde_execute_process(	35	tde_execute_process(
36	COMMAND pkg-config tqt --variable=moc_executable	36	COMMAND pkg-config tqt --variable=moc_executable
37	OUTPUT_VARIABLE MOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )	37	OUTPUT_VARIABLE MOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )
38		38
39	if( MOC_EXECUTABLE )	39	if( NOT EXISTS ${MOC_EXECUTABLE} )
40	tqt_message( " moc path: ${MOC_EXECUTABLE}" )
41	else( )
42	tde_message_fatal( "Path to moc is not set.\n tqt is correctly installed?" )	40	tde_message_fatal( "Path to moc is not set.\n tqt is correctly installed?" )
43	endif( )	41	endif( )
44		42
		43	tqt_message( " moc path: ${MOC_EXECUTABLE}" )
		44
45		45
46	# uic_executable	46	# uic_executable
47	tde_execute_process(	47	tde_execute_process(
48	COMMAND pkg-config tqt --variable=uic_executable	48	COMMAND pkg-config tqt --variable=uic_executable
49	OUTPUT_VARIABLE UIC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )	49	OUTPUT_VARIABLE UIC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )
50		50
51	if( UIC_EXECUTABLE )	51	if( NOT EXISTS ${UIC_EXECUTABLE} )
52	tqt_message( " uic path: ${UIC_EXECUTABLE}" )	52	tde_message_fatal( "uic not found!\n tqt is correctly installed?" )
53	else( )	53	endif( )
54	tde_message_fatal( "Path to uic is not set.\n tqt is correctly installed?" )	54
		55	tqt_message( " uic path: ${UIC_EXECUTABLE}" )
		56
		57
		58	# tqt-replace script
		59	set( TQT_REPLACE_SCRIPT "${TQT_PREFIX}/bin/tqt-replace" )
		60
		61	if( NOT EXISTS ${TQT_REPLACE_SCRIPT} )
		62	tde_message_fatal( "tqt-replace not found!\n Check tqt installation." )
55	endif( )	63	endif( )
56		64
		65	tqt_message( " tqt-replace path: ${TQT_REPLACE_SCRIPT}" )
		66
57		67
58	# check if tqt is usable	68	# check if tqt is usable
59	tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )	69	tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )