diff options
| author | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2011-09-12 11:38:03 +0000 |
|---|---|---|
| committer | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2011-09-12 11:38:03 +0000 |
| commit | 09f7fbdfcb63f22192a191ed818c1d05a22cb983 (patch) | |
| tree | 35fc9d473cd6bdf867739af11ff354ed170e7e3f | |
| parent | 872e41011c69ee598dbdd32444dcde8fa30a23ee (diff) | |
| download | pcre-09f7fbdfcb63f22192a191ed818c1d05a22cb983.tar.gz | |
Fix CMake for release candidate; doc tidies.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@692 2f5784b3-3f2a-0410-8824-cb99058d5e15
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rw-r--r-- | doc/html/pcre_assign_jit_stack.html | 2 | ||||
| -rw-r--r-- | doc/html/pcre_jit_stack_alloc.html | 2 | ||||
| -rw-r--r-- | doc/html/pcreapi.html | 2 |
4 files changed, 9 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bab08c..dc1a8ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -217,8 +217,6 @@ ENDIF(PCRE_SUPPORT_UNICODE_PROPERTIES) IF(PCRE_SUPPORT_JIT) SET(SUPPORT_JIT 1) -ELSE - SET(PCRE_SUPPORT_PCREGREP_JIT 0) ENDIF(PCRE_SUPPORT_JIT) IF(PCRE_SUPPORT_PCREGREP_JIT) @@ -450,11 +448,11 @@ IF(PCRE_BUILD_TESTS) SET(targets ${targets} pcretest) TARGET_LINK_LIBRARIES(pcretest pcreposix ${PCRETEST_LIBS}) - IF(PCRE_SUPPORT_JIT) + IF(PCRE_SUPPORT_JIT AND PCRE_SUPPORT_UTF8) ADD_EXECUTABLE(pcre_jit_test pcre_jit_test.c) SET(targets ${targets} pcre_jit_test) TARGET_LINK_LIBRARIES(pcre_jit_test pcre) - ENDIF(PCRE_SUPPORT_JIT) + ENDIF(PCRE_SUPPORT_JIT AND PCRE_SUPPORT_UTF8) IF(PCRE_BUILD_PCRECPP) ADD_EXECUTABLE(pcrecpp_unittest pcrecpp_unittest.cc) @@ -497,11 +495,11 @@ IF(PCRE_BUILD_TESTS) ADD_TEST(pcre_test ${PROJECT_SOURCE_DIR}/RunTest.bat) ENDIF(WIN32) - IF(PCRE_SUPPORT_JIT) + IF(PCRE_SUPPORT_JIT AND PCRE_SUPPORT_UTF8) GET_TARGET_PROPERTY(PCRE_JIT_TEST_EXE pcre_jit_test DEBUG_LOCATION) - ENDIF(PCRE_SUPPORT_JIT) + ENDIF(PCRE_SUPPORT_JIT AND PCRE_SUPPORT_UTF8) GET_TARGET_PROPERTY(PCRECPP_UNITTEST_EXE pcrecpp_unittest @@ -515,9 +513,9 @@ IF(PCRE_BUILD_TESTS) pcre_stringpiece_unittest DEBUG_LOCATION) - IF(PCRE_SUPPORT_JIT) + IF(PCRE_SUPPORT_JIT AND PCRE_SUPPORT_UTF8) ADD_TEST(pcre_jit_test ${PCRE_JIT_TEST_EXE}) - ENDIF(PCRE_SUPPORT_JIT) + ENDIF(PCRE_SUPPORT_JIT AND PCRE_SUPPORT_UTF8) ADD_TEST(pcrecpp_test ${PCRECPP_UNITTEST_EXE}) ADD_TEST(pcre_scanner_test ${PCRE_SCANNER_UNITTEST_EXE}) ADD_TEST(pcre_stringpiece_test ${PCRE_STRINGPIECE_UNITTEST_EXE}) diff --git a/doc/html/pcre_assign_jit_stack.html b/doc/html/pcre_assign_jit_stack.html index 096e839..bbf5ebd 100644 --- a/doc/html/pcre_assign_jit_stack.html +++ b/doc/html/pcre_assign_jit_stack.html @@ -19,7 +19,7 @@ SYNOPSIS <b>#include <pcre.h></b> </P> <P> -<b>void pcre_assign_jit_stack(pcre_extra *<i>extra</i>, </b> +<b>void pcre_assign_jit_stack(pcre_extra *<i>extra</i>,</b> <b>pcre_jit_callback <i>callback</i>, void *<i>data</i>);</b> </P> <br><b> diff --git a/doc/html/pcre_jit_stack_alloc.html b/doc/html/pcre_jit_stack_alloc.html index 411d29b..60a6cf1 100644 --- a/doc/html/pcre_jit_stack_alloc.html +++ b/doc/html/pcre_jit_stack_alloc.html @@ -19,7 +19,7 @@ SYNOPSIS <b>#include <pcre.h></b> </P> <P> -<b>pcre_jit_stack *pcre_jit_stack_alloc(int <i>startsize</i>, </b> +<b>pcre_jit_stack *pcre_jit_stack_alloc(int <i>startsize</i>,</b> <b>int <i>maxsize</i>);</b> </P> <br><b> diff --git a/doc/html/pcreapi.html b/doc/html/pcreapi.html index e120ae3..667ec7c 100644 --- a/doc/html/pcreapi.html +++ b/doc/html/pcreapi.html @@ -73,7 +73,7 @@ man page, in case the conversion went wrong. <b>void pcre_jit_stack_free(pcre_jit_stack *<i>stack</i>);</b> </P> <P> -<b>void pcre_assign_jit_stack(pcre_extra *<i>extra</i>, </b> +<b>void pcre_assign_jit_stack(pcre_extra *<i>extra</i>,</b> <b>pcre_jit_callback <i>callback</i>, void *<i>data</i>);</b> </P> <P> |