Correct libpcre2posix typos (should be libpcre2-posix).
This commit is contained in:
parent
2c2b0febef
commit
9afb978ae4
|
@ -511,18 +511,18 @@ ADD_LIBRARY(pcre2-8 ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/conf
|
||||||
SET_PROPERTY(TARGET pcre2-8
|
SET_PROPERTY(TARGET pcre2-8
|
||||||
PROPERTY COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=8)
|
PROPERTY COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=8)
|
||||||
SET(targets ${targets} pcre2-8)
|
SET(targets ${targets} pcre2-8)
|
||||||
ADD_LIBRARY(pcre2posix ${PCRE2POSIX_HEADERS} ${PCRE2POSIX_SOURCES})
|
ADD_LIBRARY(pcre2-posix ${PCRE2POSIX_HEADERS} ${PCRE2POSIX_SOURCES})
|
||||||
SET_PROPERTY(TARGET pcre2posix
|
SET_PROPERTY(TARGET pcre2-posix
|
||||||
PROPERTY COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=8)
|
PROPERTY COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=8)
|
||||||
SET(targets ${targets} pcre2posix)
|
SET(targets ${targets} pcre2-posix)
|
||||||
TARGET_LINK_LIBRARIES(pcre2posix pcre2-8)
|
TARGET_LINK_LIBRARIES(pcre2-posix pcre2-8)
|
||||||
|
|
||||||
IF(MINGW AND NOT PCRE2_STATIC)
|
IF(MINGW AND NOT PCRE2_STATIC)
|
||||||
IF(NON_STANDARD_LIB_PREFIX)
|
IF(NON_STANDARD_LIB_PREFIX)
|
||||||
SET_TARGET_PROPERTIES(pcre2-8 pcre2posix PROPERTIES PREFIX "")
|
SET_TARGET_PROPERTIES(pcre2-8 pcre2-posix PROPERTIES PREFIX "")
|
||||||
ENDIF(NON_STANDARD_LIB_PREFIX)
|
ENDIF(NON_STANDARD_LIB_PREFIX)
|
||||||
IF(NON_STANDARD_LIB_SUFFIX)
|
IF(NON_STANDARD_LIB_SUFFIX)
|
||||||
SET_TARGET_PROPERTIES(pcre2-8 pcre2posix PROPERTIES SUFFIX "-0.dll")
|
SET_TARGET_PROPERTIES(pcre2-8 pcre2-posix PROPERTIES SUFFIX "-0.dll")
|
||||||
ENDIF(NON_STANDARD_LIB_SUFFIX)
|
ENDIF(NON_STANDARD_LIB_SUFFIX)
|
||||||
ENDIF(MINGW AND NOT PCRE2_STATIC)
|
ENDIF(MINGW AND NOT PCRE2_STATIC)
|
||||||
ENDIF(PCRE2_BUILD_PCRE2_8)
|
ENDIF(PCRE2_BUILD_PCRE2_8)
|
||||||
|
@ -570,7 +570,7 @@ IF(PCRE2_BUILD_PCRE2GREP)
|
||||||
SET_PROPERTY(TARGET pcre2grep
|
SET_PROPERTY(TARGET pcre2grep
|
||||||
PROPERTY COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=8)
|
PROPERTY COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=8)
|
||||||
SET(targets ${targets} pcre2grep)
|
SET(targets ${targets} pcre2grep)
|
||||||
TARGET_LINK_LIBRARIES(pcre2grep pcre2posix ${PCRE2GREP_LIBS})
|
TARGET_LINK_LIBRARIES(pcre2grep pcre2-posix ${PCRE2GREP_LIBS})
|
||||||
ENDIF(PCRE2_BUILD_PCRE2GREP)
|
ENDIF(PCRE2_BUILD_PCRE2GREP)
|
||||||
|
|
||||||
# Testing
|
# Testing
|
||||||
|
@ -583,7 +583,7 @@ IF(PCRE2_BUILD_TESTS)
|
||||||
ADD_EXECUTABLE(pcre2test ${PCRE2TEST_SOURCES})
|
ADD_EXECUTABLE(pcre2test ${PCRE2TEST_SOURCES})
|
||||||
SET(targets ${targets} pcre2test)
|
SET(targets ${targets} pcre2test)
|
||||||
IF(PCRE2_BUILD_PCRE2_8)
|
IF(PCRE2_BUILD_PCRE2_8)
|
||||||
LIST(APPEND PCRE2TEST_LIBS pcre2posix pcre2-8)
|
LIST(APPEND PCRE2TEST_LIBS pcre2-posix pcre2-8)
|
||||||
ENDIF(PCRE2_BUILD_PCRE2_8)
|
ENDIF(PCRE2_BUILD_PCRE2_8)
|
||||||
IF(PCRE2_BUILD_PCRE2_16)
|
IF(PCRE2_BUILD_PCRE2_16)
|
||||||
LIST(APPEND PCRE2TEST_LIBS pcre2-16)
|
LIST(APPEND PCRE2TEST_LIBS pcre2-16)
|
||||||
|
|
|
@ -175,6 +175,10 @@ nobody ask for this in PCRE1?)
|
||||||
PCRE2_H_IDEMPOTENT_GUARD and PCRE2_UCP_H_IDEMPOTENT_GUARD to be more standard
|
PCRE2_H_IDEMPOTENT_GUARD and PCRE2_UCP_H_IDEMPOTENT_GUARD to be more standard
|
||||||
compliant and unique.
|
compliant and unique.
|
||||||
|
|
||||||
|
26. pcre2-config --libs-posix was listing -lpcre2posix instead of
|
||||||
|
-lpcre2-posix. Also, the CMake build process was building the library with the
|
||||||
|
wrong name.
|
||||||
|
|
||||||
|
|
||||||
Version 10.22 29-July-2016
|
Version 10.22 29-July-2016
|
||||||
--------------------------
|
--------------------------
|
||||||
|
|
8
README
8
README
|
@ -44,7 +44,7 @@ wrappers.
|
||||||
|
|
||||||
The distribution does contain a set of C wrapper functions for the 8-bit
|
The distribution does contain a set of C wrapper functions for the 8-bit
|
||||||
library that are based on the POSIX regular expression API (see the pcre2posix
|
library that are based on the POSIX regular expression API (see the pcre2posix
|
||||||
man page). These can be found in a library called libpcre2posix. Note that this
|
man page). These can be found in a library called libpcre2-posix. Note that this
|
||||||
just provides a POSIX calling interface to PCRE2; the regular expressions
|
just provides a POSIX calling interface to PCRE2; the regular expressions
|
||||||
themselves still follow Perl syntax and semantics. The POSIX API is restricted,
|
themselves still follow Perl syntax and semantics. The POSIX API is restricted,
|
||||||
and does not give full access to all of PCRE2's facilities.
|
and does not give full access to all of PCRE2's facilities.
|
||||||
|
@ -58,8 +58,8 @@ renamed or pointed at by a link.
|
||||||
If you are using the POSIX interface to PCRE2 and there is already a POSIX
|
If you are using the POSIX interface to PCRE2 and there is already a POSIX
|
||||||
regex library installed on your system, as well as worrying about the regex.h
|
regex library installed on your system, as well as worrying about the regex.h
|
||||||
header file (as mentioned above), you must also take care when linking programs
|
header file (as mentioned above), you must also take care when linking programs
|
||||||
to ensure that they link with PCRE2's libpcre2posix library. Otherwise they may
|
to ensure that they link with PCRE2's libpcre2-posix library. Otherwise they
|
||||||
pick up the POSIX functions of the same name from the other library.
|
may pick up the POSIX functions of the same name from the other library.
|
||||||
|
|
||||||
One way of avoiding this confusion is to compile PCRE2 with the addition of
|
One way of avoiding this confusion is to compile PCRE2 with the addition of
|
||||||
-Dregcomp=PCRE2regcomp (and similarly for the other POSIX functions) to the
|
-Dregcomp=PCRE2regcomp (and similarly for the other POSIX functions) to the
|
||||||
|
@ -835,7 +835,7 @@ The distribution should contain the files listed below.
|
||||||
libpcre2-8.pc.in template for libpcre2-8.pc for pkg-config
|
libpcre2-8.pc.in template for libpcre2-8.pc for pkg-config
|
||||||
libpcre2-16.pc.in template for libpcre2-16.pc for pkg-config
|
libpcre2-16.pc.in template for libpcre2-16.pc for pkg-config
|
||||||
libpcre2-32.pc.in template for libpcre2-32.pc for pkg-config
|
libpcre2-32.pc.in template for libpcre2-32.pc for pkg-config
|
||||||
libpcre2posix.pc.in template for libpcre2posix.pc for pkg-config
|
libpcre2-posix.pc.in template for libpcre2-posix.pc for pkg-config
|
||||||
ltmain.sh file used to build a libtool script
|
ltmain.sh file used to build a libtool script
|
||||||
missing ) common stub for a few missing GNU programs while
|
missing ) common stub for a few missing GNU programs while
|
||||||
) installing, generated by automake
|
) installing, generated by automake
|
||||||
|
|
|
@ -86,7 +86,7 @@ while test $# -gt 0; do
|
||||||
;;
|
;;
|
||||||
--libs-posix)
|
--libs-posix)
|
||||||
if test @enable_pcre2_8@ = yes ; then
|
if test @enable_pcre2_8@ = yes ; then
|
||||||
echo $libS$libR -lpcre2posix -lpcre2-8
|
echo $libS$libR -lpcre2-posix -lpcre2-8
|
||||||
else
|
else
|
||||||
echo "${usage}" 1>&2
|
echo "${usage}" 1>&2
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue