Attachment #460 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

Lines 862-867 install( FILES Link Here

(-)a/CMakeLists.txt (+6 lines)
862	DESTINATION ${INCLUDE_INSTALL_DIR} )	862	DESTINATION ${INCLUDE_INSTALL_DIR} )
863		863
864		864
		865	##### pkg-config #################################
		866
		867	configure_file( tdelibs.pc.cmake tdelibs.pc @ONLY )
		868	install( FILES ${CMAKE_CURRENT_BINARY_DIR}/tdelibs.pc DESTINATION ${PKGCONFIG_INSTALL_DIR} )
		869
		870
865	##### subdirectories ############################	871	##### subdirectories ############################
866		872
867	add_subdirectory( dcop )	873	add_subdirectory( dcop )

Line 0 Link Here

(-)a/tdelibs.pc.cmake (+7 lines)
	1	prefix=@CMAKE_INSTALL_PREFIX@
	2	exec_prefix=@EXEC_INSTALL_PREFIX@
	3	libdir=@LIB_INSTALL_DIR@
	4	includedir=@INCLUDE_INSTALL_DIR@
	5
	6	Name: TDELibs
	7	Description: Core libraries for Trinity





  message( STATUS "checking for 'TDE'")

  pkg_search_module( TDE tqt )

  if( NOT TDE_FOUND )
    tde_message_fatal( "Unable to find tdelibs!\n Try adding the directory in which the tdelibs.pc file is located\nto the PKG_CONFIG_PATH variable." )
  endif( )

  # if the path is not already defined by user,
  # find tde-config executable
  if( NOT DEFINED KDECONFIG_EXECUTABLE )
    find_program( KDECONFIG_EXECUTABLE
      NAMES tde-config
      HINTS "${TDE_PREFIX}/bin" ${BIN_INSTALL_DIR} )
    if( NOT KDECONFIG_EXECUTABLE )
      tde_message_fatal( "tde-config are NOT found." )
    endif( NOT KDECONFIG_EXECUTABLE )
  endif( NOT DEFINED KDECONFIG_EXECUTABLE )

  set( ENV{LD_LIBRARY_PATH} "${TDE_LIBDIR}:$ENV{LD_LIBRARY_PATH}" )
  # check for installed trinity version
  tde_execute_process(
    COMMAND ${KDECONFIG_EXECUTABLE} --version

    tde_execute_process(
      COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install ${__type}
      OUTPUT_VARIABLE ${__var}
      CACHE INTERNAL "TDE ${__type} path" FORCE
      OUTPUT_STRIP_TRAILING_WHITESPACE )
  endmacro( __internal_get_path )


  macro( __internal_find_program __prog __var )
    find_program( ${__var}
      NAMES ${__prog}
      HINTS "${TDE_PREFIX}/bin" ${BIN_INSTALL_DIR}
      OUTPUT_STRIP_TRAILING_WHITESPACE )
    if( NOT ${__var} )
      tde_message_fatal( "${__prog} are NOT found.\n TDELIBS are correctly installed?" )
    endif( NOT ${__var} )
    set( ${__var} ${${__var}} CACHE INTERNAL "${__prog} executable" FORCE )
  endmacro( __internal_find_program )

  __internal_find_program( dcopidl KDE3_DCOPIDL_EXECUTABLE )

  # if PATH to tde-config is not set, dcopidlng will fail;
  # for this reason we set KDECONFIG environment variable before running dcopidlng
  set( KDE3_DCOPIDLNG_EXECUTABLE env KDECONFIG=${KDECONFIG_EXECUTABLE} ${KDE3_DCOPIDLNG_EXECUTABLE}
    CACHE INTERNAL "dcopidlng executable" FORCE )

  message( STATUS "  found 'TDE', version ${TDE_VERSION}" )


Return to bug 882

Lines 13-29 if( NOT TDE_FOUND ) Link Here

(-)a/cmake/modules/FindTDE.cmake (-3 / +12 lines)
13		13
14	message( STATUS "checking for 'TDE'")	14	message( STATUS "checking for 'TDE'")
15		15
		16	pkg_search_module( TDE tqt )
		17
		18	if( NOT TDE_FOUND )
		19	tde_message_fatal( "Unable to find tdelibs!\n Try adding the directory in which the tdelibs.pc file is located\nto the PKG_CONFIG_PATH variable." )
		20	endif( )
		21
16	# if the path is not already defined by user,	22	# if the path is not already defined by user,
17	# find tde-config executable	23	# find tde-config executable
18	if( NOT DEFINED KDECONFIG_EXECUTABLE )	24	if( NOT DEFINED KDECONFIG_EXECUTABLE )
19	find_program( KDECONFIG_EXECUTABLE	25	find_program( KDECONFIG_EXECUTABLE
20	NAMES tde-config	26	NAMES tde-config
21	HINTS ${BIN_INSTALL_DIR} )	27	HINTS "${TDE_PREFIX}/bin" ${BIN_INSTALL_DIR} )
22	if( NOT KDECONFIG_EXECUTABLE )	28	if( NOT KDECONFIG_EXECUTABLE )
23	tde_message_fatal( "tde-config are NOT found." )	29	tde_message_fatal( "tde-config are NOT found." )
24	endif( NOT KDECONFIG_EXECUTABLE )	30	endif( NOT KDECONFIG_EXECUTABLE )
25	endif( NOT DEFINED KDECONFIG_EXECUTABLE )	31	endif( NOT DEFINED KDECONFIG_EXECUTABLE )
26		32
		33	set( ENV{LD_LIBRARY_PATH} "${TDE_LIBDIR}:$ENV{LD_LIBRARY_PATH}" )
27	# check for installed trinity version	34	# check for installed trinity version
28	tde_execute_process(	35	tde_execute_process(
29	COMMAND ${KDECONFIG_EXECUTABLE} --version	36	COMMAND ${KDECONFIG_EXECUTABLE} --version
Lines 41-46 if( NOT TDE_FOUND ) Link Here
41	tde_execute_process(	48	tde_execute_process(
42	COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install ${__type}	49	COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install ${__type}
43	OUTPUT_VARIABLE ${__var}	50	OUTPUT_VARIABLE ${__var}
		51	CACHE INTERNAL "TDE ${__type} path" FORCE
44	OUTPUT_STRIP_TRAILING_WHITESPACE )	52	OUTPUT_STRIP_TRAILING_WHITESPACE )
45	endmacro( __internal_get_path )	53	endmacro( __internal_get_path )
46		54
Lines 57-67 if( NOT TDE_FOUND ) Link Here
57	macro( __internal_find_program __prog __var )	65	macro( __internal_find_program __prog __var )
58	find_program( ${__var}	66	find_program( ${__var}
59	NAMES ${__prog}	67	NAMES ${__prog}
60	HINTS ${TDE_BIN_INSTALL_DIR}	68	HINTS "${TDE_PREFIX}/bin" ${BIN_INSTALL_DIR}
61	OUTPUT_STRIP_TRAILING_WHITESPACE )	69	OUTPUT_STRIP_TRAILING_WHITESPACE )
62	if( NOT ${__var} )	70	if( NOT ${__var} )
63	tde_message_fatal( "${__prog} are NOT found.\n TDELIBS are correctly installed?" )	71	tde_message_fatal( "${__prog} are NOT found.\n TDELIBS are correctly installed?" )
64	endif( NOT ${__var} )	72	endif( NOT ${__var} )
		73	set( ${__var} ${${__var}} CACHE INTERNAL "${__prog} executable" FORCE )
65	endmacro( __internal_find_program )	74	endmacro( __internal_find_program )
66		75
67	__internal_find_program( dcopidl KDE3_DCOPIDL_EXECUTABLE )	76	__internal_find_program( dcopidl KDE3_DCOPIDL_EXECUTABLE )
Lines 75-81 if( NOT TDE_FOUND ) Link Here
75	# if PATH to tde-config is not set, dcopidlng will fail;	84	# if PATH to tde-config is not set, dcopidlng will fail;
76	# for this reason we set KDECONFIG environment variable before running dcopidlng	85	# for this reason we set KDECONFIG environment variable before running dcopidlng
77	set( KDE3_DCOPIDLNG_EXECUTABLE env KDECONFIG=${KDECONFIG_EXECUTABLE} ${KDE3_DCOPIDLNG_EXECUTABLE}	86	set( KDE3_DCOPIDLNG_EXECUTABLE env KDECONFIG=${KDECONFIG_EXECUTABLE} ${KDE3_DCOPIDLNG_EXECUTABLE}
78	CACHE INTERNAL KDE3_DCOPIDLNG_EXECUTABLE FORCE )	87	CACHE INTERNAL "dcopidlng executable" FORCE )
79		88
80	message( STATUS " found 'TDE', version ${TDE_VERSION}" )	89	message( STATUS " found 'TDE', version ${TDE_VERSION}" )
81		90