Skip to content

Commit 9488837

Browse files
NWilsonNWilson
committed
Fix PCRE2_DEBUG for multi-configuration builds
* Add support for Ninja Multi-Config generator on all platforms * Ensure one build job is using CMake 3.15 * Provide a build type (Debug or RelWithDebInfo) on all CMake builds * Ensure PCRE2_DEBUG=ON is set for: dev.yml builds which use the RelWithDebInfo configuration
1 parent 6f36e8a commit 9488837

File tree

6 files changed

+190
-140
lines changed

6 files changed

+190
-140
lines changed

‎.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
submodules: true
7878

7979
- name: Configure
80-
run: cmake -DPCRE2_SUPPORT_JIT=ON -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' -DCMAKE_C_FLAGS='-Wall -Wextra' -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build
80+
run: cmake -DPCRE2_SUPPORT_JIT=ON -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' -DCMAKE_C_FLAGS='-Wall -Wextra' -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -B build
8181

8282
- name: Build
8383
run: cmake --build build
@@ -115,13 +115,13 @@ jobs:
115115
run: cmake -DPCRE2_SUPPORT_JIT=ON -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build -A Win32
116116

117117
- name: Build
118-
run: cmake --build build
118+
run: cmake --build build --config RelWithDebInfo
119119

120120
- name: Test
121121
id: test
122122
run: |
123123
cd build
124-
ctest -C Debug .
124+
ctest -C RelWithDebInfo .
125125
126126
- name: Debug
127127
if: ${{ failure() && steps.test.outcome == 'failure' }}

‎.github/workflows/dev.yml

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ jobs:
7070
wasp:
7171
name: No JIT
7272
runs-on: ubuntu-24.04
73+
env:
74+
CMAKE_VER: "3.15.7"
7375
steps:
7476
- name: Checkout
7577
uses: actions/checkout@v4
@@ -79,23 +81,30 @@ jobs:
7981
- name: Prepare
8082
run: |
8183
sudo apt-get -qq update
82-
sudo apt-get -qq install language-pack-fr
83-
./autogen.sh
84+
sudo apt-get -qq install language-pack-fr ninja-build
8485
85-
- name: Configure
86-
run: ./configure CC='clang -fsanitize=undefined,address,integer -fno-sanitize-recover=undefined,integer -fno-sanitize=unsigned-shift-base,function' --enable-pcre2-16 --enable-pcre2-32 --enable-debug
86+
- name: Cache CMake
87+
uses: actions/cache@v4
88+
with:
89+
key: cmake-${{ env.CMAKE_VER }}-Linux-x86_64
90+
path: cmake-${{ env.CMAKE_VER }}-Linux-x86_64.tar.gz
8791

88-
- name: Build
89-
run: make CPPFLAGS='-pedantic -Wall -Wextra -Wpedantic -Wdeclaration-after-statement -Wshadow -Wno-overlength-strings -Werror -Wno-error=incompatible-pointer-types-discards-qualifiers' -j3
92+
- name: Install CMake
93+
run: |
94+
[ -f cmake-${CMAKE_VER}-Linux-x86_64.tar.gz ] || curl -L -S -O "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VER}/cmake-${CMAKE_VER}-Linux-x86_64.tar.gz"
95+
tar -xz -f cmake-${CMAKE_VER}-Linux-x86_64.tar.gz
96+
realpath "cmake-${CMAKE_VER}-Linux-x86_64/bin" >> "$GITHUB_PATH"
9097
91-
- name: Test (main test script)
92-
run: ./RunTest
98+
- name: Configure
99+
run: |
100+
cmake --version
101+
CC='clang' CFLAGS='-fsanitize=undefined,address,integer -fno-sanitize-recover=undefined,integer -fno-sanitize=unsigned-shift-base,function -pedantic -Wall -Wextra -Wpedantic -Wdeclaration-after-statement -Wshadow -Wno-overlength-strings -Werror -Wno-error=incompatible-pointer-types-discards-qualifiers' cmake -G Ninja -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -DPCRE2_DEBUG=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -B build
93102
94-
- name: Test (pcre2grep test script)
95-
run: ./RunGrepTest
103+
- name: Build
104+
run: ninja -C build
96105

97-
- name: Test (pcre2posix program)
98-
run: ./pcre2posix_test -v
106+
- name: Test
107+
run: ninja -C build test
99108

100109
bat:
101110
name: 32bit MSVC
@@ -107,16 +116,16 @@ jobs:
107116
submodules: true
108117

109118
- name: Configure
110-
run: cmake -DPCRE2_SUPPORT_JIT=ON -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -DPCRE2GREP_SUPPORT_CALLOUT_FORK=OFF -DPCRE2_DEBUG=ON -DPCRE2_NEWLINE=ANYCRLF -DPCRE2_STATIC_PIC=ON -DPCRE2_STATIC_RUNTIME=ON -DPCRE2_SUPPORT_BSR_ANYCRLF=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_VERBOSE_MAKEFILE=ON -B build -A Win32
119+
run: cmake -DPCRE2_SUPPORT_JIT=ON -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -DPCRE2GREP_SUPPORT_CALLOUT_FORK=OFF -DPCRE2_DEBUG=ON -DPCRE2_NEWLINE=ANYCRLF -DPCRE2_STATIC_PIC=ON -DPCRE2_STATIC_RUNTIME=ON -DPCRE2_SUPPORT_BSR_ANYCRLF=ON -DPCRE2_DEBUG=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_VERBOSE_MAKEFILE=ON -B build -A Win32
111120

112121
- name: Build
113-
run: cmake --build build
122+
run: cmake --build build --config RelWithDebInfo
114123

115124
- name: Test
116125
shell: cmd
117126
run: |
118127
cd build
119-
ctest -C Debug .
128+
ctest -C RelWithDebInfo .
120129
type Testing\Temporary\LastTest.log
121130
122131
pterodactyl:
@@ -132,7 +141,7 @@ jobs:
132141
run: cmake -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -DPCRE2_DEBUG=ON -DPCRE2_BUILD_PCRE2GREP=OFF -DPCRE2_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build
133142

134143
- name: Build
135-
run: cmake --build build
144+
run: cmake --build build --config Debug
136145

137146
- name: Test
138147
shell: cmd
@@ -176,7 +185,7 @@ jobs:
176185
apt-get -qq install cmake ninja-build
177186
178187
- name: Configure
179-
run: cmake -G Ninja -B build -DPCRE2_BUILD_PCRE2_8=OFF -DPCRE2_BUILD_PCRE2_32=ON -DPCRE2_NEVER_BACKSLASH_C=ON
188+
run: cmake -G Ninja -B build -DPCRE2_BUILD_PCRE2_8=OFF -DPCRE2_BUILD_PCRE2_32=ON -DPCRE2_NEVER_BACKSLASH_C=ON -DPCRE2_DEBUG=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
180189

181190
- name: Build
182191
run: cmake --build build

‎CMakeLists.txt

Lines changed: 87 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,8 @@
103103
# 2023-01-15 Carlo added C99 as the minimum required
104104
# 2023-08-06 PH added support for setting variable length lookbehind maximum
105105

106-
# Increased minimum to 3.5 to workaround deprecated backward compatibility
107-
# since 3.27.
108-
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
106+
# Increased minimum to 3.15 to allow use of string(REPEAT).
107+
cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
109108
project(PCRE2 C)
110109
set(CMAKE_C_STANDARD 99)
111110
set(CMAKE_C_STANDARD_REQUIRED TRUE)
@@ -239,7 +238,8 @@ OPTION(PCRE2_BUILD_PCRE2_32 "Build 32 bit PCRE2 library" OFF)
239238

240239
OPTION(PCRE2_STATIC_PIC "Build the static library with the option position independent code enabled." OFF)
241240

242-
OPTION(PCRE2_DEBUG "Include debugging code" OFF)
241+
set(PCRE2_DEBUG "IfDebugBuild" CACHE STRING "Include debugging code")
242+
set_property(CACHE PCRE2_DEBUG PROPERTY STRINGS "IfDebugBuild" "ON" "OFF")
243243

244244
OPTION(PCRE2_DISABLE_PERCENT_ZT "Disable the use of %zu and %td (rarely needed)" OFF)
245245

@@ -439,7 +439,7 @@ IF(PCRE2_SUPPORT_JIT_SEALLOC)
439439
UNSET(CMAKE_REQUIRED_DEFINITIONS)
440440
IF(${REQUIRED})
441441
IF(${CMAKE_SYSTEM_NAME} MATCHES Linux|NetBSD)
442-
ADD_DEFINITIONS(-D_GNU_SOURCE)
442+
ADD_COMPILE_DEFINITIONS(_GNU_SOURCE)
443443
SET(SLJIT_PROT_EXECUTABLE_ALLOCATOR 1)
444444
ELSE(${CMAKE_SYSTEM_NAME} MATCHES Linux|NetBSD)
445445
MESSAGE(FATAL_ERROR "Your configuration is not supported")
@@ -687,10 +687,16 @@ ENDIF(MSVC AND PCRE2_STATIC_RUNTIME)
687687

