Attachment #235 for bug #569

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




  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}/kdecore
  ${LIBPCRE_INCLUDEDIR}
)

link_directories(
  ${TQT_LIBRARY_DIRS}
  ${LIBPCRE_LIBDIR}
)



tde_add_library( ${target} SHARED
  SOURCES ${${target}_SRCS}
  VERSION 1.2.0
  LINK kdecore-shared ${LIBPCRE_LIBRARIES}
  DESTINATION ${LIB_INSTALL_DIR}
)




OPTION( WITH_OPENEXR "Enable openexr support" OFF )
OPTION( WITH_UTEMPTER "Use utempter for utmp management" OFF )
OPTION( WITH_AVAHI "Enable AVAHI support" OFF )
OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON )

OPTION( WITH_ASPELL "Enable aspell support" OFF )
OPTION( WITH_HSPELL "Enable hspell support" OFF )

  endif( WITH_QT3 )
endif( )

##### check for pcre ###########################

if( WITH_PCRE )
  pkg_search_module( LIBPCRE libpcre )
  if( NOT LIBPCRE_FOUND )
      message(FATAL_ERROR "\npcre support are requested, but not found on your system" )
  endif( NOT LIBPCRE_FOUND )
  set( HAVE_PCREPOSIX 1 )
endif( )

##### check for aspell ##########################
# we need ASPELL_DATADIR too


Lines 366-372 Link Here

(-)config.h.cmake (-1 / +1 lines)
366	#cmakedefine HAVE_PATHS_H 1	366	#cmakedefine HAVE_PATHS_H 1
367		367
368	/* Define if you have pcreposix libraries and header files. */	368	/* Define if you have pcreposix libraries and header files. */
369	#undef HAVE_PCREPOSIX	369	#cmakedefine HAVE_PCREPOSIX 1
370		370
371	/* Define to 1 if you have the `poll' function. */	371	/* Define to 1 if you have the `poll' function. */
372	#cmakedefine HAVE_POLL 1	372	#cmakedefine HAVE_POLL 1

Return to bug 569

Lines 15-24 Link Here

(-)kjs/CMakeLists.txt (-1 / +3 lines)
15	${CMAKE_CURRENT_BINARY_DIR}	15	${CMAKE_CURRENT_BINARY_DIR}
16	${CMAKE_BINARY_DIR}	16	${CMAKE_BINARY_DIR}
17	${CMAKE_SOURCE_DIR}/kdecore	17	${CMAKE_SOURCE_DIR}/kdecore
		18	${LIBPCRE_INCLUDEDIR}
18	)	19	)
19		20
20	link_directories(	21	link_directories(
21	${TQT_LIBRARY_DIRS}	22	${TQT_LIBRARY_DIRS}
		23	${LIBPCRE_LIBDIR}
22	)	24	)
23		25
24		26
Lines 59-64 Link Here
59	tde_add_library( ${target} SHARED	61	tde_add_library( ${target} SHARED
60	SOURCES ${${target}_SRCS}	62	SOURCES ${${target}_SRCS}
61	VERSION 1.2.0	63	VERSION 1.2.0
62	LINK kdecore-shared	64	LINK kdecore-shared ${LIBPCRE_LIBRARIES}
63	DESTINATION ${LIB_INSTALL_DIR}	65	DESTINATION ${LIB_INSTALL_DIR}
64	)	66	)

Lines 75-80 Link Here

(-)CMakeLists.txt (+11 lines)
75	OPTION( WITH_OPENEXR "Enable openexr support" OFF )	75	OPTION( WITH_OPENEXR "Enable openexr support" OFF )
76	OPTION( WITH_UTEMPTER "Use utempter for utmp management" OFF )	76	OPTION( WITH_UTEMPTER "Use utempter for utmp management" OFF )
77	OPTION( WITH_AVAHI "Enable AVAHI support" OFF )	77	OPTION( WITH_AVAHI "Enable AVAHI support" OFF )
		78	OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON )
78		79
79	OPTION( WITH_ASPELL "Enable aspell support" OFF )	80	OPTION( WITH_ASPELL "Enable aspell support" OFF )
80	OPTION( WITH_HSPELL "Enable hspell support" OFF )	81	OPTION( WITH_HSPELL "Enable hspell support" OFF )
Lines 715-720 Link Here
715	endif( WITH_QT3 )	716	endif( WITH_QT3 )
716	endif( )	717	endif( )
717		718
		719	##### check for pcre ###########################
		720
		721	if( WITH_PCRE )
		722	pkg_search_module( LIBPCRE libpcre )
		723	if( NOT LIBPCRE_FOUND )
		724	message(FATAL_ERROR "\npcre support are requested, but not found on your system" )
		725	endif( NOT LIBPCRE_FOUND )
		726	set( HAVE_PCREPOSIX 1 )
		727	endif( )
		728
718	##### check for aspell ##########################	729	##### check for aspell ##########################
719	# we need ASPELL_DATADIR too	730	# we need ASPELL_DATADIR too
720		731