[Pcre-svn] [692] code/trunk: Fix CMake for release candidate…

Revision: 692

          http://vcs.pcre.org/viewvc?view=rev&revision=692
Author:   ph10
Date:     2011-09-12 12:38:03 +0100 (Mon, 12 Sep 2011)

Log Message:
-----------
Fix CMake for release candidate; doc tidies.

Modified Paths:
--------------
    code/trunk/CMakeLists.txt
    code/trunk/doc/html/pcre_assign_jit_stack.html
    code/trunk/doc/html/pcre_jit_stack_alloc.html
    code/trunk/doc/html/pcreapi.html

Modified: code/trunk/CMakeLists.txt
===================================================================
--- code/trunk/CMakeLists.txt    2011-09-11 14:31:21 UTC (rev 691)
+++ code/trunk/CMakeLists.txt    2011-09-12 11:38:03 UTC (rev 692)
@@ -217,8 +217,6 @@

 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 @@
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 @@
           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 @@
                       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})

Modified: code/trunk/doc/html/pcre_assign_jit_stack.html
===================================================================
--- code/trunk/doc/html/pcre_assign_jit_stack.html    2011-09-11 14:31:21 UTC (rev 691)
+++ code/trunk/doc/html/pcre_assign_jit_stack.html    2011-09-12 11:38:03 UTC (rev 692)
@@ -19,7 +19,7 @@
 <b>#include &#60;pcre.h&#62;</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>

Modified: code/trunk/doc/html/pcre_jit_stack_alloc.html
===================================================================
--- code/trunk/doc/html/pcre_jit_stack_alloc.html    2011-09-11 14:31:21 UTC (rev 691)
+++ code/trunk/doc/html/pcre_jit_stack_alloc.html    2011-09-12 11:38:03 UTC (rev 692)
@@ -19,7 +19,7 @@
 <b>#include &#60;pcre.h&#62;</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>

Modified: code/trunk/doc/html/pcreapi.html
===================================================================
--- code/trunk/doc/html/pcreapi.html    2011-09-11 14:31:21 UTC (rev 691)
+++ code/trunk/doc/html/pcreapi.html    2011-09-12 11:38:03 UTC (rev 692)
@@ -73,7 +73,7 @@
 <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>