688688
# Build setup
689689

690-
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
690+
ADD_COMPILE_DEFINITIONS(HAVE_CONFIG_H)
691+
692+
if(PCRE2_DEBUG STREQUAL "IfDebugBuild")
693+
ADD_COMPILE_DEFINITIONS("$<$<CONFIG:Debug>:PCRE2_DEBUG>")
694+
elseif(PCRE2_DEBUG)
695+
ADD_COMPILE_DEFINITIONS("PCRE2_DEBUG")
696+
endif()
691697

692698
IF(MSVC)
693-
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS)
699+
ADD_COMPILE_DEFINITIONS(_CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS)
694700
ENDIF(MSVC)
695701

696702
SET(CMAKE_INCLUDE_CURRENT_DIR 1)
@@ -1029,6 +1035,8 @@ MESSAGE(\" \")
10291035
"#! /bin/sh
10301036
# This is a generated file.
10311037
srcdir=${PROJECT_SOURCE_DIR}
1038+
pcre2test=${PROJECT_BINARY_DIR}/pcre2test
1039+
test -z \"$CMAKE_CONFIG_TYPE\" || pcre2test=${PROJECT_BINARY_DIR}/$CMAKE_CONFIG_TYPE/pcre2test
10321040
. ${PROJECT_SOURCE_DIR}/RunTest
10331041
if test \"$?\" != \"0\"; then exit 1; fi
10341042
# End
@@ -1043,6 +1051,10 @@ if test \"$?\" != \"0\"; then exit 1; fi
10431051
"#! /bin/sh
10441052
# This is a generated file.
10451053
srcdir=${PROJECT_SOURCE_DIR}
1054+
pcre2grep=${PROJECT_BINARY_DIR}/pcre2grep
1055+
test -z \"$CMAKE_CONFIG_TYPE\" || pcre2grep=${PROJECT_BINARY_DIR}/$CMAKE_CONFIG_TYPE/pcre2grep
1056+
pcre2test=${PROJECT_BINARY_DIR}/pcre2test
1057+
test -z \"$CMAKE_CONFIG_TYPE\" || pcre2test=${PROJECT_BINARY_DIR}/$CMAKE_CONFIG_TYPE/pcre2test
10461058
. ${PROJECT_SOURCE_DIR}/RunGrepTest
10471059
if test \"$?\" != \"0\"; then exit 1; fi
10481060
# End
@@ -1147,81 +1159,100 @@ IF(PCRE2_HEAP_MATCH_RECURSE)
11471159
ENDIF(PCRE2_HEAP_MATCH_RECURSE)
11481160

11491161
IF(PCRE2_SHOW_REPORT)
1150-
STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype)
1151-
IF (CMAKE_C_FLAGS)
1152-
SET(cfsp " ")
1153-
ENDIF(CMAKE_C_FLAGS)
11541162
MESSAGE(STATUS "")
11551163
MESSAGE(STATUS "")
11561164
MESSAGE(STATUS "PCRE2-${PCRE2_MAJOR}.${PCRE2_MINOR} configuration summary:")
11571165
MESSAGE(STATUS "")
1158-
MESSAGE(STATUS " Install prefix .................. : ${CMAKE_INSTALL_PREFIX}")
1159-
MESSAGE(STATUS " C compiler ...................... : ${CMAKE_C_COMPILER}")
1160-
MESSAGE(STATUS " C compiler flags ................ : ${CMAKE_C_FLAGS}${cfsp}${CMAKE_C_FLAGS_${buildtype}}")
1166+
MESSAGE(STATUS " Install prefix .................... : ${CMAKE_INSTALL_PREFIX}")
1167+
MESSAGE(STATUS " C compiler ........................ : ${CMAKE_C_COMPILER}")
1168+
if (CMAKE_CONFIGURATION_TYPES)
1169+
FOREACH (config IN LISTS CMAKE_CONFIGURATION_TYPES)
1170+
STRING(TOUPPER "${config}" buildtype)
1171+
STRING(LENGTH " (${config})" buildtypelen)
1172+
MATH(EXPR dotslen "18 - ${buildtypelen}")
1173+
STRING(REPEAT "." ${dotslen} dots)
1174+
IF (CMAKE_C_FLAGS)
1175+
SET(cfsp " ")
1176+
ENDIF()
1177+
MESSAGE(STATUS " C compiler flags (${config}) ${dots} : ${CMAKE_C_FLAGS}${cfsp}${CMAKE_C_FLAGS_${buildtype}}")
1178+
ENDFOREACH()
1179+
ELSE()
1180+
STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype)
1181+
IF (CMAKE_C_FLAGS)
1182+
SET(cfsp " ")
1183+
ENDIF()
1184+
MESSAGE(STATUS " C compiler flags .................. : ${CMAKE_C_FLAGS}${cfsp}${CMAKE_C_FLAGS_${buildtype}}")
1185+
ENDIF()
1186+
11611187
MESSAGE(STATUS "")
1162-
MESSAGE(STATUS " Build 8 bit PCRE2 library ....... : ${PCRE2_BUILD_PCRE2_8}")
1163-
MESSAGE(STATUS " Build 16 bit PCRE2 library ...... : ${PCRE2_BUILD_PCRE2_16}")
1164-
MESSAGE(STATUS " Build 32 bit PCRE2 library ...... : ${PCRE2_BUILD_PCRE2_32}")
1165-
MESSAGE(STATUS " Include debugging code ...........: ${PCRE2_DEBUG}")
1166-
MESSAGE(STATUS " Enable JIT compiling support .... : ${PCRE2_SUPPORT_JIT}")
1167-
MESSAGE(STATUS " Use SELinux allocator in JIT .... : ${PCRE2_SUPPORT_JIT_SEALLOC}")
1168-
MESSAGE(STATUS " Enable Unicode support .......... : ${PCRE2_SUPPORT_UNICODE}")
1169-
MESSAGE(STATUS " Newline char/sequence ........... : ${PCRE2_NEWLINE}")
1170-
MESSAGE(STATUS " \\R matches only ANYCRLF ......... : ${PCRE2_SUPPORT_BSR_ANYCRLF}")
1171-
MESSAGE(STATUS " \\C is disabled .................. : ${PCRE2_NEVER_BACKSLASH_C}")
1172-
MESSAGE(STATUS " EBCDIC coding ................... : ${PCRE2_EBCDIC}")
1173-
MESSAGE(STATUS " EBCDIC coding with NL=0x25 ...... : ${PCRE2_EBCDIC_NL25}")
1174-
MESSAGE(STATUS " Rebuild char tables ............. : ${PCRE2_REBUILD_CHARTABLES}")
1175-
MESSAGE(STATUS " Internal link size .............. : ${PCRE2_LINK_SIZE}")
1176-
MESSAGE(STATUS " Maximum variable lookbehind ..... : ${PCRE2_MAX_VARLOOKBEHIND}")
1177-
MESSAGE(STATUS " Parentheses nest limit .......... : ${PCRE2_PARENS_NEST_LIMIT}")
1178-
MESSAGE(STATUS " Heap limit ...................... : ${PCRE2_HEAP_LIMIT}")
1179-
MESSAGE(STATUS " Match limit ..................... : ${PCRE2_MATCH_LIMIT}")
1180-
MESSAGE(STATUS " Match depth limit ............... : ${PCRE2_MATCH_LIMIT_DEPTH}")
1181-
MESSAGE(STATUS " Build shared libs ............... : ${BUILD_SHARED_LIBS}")
1182-
MESSAGE(STATUS " Build static libs ............... : ${BUILD_STATIC_LIBS}")
1183-
MESSAGE(STATUS " with PIC enabled ............. : ${PCRE2_STATIC_PIC}")
1184-
MESSAGE(STATUS " Build pcre2grep ................. : ${PCRE2_BUILD_PCRE2GREP}")
1185-
MESSAGE(STATUS " Enable JIT in pcre2grep ......... : ${PCRE2GREP_SUPPORT_JIT}")
1186-
MESSAGE(STATUS " Enable callouts in pcre2grep .... : ${PCRE2GREP_SUPPORT_CALLOUT}")
1187-
MESSAGE(STATUS " Enable callout fork in pcre2grep. : ${PCRE2GREP_SUPPORT_CALLOUT_FORK}")
1188-
MESSAGE(STATUS " Buffer size for pcre2grep ....... : ${PCRE2GREP_BUFSIZE}")
1189-
MESSAGE(STATUS " Build tests (implies pcre2test .. : ${PCRE2_BUILD_TESTS}")
1188+
IF(CMAKE_CONFIGURATION_TYPES)
1189+
MESSAGE(STATUS " Build configurations .............. : ${CMAKE_CONFIGURATION_TYPES}")
1190+
ELSE()
1191+
MESSAGE(STATUS " Build type ........................ : ${CMAKE_BUILD_TYPE}")
1192+
ENDIF()
1193+
MESSAGE(STATUS " Build 8 bit PCRE2 library ......... : ${PCRE2_BUILD_PCRE2_8}")
1194+
MESSAGE(STATUS " Build 16 bit PCRE2 library ........ : ${PCRE2_BUILD_PCRE2_16}")
1195+
MESSAGE(STATUS " Build 32 bit PCRE2 library ........ : ${PCRE2_BUILD_PCRE2_32}")
1196+
MESSAGE(STATUS " Include debugging code ............ : ${PCRE2_DEBUG}")
1197+
MESSAGE(STATUS " Enable JIT compiling support ...... : ${PCRE2_SUPPORT_JIT}")
1198+
MESSAGE(STATUS " Use SELinux allocator in JIT ...... : ${PCRE2_SUPPORT_JIT_SEALLOC}")
1199+
MESSAGE(STATUS " Enable Unicode support ............ : ${PCRE2_SUPPORT_UNICODE}")
1200+
MESSAGE(STATUS " Newline char/sequence ............. : ${PCRE2_NEWLINE}")
1201+
MESSAGE(STATUS " \\R matches only ANYCRLF ........... : ${PCRE2_SUPPORT_BSR_ANYCRLF}")
1202+
MESSAGE(STATUS " \\C is disabled .................... : ${PCRE2_NEVER_BACKSLASH_C}")
1203+
MESSAGE(STATUS " EBCDIC coding ..................... : ${PCRE2_EBCDIC}")
1204+
MESSAGE(STATUS " EBCDIC coding with NL=0x25 ........ : ${PCRE2_EBCDIC_NL25}")
1205+
MESSAGE(STATUS " Rebuild char tables ............... : ${PCRE2_REBUILD_CHARTABLES}")
1206+
MESSAGE(STATUS " Internal link size ................ : ${PCRE2_LINK_SIZE}")
1207+
MESSAGE(STATUS " Maximum variable lookbehind ....... : ${PCRE2_MAX_VARLOOKBEHIND}")
1208+
MESSAGE(STATUS " Parentheses nest limit ............ : ${PCRE2_PARENS_NEST_LIMIT}")
1209+
MESSAGE(STATUS " Heap limit ........................ : ${PCRE2_HEAP_LIMIT}")
1210+
MESSAGE(STATUS " Match limit ....................... : ${PCRE2_MATCH_LIMIT}")
1211+
MESSAGE(STATUS " Match depth limit ................. : ${PCRE2_MATCH_LIMIT_DEPTH}")
1212+
MESSAGE(STATUS " Build shared libs ................. : ${BUILD_SHARED_LIBS}")
1213+
MESSAGE(STATUS " Build static libs ................. : ${BUILD_STATIC_LIBS}")
1214+
MESSAGE(STATUS " with PIC enabled ............... : ${PCRE2_STATIC_PIC}")
1215+
MESSAGE(STATUS " Build pcre2grep ................... : ${PCRE2_BUILD_PCRE2GREP}")
1216+
MESSAGE(STATUS " Enable JIT in pcre2grep ........... : ${PCRE2GREP_SUPPORT_JIT}")
1217+
MESSAGE(STATUS " Enable callouts in pcre2grep ...... : ${PCRE2GREP_SUPPORT_CALLOUT}")
1218+
MESSAGE(STATUS " Enable callout fork in pcre2grep .. : ${PCRE2GREP_SUPPORT_CALLOUT_FORK}")
1219+
MESSAGE(STATUS " Buffer size for pcre2grep ......... : ${PCRE2GREP_BUFSIZE}")
1220+
MESSAGE(STATUS " Build tests (implies pcre2test .... : ${PCRE2_BUILD_TESTS}")
11901221
MESSAGE(STATUS " and pcre2grep)")
11911222
IF(ZLIB_FOUND)
1192-
MESSAGE(STATUS " Link pcre2grep with libz ........ : ${PCRE2_SUPPORT_LIBZ}")
1223+
MESSAGE(STATUS " Link pcre2grep with libz .......... : ${PCRE2_SUPPORT_LIBZ}")
11931224
ELSE(ZLIB_FOUND)
1194-
MESSAGE(STATUS " Link pcre2grep with libz ........ : Library not found" )
1225+
MESSAGE(STATUS " Link pcre2grep with libz .......... : Library not found" )
11951226
ENDIF(ZLIB_FOUND)
11961227
IF(BZIP2_FOUND)
1197-
MESSAGE(STATUS " Link pcre2grep with libbz2 ...... : ${PCRE2_SUPPORT_LIBBZ2}")
1228+
MESSAGE(STATUS " Link pcre2grep with libbz2 ........ : ${PCRE2_SUPPORT_LIBBZ2}")
11981229
ELSE(BZIP2_FOUND)
1199-
MESSAGE(STATUS " Link pcre2grep with libbz2 ...... : Library not found" )
1230+
MESSAGE(STATUS " Link pcre2grep with libbz2 ........ : Library not found" )
12001231
ENDIF(BZIP2_FOUND)
12011232
IF(EDITLINE_FOUND)
1202-
MESSAGE(STATUS " Link pcre2test with libeditline . : ${PCRE2_SUPPORT_LIBEDIT}")
1233+
MESSAGE(STATUS " Link pcre2test with libeditline ... : ${PCRE2_SUPPORT_LIBEDIT}")
12031234
ELSE(EDITLINE_FOUND)
1204-
MESSAGE(STATUS " Link pcre2test with libeditline . : Library not found" )
1235+
MESSAGE(STATUS " Link pcre2test with libeditline ... : Library not found" )
12051236
ENDIF(EDITLINE_FOUND)
12061237
IF(READLINE_FOUND)
1207-
MESSAGE(STATUS " Link pcre2test with libreadline . : ${PCRE2_SUPPORT_LIBREADLINE}")
1238+
MESSAGE(STATUS " Link pcre2test with libreadline ... : ${PCRE2_SUPPORT_LIBREADLINE}")
12081239
ELSE(READLINE_FOUND)
1209-
MESSAGE(STATUS " Link pcre2test with libreadline . : Library not found" )
1240+
MESSAGE(STATUS " Link pcre2test with libreadline ... : Library not found" )
12101241
ENDIF(READLINE_FOUND)
1211-
MESSAGE(STATUS " Support Valgrind .................: ${PCRE2_SUPPORT_VALGRIND}")
1242+
MESSAGE(STATUS " Support Valgrind .................. : ${PCRE2_SUPPORT_VALGRIND}")
12121243
IF(PCRE2_DISABLE_PERCENT_ZT)
1213-
MESSAGE(STATUS " Use %zu and %td ..................: OFF" )
1244+
MESSAGE(STATUS " Use %zu and %td ................... : OFF" )
12141245
ELSE(PCRE2_DISABLE_PERCENT_ZT)
1215-
MESSAGE(STATUS " Use %zu and %td ..................: AUTO" )
1246+
MESSAGE(STATUS " Use %zu and %td ................... : AUTO" )
12161247
ENDIF(PCRE2_DISABLE_PERCENT_ZT)
12171248

