Add pcre detection to tdelibs CMake files

This closes Bug 569
pull/16/head
Timothy Pearson 13 years ago
parent 87201a3741
commit b911168351

@ -76,6 +76,7 @@ OPTION( WITH_OPENEXR "Enable openexr support" OFF )
OPTION( WITH_UTEMPTER "Use utempter for utmp management" OFF ) OPTION( WITH_UTEMPTER "Use utempter for utmp management" OFF )
OPTION( WITH_AVAHI "Enable AVAHI support" OFF ) OPTION( WITH_AVAHI "Enable AVAHI support" OFF )
OPTION( WITH_ELFICON "Enable ELF embedded icon support" OFF ) OPTION( WITH_ELFICON "Enable ELF embedded icon support" OFF )
OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON )
OPTION( WITH_ASPELL "Enable aspell support" OFF ) OPTION( WITH_ASPELL "Enable aspell support" OFF )
OPTION( WITH_HSPELL "Enable hspell support" OFF ) OPTION( WITH_HSPELL "Enable hspell support" OFF )
@ -736,6 +737,16 @@ if( WITH_ELFICON )
endif( ) 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 ########################## ##### check for aspell ##########################
# we need ASPELL_DATADIR too # we need ASPELL_DATADIR too

@ -369,7 +369,7 @@
#cmakedefine HAVE_PATHS_H 1 #cmakedefine HAVE_PATHS_H 1
/* Define if you have pcreposix libraries and header files. */ /* Define if you have pcreposix libraries and header files. */
#undef HAVE_PCREPOSIX #cmakedefine HAVE_PCREPOSIX 1
/* Define to 1 if you have the `poll' function. */ /* Define to 1 if you have the `poll' function. */
#cmakedefine HAVE_POLL 1 #cmakedefine HAVE_POLL 1

@ -15,10 +15,12 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdecore
${LIBPCRE_INCLUDEDIR}
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TQT_LIBRARY_DIRS}
${LIBPCRE_LIBDIR}
) )
@ -59,6 +61,6 @@ tde_add_lut( keywords.table lexer.lut.h lexer.cpp )
tde_add_library( ${target} SHARED tde_add_library( ${target} SHARED
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 1.2.0 VERSION 1.2.0
LINK tdecore-shared LINK tdecore-shared ${LIBPCRE_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

Loading…
Cancel
Save