From 3ccc8ad970ccf6e4c5e2abef212af44e17eb0fca Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 17 Aug 2024 22:26:29 +0900 Subject: kjs: use libpcre2 instead of libpcre Signed-off-by: Michele Calgaro (cherry picked from commit 7740e825a683a9cc84f8422c94109c5fcc4beb8e) --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index d01650535..41a4ed3ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,7 +111,7 @@ option( WITH_OPENEXR "Enable openexr support" ${WITH_ALL_OPTIONS} ) option( WITH_UTEMPTER "Use utempter for utmp management" ${WITH_ALL_OPTIONS} ) option( WITH_AVAHI "Enable AVAHI support" ${WITH_ALL_OPTIONS} ) option( WITH_ELFICON "Enable ELF embedded icon support" ${WITH_ALL_OPTIONS} ) -option( WITH_PCRE "Enable pcre regex support for kjs" ON ) +option( WITH_PCRE2 "Enable pcre2 regex support for kjs" ON ) option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) option( WITH_INOTIFY "Enable inotify support for tdeio" ON ) option( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} ) @@ -1223,14 +1223,14 @@ if( WITH_ELFICON ) endif( ) -##### check for pcre ########################### +##### check for pcre2 ########################### -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 ) +if( WITH_PCRE2 ) + pkg_check_modules( LIBPCRE2 libpcre2-8 libpcre2-posix ) + if( NOT LIBPCRE2_FOUND ) + tde_message_fatal( "pcre2 support was requested, but not found on your system" ) + endif( ) + set( HAVE_PCRE2POSIX 1 ) endif( ) -- cgit v1.2.1