12181249
IF(MINGW AND BUILD_SHARED_LIBS)
1219-
MESSAGE(STATUS " Non-standard dll names (prefix) . : ${NON_STANDARD_LIB_PREFIX}")
1220-
MESSAGE(STATUS " Non-standard dll names (suffix) . : ${NON_STANDARD_LIB_SUFFIX}")
1250+
MESSAGE(STATUS " Non-standard dll names (prefix) ... : ${NON_STANDARD_LIB_PREFIX}")
1251+
MESSAGE(STATUS " Non-standard dll names (suffix) ... : ${NON_STANDARD_LIB_SUFFIX}")
12211252
ENDIF(MINGW AND BUILD_SHARED_LIBS)
12221253

12231254
IF(MSVC)
1224-
MESSAGE(STATUS " Install MSVC .pdb files ..........: ${INSTALL_MSVC_PDB}")
1255+
MESSAGE(STATUS " Install MSVC .pdb files ........... : ${INSTALL_MSVC_PDB}")
12251256
ENDIF(MSVC)
12261257

12271258
MESSAGE(STATUS "")

‎RunGrepTest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ unset cp ls mv rm
2525
# valgrind settings when requested.
2626

2727
builddir=`pwd`
28-
pcre2grep=$builddir/pcre2grep
29-
pcre2test=$builddir/pcre2test
28+
: ${pcre2grep:=$builddir/pcre2grep}
29+
: ${pcre2test:=$builddir/pcre2test}
3030

3131
if [ ! -x $pcre2grep ] ; then
3232
echo "** $pcre2grep does not exist or is not executable."

0 commit comments

Comments
 (0)