Attachment #411 for bug #874

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 874
Collapse All | Expand All




  endif( NOT DEFINED KDECONFIG_EXECUTABLE )

  # check for installed trinity version
  tde_execute_process(
    COMMAND ${KDECONFIG_EXECUTABLE} --version
    OUTPUT_VARIABLE _version
    RESULT_VARIABLE _result
    OUTPUT_STRIP_TRAILING_WHITESPACE
    MESSAGE "Unable to run kde-config!\n TDELIBS are correctly installed?\n Path to kde-config are corect?" )
    tde_message_fatal( "Unable to run kde-config!\n TDELIBS are correctly installed?\n Path to kde-config are corect?" )
  endif( _result )

  # parse kde-config output, to extract TDE version
  string( REGEX MATCH "TDE: ([0-9\\.]+)" __dummy "${_version}" )


  # ask kde-config for few paths
  macro( __internal_get_path __type __var )
    tde_execute_process(
      COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install ${__type}
      OUTPUT_VARIABLE ${__var}
      OUTPUT_STRIP_TRAILING_WHITESPACE )




endif( )

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




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




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






#################################################
#####
##### tde_get_arg( <ARG_NAME> <COUNT> <RETURN> <REST> <ARGS...> )
##### ARG_NAME(string): name of an argument to find in ARGS
##### COUNT(number): argument dimension, a number of items returned in RETURN
##### RETURN(list ref): items returned for argument as they found in ARGS
##### REST(list ref): rest of items except argument name and items returned in RETURN
##### ARGS(list): source list of arguments

macro( tde_get_arg ARG_NAME COUNT RETURN REST )
  unset( ${RETURN} )
  unset( ${REST} )
  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 )
      list( REMOVE_AT ${REST} ${_arg_idx} )
      list( APPEND ${RETURN} ${_arg} )
      math( EXPR _i "${_i} + 1" )
    endwhile()
  endif()
endmacro( tde_get_arg )


################################################
#####
##### tde_execute_process( <ARGS...> [MESSAGE <MSG>] )
##### MSG: fatal error message (standard message will be written if not supplied)
##### ARGS: execute_process arguments

macro( tde_execute_process )
  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} )
  if( NOT DEFINED _result_variable )
    list( APPEND _rest_args RESULT_VARIABLE _exec_result )
    set( _result_variable _exec_result )
  endif()
  execute_process( ${_rest_args} )
  if( ${_result_variable} )
    if( DEFINED _message )
      message( FATAL_ERROR ${_message} )
    else()
      if( ${${_result_variable}} MATCHES "^[0-9]+$" )
        set( ${_result_variable} "status ${${_result_variable}} returned!" )
      endif()
      message( FATAL_ERROR "Error executing '${_command}': ${${_result_variable}}" )
    endif()
  endif()
endmacro( tde_execute_process )


if( DEFINED MASTER_SOURCE_DIR )
  return( )
endif( )
########### slave part ends here ###############


################################################
#####
##### tde_install_icons( <icons...> THEME <svgicons> DESTINATION <destdir> )
##### default theme: hicolor
##### default destination: ${SHARE_INSTALL_DIR}/icons

macro( tde_install_icons )
  tde_get_arg( DESTINATION 1 _dest _args ${ARGV} )
  tde_get_arg( THEME 1 _dest _icons ${_args} )
  unset( _dest )
  unset( _req_theme )
  unset( _icons )
  set( _var _icons )

  # parse all arguments
  foreach( _arg ${ARGV} )
    # directive DESTINATION
    if( _arg STREQUAL "DESTINATION" )
      set( _var _dest )
      set( _directive 1 )
    endif( _arg STREQUAL "DESTINATION" )
    # directive THEME
    if( _arg STREQUAL "THEME" )
      set( _var _req_theme )
      set( _directive 1 )
    endif( _arg STREQUAL "THEME" )
    # collect data
    if( _directive )
      unset( _directive )
    else( _directive )
      set( ${_var} ${${_var}} ${_arg} )
      set( _var _icons )
    endif( _directive )
  endforeach( _arg )

  #defaults
  if( NOT _icons )

        -DUIC_EXECUTABLE:FILEPATH=${UIC_EXECUTABLE}
        -DTDE_QTPLUGINS_DIR:FILEPATH=${TDE_QTPLUGINS_DIR}
        -DUI_FILE:FILEPATH=${_ui_absolute_path}
        -DMASTER_SOURCE_DIR:FILEPATH=${CMAKE_SOURCE_DIR}
        -DMASTER_BINARY_DIR:FILEPATH=${CMAKE_BINARY_DIR}
        -P ${CMAKE_MODULE_PATH}/tde_uic.cmake
      COMMAND ${MOC_EXECUTABLE} ${_ui_basename}.h >> ${_ui_basename}.cpp
      DEPENDS ${_ui_absolute_path} )

#####
##### tde_curdatetime
macro( tde_curdatetime result )
  tde_execute_process( COMMAND "date" "+%m/%d/%Y %H:%M:%S" OUTPUT_VARIABLE ${result} )
  string( REGEX REPLACE "(..)/(..)/(....) (........).*" "\\1/\\2/\\3 \\4" ${result} ${${result}} )
endmacro( tde_curdatetime )





#
#################################################

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 )
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 )
  tde_execute_process( COMMAND tqt-replace ${local_ui_file}.h )
endif( )

if( TDE_QTPLUGINS_DIR )
  set( L -L ${TDE_QTPLUGINS_DIR} )
endif( )

tde_execute_process( COMMAND ${UIC_EXECUTABLE}
  -nounload -tr tr2i18n
  ${L}
  ${local_ui_file}

  file( WRITE ${_ui_basename}.h "${_ui_h_content}" )
endif( )

tde_execute_process( COMMAND ${UIC_EXECUTABLE}
  -nounload -tr tr2i18n
  ${L}
  -impl ${_ui_basename}.h

Return to bug 874

Lines 25-38 if( NOT TDE_FOUND ) Link Here

(-)a/modules/FindTDE.cmake (-6 / +4 lines)
25	endif( NOT DEFINED KDECONFIG_EXECUTABLE )	25	endif( NOT DEFINED KDECONFIG_EXECUTABLE )
26		26
27	# check for installed trinity version	27	# check for installed trinity version
28	execute_process(	28	tde_execute_process(
29	COMMAND ${KDECONFIG_EXECUTABLE} --version	29	COMMAND ${KDECONFIG_EXECUTABLE} --version
30	OUTPUT_VARIABLE _version	30	OUTPUT_VARIABLE _version
31	RESULT_VARIABLE _result	31	RESULT_VARIABLE _result
32	OUTPUT_STRIP_TRAILING_WHITESPACE )	32	OUTPUT_STRIP_TRAILING_WHITESPACE
33	if( _result )	33	MESSAGE "Unable to run kde-config!\n TDELIBS are correctly installed?\n Path to kde-config are corect?" )
34	tde_message_fatal( "Unable to run kde-config!\n TDELIBS are correctly installed?\n Path to kde-config are corect?" )
35	endif( _result )
36		34
37	# parse kde-config output, to extract TDE version	35	# parse kde-config output, to extract TDE version
38	string( REGEX MATCH "TDE: ([0-9\\.]+)" __dummy "${_version}" )	36	string( REGEX MATCH "TDE: ([0-9\\.]+)" __dummy "${_version}" )
Lines 40-46 if( NOT TDE_FOUND ) Link Here
40		38
41	# ask kde-config for few paths	39	# ask kde-config for few paths
42	macro( __internal_get_path __type __var )	40	macro( __internal_get_path __type __var )
43	execute_process(	41	tde_execute_process(
44	COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install ${__type}	42	COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install ${__type}
45	OUTPUT_VARIABLE ${__var}	43	OUTPUT_VARIABLE ${__var}
46	OUTPUT_STRIP_TRAILING_WHITESPACE )	44	OUTPUT_STRIP_TRAILING_WHITESPACE )

Lines 20-26 if( NOT TQT_FOUND ) Link Here

(-)a/modules/FindTQt.cmake (-3 / +3 lines)
20	endif( )	20	endif( )
21		21
22	# tmoc_executable	22	# tmoc_executable
23	execute_process(	23	tde_execute_process(
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
Lines 32-38 endif( ) Link Here
32		32
33		33
34	# moc_executable	34	# moc_executable
35	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
Lines 44-50 endif( ) Link Here
44		44
45		45
46	# uic_executable	46	# uic_executable
47	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

Lines 29-66 endmacro( tde_message_fatal ) Link Here

(-)a/modules/TDEMacros.cmake (-28 / +68 lines)
29		29
30	#################################################	30	#################################################
31	#####	31	#####
		32	##### tde_get_arg( <ARG_NAME> <COUNT> <RETURN> <REST> <ARGS...> )
		33	##### ARG_NAME(string): name of an argument to find in ARGS
		34	##### COUNT(number): argument dimension, a number of items returned in RETURN
		35	##### RETURN(list ref): items returned for argument as they found in ARGS
		36	##### REST(list ref): rest of items except argument name and items returned in RETURN
		37	##### ARGS(list): source list of arguments
		38
		39	macro( tde_get_arg ARG_NAME COUNT RETURN REST )
		40	unset( ${RETURN} )
		41	unset( ${REST} )
		42	list( APPEND ${REST} ${ARGN} )
		43	list( FIND ${REST} ${ARG_NAME} _arg_idx)
		44	if( NOT ${_arg_idx} EQUAL -1 )
		45	list( APPEND ${REST} ___ensure_list___ )
		46	list( REMOVE_AT ${REST} ${_arg_idx} )
		47	list( REMOVE_ITEM ${REST} ___ensure_list___ )
		48	set( _i 0 )
		49	while( ${_i} LESS ${COUNT} )
		50	list( GET ${REST} ${_arg_idx} _arg )
		51	list( REMOVE_AT ${REST} ${_arg_idx} )
		52	list( APPEND ${RETURN} ${_arg} )
		53	math( EXPR _i "${_i} + 1" )
		54	endwhile()
		55	endif()
		56	endmacro( tde_get_arg )
		57
		58
		59	################################################
		60	#####
		61	##### tde_execute_process( <ARGS...> [MESSAGE <MSG>] )
		62	##### MSG: fatal error message (standard message will be written if not supplied)
		63	##### ARGS: execute_process arguments
		64
		65	macro( tde_execute_process )
		66	tde_get_arg( MESSAGE 1 _message _rest_args ${ARGV} )
		67	tde_get_arg( RESULT_VARIABLE 1 _result_variable _tmp ${_rest_args} )
		68	tde_get_arg( COMMAND 1 _command _tmp ${_rest_args} )
		69	if( NOT DEFINED _result_variable )
		70	list( APPEND _rest_args RESULT_VARIABLE _exec_result )
		71	set( _result_variable _exec_result )
		72	endif()
		73	execute_process( ${_rest_args} )
		74	if( ${_result_variable} )
		75	if( DEFINED _message )
		76	message( FATAL_ERROR ${_message} )
		77	else()
		78	if( ${${_result_variable}} MATCHES "^[0-9]+$" )
		79	set( ${_result_variable} "status ${${_result_variable}} returned!" )
		80	endif()
		81	message( FATAL_ERROR "Error executing '${_command}': ${${_result_variable}}" )
		82	endif()
		83	endif()
		84	endmacro( tde_execute_process )
		85
		86
		87	if( DEFINED MASTER_SOURCE_DIR )
		88	return( )
		89	endif( )
		90	########### slave part ends here ###############
		91
		92
		93	################################################
		94	#####
32	##### tde_install_icons( <icons...> THEME <svgicons> DESTINATION <destdir> )	95	##### tde_install_icons( <icons...> THEME <svgicons> DESTINATION <destdir> )
33	##### default theme: hicolor	96	##### default theme: hicolor
34	##### default destination: ${SHARE_INSTALL_DIR}/icons	97	##### default destination: ${SHARE_INSTALL_DIR}/icons
35		98
36	macro( tde_install_icons )	99	macro( tde_install_icons )
37		100	tde_get_arg( DESTINATION 1 _dest _args ${ARGV} )
38	# clearing	101	tde_get_arg( THEME 1 _dest _icons ${_args} )
39	unset( _dest )
40	unset( _req_theme )
41	unset( _icons )
42	set( _var _icons )
43
44	# parse all arguments
45	foreach( _arg ${ARGV} )
46	# directive DESTINATION
47	if( _arg STREQUAL "DESTINATION" )
48	set( _var _dest )
49	set( _directive 1 )
50	endif( _arg STREQUAL "DESTINATION" )
51	# directive THEME
52	if( _arg STREQUAL "THEME" )
53	set( _var _req_theme )
54	set( _directive 1 )
55	endif( _arg STREQUAL "THEME" )
56	# collect data
57	if( _directive )
58	unset( _directive )
59	else( _directive )
60	set( ${_var} ${${_var}} ${_arg} )
61	set( _var _icons )
62	endif( _directive )
63	endforeach( _arg )
64		102
65	#defaults	103	#defaults
66	if( NOT _icons )	104	if( NOT _icons )
Lines 232-237 macro( tde_add_ui_files _sources ) Link Here
232	-DUIC_EXECUTABLE:FILEPATH=${UIC_EXECUTABLE}	270	-DUIC_EXECUTABLE:FILEPATH=${UIC_EXECUTABLE}
233	-DTDE_QTPLUGINS_DIR:FILEPATH=${TDE_QTPLUGINS_DIR}	271	-DTDE_QTPLUGINS_DIR:FILEPATH=${TDE_QTPLUGINS_DIR}
234	-DUI_FILE:FILEPATH=${_ui_absolute_path}	272	-DUI_FILE:FILEPATH=${_ui_absolute_path}
		273	-DMASTER_SOURCE_DIR:FILEPATH=${CMAKE_SOURCE_DIR}
		274	-DMASTER_BINARY_DIR:FILEPATH=${CMAKE_BINARY_DIR}
235	-P ${CMAKE_MODULE_PATH}/tde_uic.cmake	275	-P ${CMAKE_MODULE_PATH}/tde_uic.cmake
236	COMMAND ${MOC_EXECUTABLE} ${_ui_basename}.h >> ${_ui_basename}.cpp	276	COMMAND ${MOC_EXECUTABLE} ${_ui_basename}.h >> ${_ui_basename}.cpp
237	DEPENDS ${_ui_absolute_path} )	277	DEPENDS ${_ui_absolute_path} )
Lines 702-708 endmacro( tde_add_kpart ) Link Here
702	#####	742	#####
703	##### tde_curdatetime	743	##### tde_curdatetime
704	macro( tde_curdatetime result )	744	macro( tde_curdatetime result )
705	execute_process( COMMAND "date" "+%m/%d/%Y %H:%M:%S" OUTPUT_VARIABLE ${result} )	745	tde_execute_process( COMMAND "date" "+%m/%d/%Y %H:%M:%S" OUTPUT_VARIABLE ${result} )
706	string( REGEX REPLACE "(..)/(..)/(....) (........).*" "\\1/\\2/\\3 \\4" ${result} ${${result}} )	746	string( REGEX REPLACE "(..)/(..)/(....) (........).*" "\\1/\\2/\\3 \\4" ${result} ${${result}} )
707	endmacro( tde_curdatetime )	747	endmacro( tde_curdatetime )
708		748

Lines 9-32 Link Here

(-)a/modules/tde_uic.cmake (-4 / +7 lines)
9	#	9	#
10	#################################################	10	#################################################
11		11
		12	set( CMAKE_MODULE_PATH "${MASTER_SOURCE_DIR}/cmake/modules" )
		13	include( TDEMacros )
		14
12	get_filename_component( _ui_basename ${UI_FILE} NAME_WE )	15	get_filename_component( _ui_basename ${UI_FILE} NAME_WE )
13		16
14	# FIXME this will working only on out-of-source mode	17	# FIXME this will working only on out-of-source mode
15	set( local_ui_file ${_ui_basename}.ui )	18	set( local_ui_file ${_ui_basename}.ui )
16	configure_file( ${UI_FILE} ${local_ui_file} COPYONLY )	19	configure_file( ${UI_FILE} ${local_ui_file} COPYONLY )
17	execute_process( COMMAND tqt-replace ${local_ui_file} )	20	tde_execute_process( COMMAND tqt-replace ${local_ui_file} )
18		21
19	# ui.h extension file, if exists	22	# ui.h extension file, if exists
20	if( EXISTS "${UI_FILE}.h" )	23	if( EXISTS "${UI_FILE}.h" )
21	configure_file( ${UI_FILE}.h ${local_ui_file}.h COPYONLY )	24	configure_file( ${UI_FILE}.h ${local_ui_file}.h COPYONLY )
22	execute_process( COMMAND tqt-replace ${local_ui_file}.h )	25	tde_execute_process( COMMAND tqt-replace ${local_ui_file}.h )
23	endif( )	26	endif( )
24		27
25	if( TDE_QTPLUGINS_DIR )	28	if( TDE_QTPLUGINS_DIR )
26	set( L -L ${TDE_QTPLUGINS_DIR} )	29	set( L -L ${TDE_QTPLUGINS_DIR} )
27	endif( )	30	endif( )
28		31
29	execute_process( COMMAND ${UIC_EXECUTABLE}	32	tde_execute_process( COMMAND ${UIC_EXECUTABLE}
30	-nounload -tr tr2i18n	33	-nounload -tr tr2i18n
31	${L}	34	${L}
32	${local_ui_file}	35	${local_ui_file}
Lines 42-48 if( _ui_h_content ) Link Here
42	file( WRITE ${_ui_basename}.h "${_ui_h_content}" )	45	file( WRITE ${_ui_basename}.h "${_ui_h_content}" )
43	endif( )	46	endif( )
44		47
45	execute_process( COMMAND ${UIC_EXECUTABLE}	48	tde_execute_process( COMMAND ${UIC_EXECUTABLE}
46	-nounload -tr tr2i18n	49	-nounload -tr tr2i18n
47	${L}	50	${L}
48	-impl ${_ui_basename}.h	51	-impl ${_ui_basename}.h