[BACK]Return to CMakeLists.txt CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / pcre

Diff for /embedaddon/pcre/CMakeLists.txt between versions 1.1.1.2 and 1.1.1.5

version 1.1.1.2, 2012/02/21 23:50:25 version 1.1.1.5, 2014/06/15 19:46:03
Line 56 Line 56
 # 2012-01-13 Stephen Kelly added out of source build support  # 2012-01-13 Stephen Kelly added out of source build support
 # 2012-01-17 PH applied Stephen Kelly's patch to parse the version data out  # 2012-01-17 PH applied Stephen Kelly's patch to parse the version data out
 #            of the configure.ac file  #            of the configure.ac file
   # 2012-02-26 PH added support for libedit
   # 2012-09-06 PH added support for PCRE_EBCDIC_NL25
   # 2012-09-08 ChPe added PCRE32 support
   # 2012-10-23 PH added support for VALGRIND and GCOV
   # 2012-12-08 PH added patch from Daniel Richard G to quash some MSVC warnings
   # 2013-07-01 PH realized that the "support" for GCOV was a total nonsense and
   #            so it has been removed.
   # 2013-10-08 PH got rid of the "source" command, which is a bash-ism (use ".")
   # 2013-11-05 PH added support for PARENS_NEST_LIMIT
   
 PROJECT(PCRE C CXX)  PROJECT(PCRE C CXX)
   
Line 69  SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) # f Line 78  SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) # f
 FIND_PACKAGE( BZip2 )  FIND_PACKAGE( BZip2 )
 FIND_PACKAGE( ZLIB )  FIND_PACKAGE( ZLIB )
 FIND_PACKAGE( Readline )  FIND_PACKAGE( Readline )
   FIND_PACKAGE( Editline )
   
 # Configuration checks  # Configuration checks
   
Line 110  OPTION(PCRE_BUILD_PCRE8 "Build 8 bit PCRE library" ON) Line 120  OPTION(PCRE_BUILD_PCRE8 "Build 8 bit PCRE library" ON)
   
 OPTION(PCRE_BUILD_PCRE16 "Build 16 bit PCRE library" OFF)  OPTION(PCRE_BUILD_PCRE16 "Build 16 bit PCRE library" OFF)
   
   OPTION(PCRE_BUILD_PCRE32 "Build 32 bit PCRE library" OFF)
   
 OPTION(PCRE_BUILD_PCRECPP "Build the PCRE C++ library (pcrecpp)." ON)  OPTION(PCRE_BUILD_PCRECPP "Build the PCRE C++ library (pcrecpp)." ON)
   
 SET(PCRE_EBCDIC OFF CACHE BOOL  SET(PCRE_EBCDIC OFF CACHE BOOL
    "Use EBCDIC coding instead of ASCII. (This is rarely used outside of mainframe systems)")    "Use EBCDIC coding instead of ASCII. (This is rarely used outside of mainframe systems.)")
   
   SET(PCRE_EBCDIC_NL25 OFF CACHE BOOL
       "Use 0x25 as EBCDIC NL character instead of 0x15; implies EBCDIC.")
   
 SET(PCRE_LINK_SIZE "2" CACHE STRING  SET(PCRE_LINK_SIZE "2" CACHE STRING
     "Internal link size (2, 3 or 4 allowed). See LINK_SIZE in config.h.in for details.")      "Internal link size (2, 3 or 4 allowed). See LINK_SIZE in config.h.in for details.")
   
   SET(PCRE_PARENS_NEST_LIMIT "250" CACHE STRING
       "Default nested parentheses limit. See PARENS_NEST_LIMIT in config.h.in for details.")
   
 SET(PCRE_MATCH_LIMIT "10000000" CACHE STRING  SET(PCRE_MATCH_LIMIT "10000000" CACHE STRING
     "Default limit on internal looping. See MATCH_LIMIT in config.h.in for details.")      "Default limit on internal looping. See MATCH_LIMIT in config.h.in for details.")
   
Line 143  SET(PCRE_SUPPORT_PCREGREP_JIT ON CACHE BOOL Line 161  SET(PCRE_SUPPORT_PCREGREP_JIT ON CACHE BOOL
     "Enable use of Just-in-time compiling in pcregrep.")      "Enable use of Just-in-time compiling in pcregrep.")
   
 SET(PCRE_SUPPORT_UTF OFF CACHE BOOL  SET(PCRE_SUPPORT_UTF OFF CACHE BOOL
    "Enable support for Unicode Transformation Format (UTF-8 and/or UTF-16) encoding.")    "Enable support for Unicode Transformation Format (UTF-8/UTF-16/UTF-32) encoding.")
   
 SET(PCRE_SUPPORT_UNICODE_PROPERTIES OFF CACHE BOOL  SET(PCRE_SUPPORT_UNICODE_PROPERTIES OFF CACHE BOOL
     "Enable support for Unicode properties (if set, UTF support will be enabled as well).")      "Enable support for Unicode properties (if set, UTF support will be enabled as well).")
Line 151  SET(PCRE_SUPPORT_UNICODE_PROPERTIES OFF CACHE BOOL Line 169  SET(PCRE_SUPPORT_UNICODE_PROPERTIES OFF CACHE BOOL
 SET(PCRE_SUPPORT_BSR_ANYCRLF OFF CACHE BOOL  SET(PCRE_SUPPORT_BSR_ANYCRLF OFF CACHE BOOL
     "ON=Backslash-R matches only LF CR and CRLF, OFF=Backslash-R matches all Unicode Linebreaks")      "ON=Backslash-R matches only LF CR and CRLF, OFF=Backslash-R matches all Unicode Linebreaks")
   
   SET(PCRE_SUPPORT_VALGRIND OFF CACHE BOOL
       "Enable Valgrind support.")
   
 OPTION(PCRE_SHOW_REPORT    "Show the final configuration report" ON)  OPTION(PCRE_SHOW_REPORT    "Show the final configuration report" ON)
 OPTION(PCRE_BUILD_PCREGREP "Build pcregrep" ON)  OPTION(PCRE_BUILD_PCREGREP "Build pcregrep" ON)
 OPTION(PCRE_BUILD_TESTS    "Build the tests" ON)  OPTION(PCRE_BUILD_TESTS    "Build the tests" ON)
Line 165  IF (MINGW) Line 186  IF (MINGW)
          OFF)           OFF)
 ENDIF(MINGW)  ENDIF(MINGW)
   
   IF(MSVC)
     OPTION(INSTALL_MSVC_PDB
            "ON=Install .pdb files built by MSVC, if generated"
            OFF)
   ENDIF(MSVC)
   
 # bzip2 lib  # bzip2 lib
 IF(BZIP2_FOUND)  IF(BZIP2_FOUND)
   OPTION (PCRE_SUPPORT_LIBBZ2 "Enable support for linking pcregrep with libbz2." ON)    OPTION (PCRE_SUPPORT_LIBBZ2 "Enable support for linking pcregrep with libbz2." ON)
Line 181  IF(PCRE_SUPPORT_LIBZ) Line 208  IF(PCRE_SUPPORT_LIBZ)
   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})    INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
 ENDIF(PCRE_SUPPORT_LIBZ)  ENDIF(PCRE_SUPPORT_LIBZ)
   
   # editline lib
   IF(EDITLINE_FOUND)
     OPTION (PCRE_SUPPORT_LIBEDIT  "Enable support for linking pcretest with libedit." OFF)
   ENDIF(EDITLINE_FOUND)
   IF(PCRE_SUPPORT_LIBEDIT)
     INCLUDE_DIRECTORIES(${EDITLINE_INCLUDE_DIR})
   ENDIF(PCRE_SUPPORT_LIBEDIT)
   
 # readline lib  # readline lib
 IF(READLINE_FOUND)  IF(READLINE_FOUND)
   OPTION (PCRE_SUPPORT_LIBREADLINE  "Enable support for linking pcretest with libreadline." ON)    OPTION (PCRE_SUPPORT_LIBREADLINE  "Enable support for linking pcretest with libreadline." ON)
Line 217  IF(NOT BUILD_SHARED_LIBS) Line 252  IF(NOT BUILD_SHARED_LIBS)
         SET(PCRE_STATIC 1)          SET(PCRE_STATIC 1)
 ENDIF(NOT BUILD_SHARED_LIBS)  ENDIF(NOT BUILD_SHARED_LIBS)
   
IF(NOT PCRE_BUILD_PCRE8 AND NOT PCRE_BUILD_PCRE16)IF(NOT PCRE_BUILD_PCRE8 AND NOT PCRE_BUILD_PCRE16 AND NOT PCRE_BUILD_PCRE32)
        MESSAGE(FATAL_ERROR "Either PCRE_BUILD_PCRE8 or PCRE_BUILD_PCRE16 must be enabled")        MESSAGE(FATAL_ERROR "At least one of PCRE_BUILD_PCRE8, PCRE_BUILD_PCRE16 or PCRE_BUILD_PCRE32 must be enabled")
ENDIF(NOT PCRE_BUILD_PCRE8 AND NOT PCRE_BUILD_PCRE16)ENDIF(NOT PCRE_BUILD_PCRE8 AND NOT PCRE_BUILD_PCRE16 AND NOT PCRE_BUILD_PCRE32)
   
 IF(PCRE_BUILD_PCRE8)  IF(PCRE_BUILD_PCRE8)
         SET(SUPPORT_PCRE8 1)          SET(SUPPORT_PCRE8 1)
Line 229  IF(PCRE_BUILD_PCRE16) Line 264  IF(PCRE_BUILD_PCRE16)
         SET(SUPPORT_PCRE16 1)          SET(SUPPORT_PCRE16 1)
 ENDIF(PCRE_BUILD_PCRE16)  ENDIF(PCRE_BUILD_PCRE16)
   
   IF(PCRE_BUILD_PCRE32)
           SET(SUPPORT_PCRE32 1)
   ENDIF(PCRE_BUILD_PCRE32)
   
 IF(PCRE_BUILD_PCRECPP AND NOT PCRE_BUILD_PCRE8)  IF(PCRE_BUILD_PCRECPP AND NOT PCRE_BUILD_PCRE8)
         MESSAGE(STATUS "** PCRE_BUILD_PCRE8 must be enabled for the C++ library support")          MESSAGE(STATUS "** PCRE_BUILD_PCRE8 must be enabled for the C++ library support")
         SET(PCRE_BUILD_PCRECPP OFF)          SET(PCRE_BUILD_PCRECPP OFF)
Line 239  IF(PCRE_BUILD_PCREGREP AND NOT PCRE_BUILD_PCRE8) Line 278  IF(PCRE_BUILD_PCREGREP AND NOT PCRE_BUILD_PCRE8)
         SET(PCRE_BUILD_PCREGREP OFF)          SET(PCRE_BUILD_PCREGREP OFF)
 ENDIF(PCRE_BUILD_PCREGREP AND NOT PCRE_BUILD_PCRE8)  ENDIF(PCRE_BUILD_PCREGREP AND NOT PCRE_BUILD_PCRE8)
   
   IF(PCRE_SUPPORT_LIBREADLINE AND PCRE_SUPPORT_LIBEDIT)
           MESSAGE(FATAL_ERROR "Only one of libreadline or libeditline can be specified")
   ENDIF(PCRE_SUPPORT_LIBREADLINE AND PCRE_SUPPORT_LIBEDIT)
   
 IF(PCRE_SUPPORT_BSR_ANYCRLF)  IF(PCRE_SUPPORT_BSR_ANYCRLF)
         SET(BSR_ANYCRLF 1)          SET(BSR_ANYCRLF 1)
 ENDIF(PCRE_SUPPORT_BSR_ANYCRLF)  ENDIF(PCRE_SUPPORT_BSR_ANYCRLF)
Line 260  IF(PCRE_SUPPORT_PCREGREP_JIT) Line 303  IF(PCRE_SUPPORT_PCREGREP_JIT)
         SET(SUPPORT_PCREGREP_JIT 1)          SET(SUPPORT_PCREGREP_JIT 1)
 ENDIF(PCRE_SUPPORT_PCREGREP_JIT)  ENDIF(PCRE_SUPPORT_PCREGREP_JIT)
   
   IF(PCRE_SUPPORT_VALGRIND)
           SET(SUPPORT_VALGRIND 1)
   ENDIF(PCRE_SUPPORT_VALGRIND)
   
 # This next one used to contain  # This next one used to contain
 #       SET(PCRETEST_LIBS ${READLINE_LIBRARY})  #       SET(PCRETEST_LIBS ${READLINE_LIBRARY})
 # but I was advised to add the NCURSES test as well, along with  # but I was advised to add the NCURSES test as well, along with
Line 271  IF(PCRE_SUPPORT_LIBREADLINE) Line 318  IF(PCRE_SUPPORT_LIBREADLINE)
         SET(PCRETEST_LIBS ${READLINE_LIBRARY} ${NCURSES_LIBRARY})          SET(PCRETEST_LIBS ${READLINE_LIBRARY} ${NCURSES_LIBRARY})
 ENDIF(PCRE_SUPPORT_LIBREADLINE)  ENDIF(PCRE_SUPPORT_LIBREADLINE)
   
   # libedit is a plug-compatible alternative to libreadline
   
   IF(PCRE_SUPPORT_LIBEDIT)
           SET(SUPPORT_LIBEDIT 1)
           SET(PCRETEST_LIBS ${EDITLINE_LIBRARY} ${NCURSES_LIBRARY})
   ENDIF(PCRE_SUPPORT_LIBEDIT)
   
 IF(PCRE_SUPPORT_LIBZ)  IF(PCRE_SUPPORT_LIBZ)
         SET(SUPPORT_LIBZ 1)          SET(SUPPORT_LIBZ 1)
         SET(PCREGREP_LIBS ${PCREGREP_LIBS} ${ZLIB_LIBRARIES})          SET(PCREGREP_LIBS ${PCREGREP_LIBS} ${ZLIB_LIBRARIES})
Line 305  ENDIF(NEWLINE STREQUAL "") Line 359  ENDIF(NEWLINE STREQUAL "")
   
 IF(PCRE_EBCDIC)  IF(PCRE_EBCDIC)
         SET(EBCDIC 1)          SET(EBCDIC 1)
   IF(PCRE_NEWLINE STREQUAL "LF")
           SET(NEWLINE "21")
   ENDIF(PCRE_NEWLINE STREQUAL "LF")
   IF(PCRE_NEWLINE STREQUAL "CRLF")
           SET(NEWLINE "3349")
   ENDIF(PCRE_NEWLINE STREQUAL "CRLF")
 ENDIF(PCRE_EBCDIC)  ENDIF(PCRE_EBCDIC)
   
   IF(PCRE_EBCDIC_NL25)
           SET(EBCDIC 1)
           SET(EBCDIC_NL25 1)
   IF(PCRE_NEWLINE STREQUAL "LF")
           SET(NEWLINE "37")
   ENDIF(PCRE_NEWLINE STREQUAL "LF")
   IF(PCRE_NEWLINE STREQUAL "CRLF")
           SET(NEWLINE "3365")
   ENDIF(PCRE_NEWLINE STREQUAL "CRLF")
   ENDIF(PCRE_EBCDIC_NL25)
   
 IF(PCRE_NO_RECURSE)  IF(PCRE_NO_RECURSE)
         SET(NO_RECURSE 1)          SET(NO_RECURSE 1)
 ENDIF(PCRE_NO_RECURSE)  ENDIF(PCRE_NO_RECURSE)
Line 435  SET(PCRE16_SOURCES Line 506  SET(PCRE16_SOURCES
 )  )
 ENDIF(PCRE_BUILD_PCRE16)  ENDIF(PCRE_BUILD_PCRE16)
   
   IF(PCRE_BUILD_PCRE32)
   SET(PCRE32_SOURCES
     pcre32_byte_order.c
     pcre32_chartables.c
     pcre32_compile.c
     pcre32_config.c
     pcre32_dfa_exec.c
     pcre32_exec.c
     pcre32_fullinfo.c
     pcre32_get.c
     pcre32_globals.c
     pcre32_jit_compile.c
     pcre32_maketables.c
     pcre32_newline.c
     pcre32_ord2utf32.c
     pcre32_refcount.c
     pcre32_string_utils.c
     pcre32_study.c
     pcre32_tables.c
     pcre32_ucd.c
     pcre32_utf32_utils.c
     pcre32_valid_utf32.c
     pcre32_version.c
     pcre32_xclass.c
   )
   ENDIF(PCRE_BUILD_PCRE32)
   
 IF(MINGW AND NOT PCRE_STATIC)  IF(MINGW AND NOT PCRE_STATIC)
 IF (EXISTS ${PROJECT_SOURCE_DIR}/pcre.rc)  IF (EXISTS ${PROJECT_SOURCE_DIR}/pcre.rc)
 ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/pcre.o  ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/pcre.o
Line 458  SET(PCREPOSIX_SOURCES Line 556  SET(PCREPOSIX_SOURCES
 ENDIF(EXISTS ${PROJECT_SOURCE_DIR}/pcreposix.rc)  ENDIF(EXISTS ${PROJECT_SOURCE_DIR}/pcreposix.rc)
 ENDIF(MINGW AND NOT PCRE_STATIC)  ENDIF(MINGW AND NOT PCRE_STATIC)
   
   IF(MSVC AND NOT PCRE_STATIC)
   IF (EXISTS ${PROJECT_SOURCE_DIR}/pcre.rc)
   SET(PCRE_SOURCES
     ${PCRE_SOURCES} pcre.rc)
   ENDIF(EXISTS ${PROJECT_SOURCE_DIR}/pcre.rc)
   IF (EXISTS ${PROJECT_SOURCE_DIR}/pcreposix.rc)
   SET(PCREPOSIX_SOURCES
     ${PCREPOSIX_SOURCES} pcreposix.rc)
   ENDIF (EXISTS ${PROJECT_SOURCE_DIR}/pcreposix.rc)
   ENDIF(MSVC AND NOT PCRE_STATIC)
   
 SET(PCRECPP_HEADERS  SET(PCRECPP_HEADERS
   pcrecpp.h    pcrecpp.h
   pcre_scanner.h    pcre_scanner.h
Line 476  SET(PCRECPP_SOURCES Line 585  SET(PCRECPP_SOURCES
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)  ADD_DEFINITIONS(-DHAVE_CONFIG_H)
   
 IF(MSVC)  IF(MSVC)
        ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)        ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS)
 ENDIF(MSVC)  ENDIF(MSVC)
   
 SET(CMAKE_INCLUDE_CURRENT_DIR 1)  SET(CMAKE_INCLUDE_CURRENT_DIR 1)
Line 533  ENDIF(MINGW AND NOT PCRE_STATIC) Line 642  ENDIF(MINGW AND NOT PCRE_STATIC)
   
 ENDIF(PCRE_BUILD_PCRE16)  ENDIF(PCRE_BUILD_PCRE16)
   
   IF(PCRE_BUILD_PCRE32)
   ADD_LIBRARY(pcre32 ${PCRE_HEADERS} ${PCRE32_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
   SET(targets ${targets} pcre32)
   
   IF(MINGW AND NOT PCRE_STATIC)
     IF(NON_STANDARD_LIB_PREFIX)
       SET_TARGET_PROPERTIES(pcre32
                           PROPERTIES PREFIX ""
       )
     ENDIF(NON_STANDARD_LIB_PREFIX)
   
     IF(NON_STANDARD_LIB_SUFFIX)
       SET_TARGET_PROPERTIES(pcre32
                           PROPERTIES SUFFIX "-0.dll"
       )
     ENDIF(NON_STANDARD_LIB_SUFFIX)
   ENDIF(MINGW AND NOT PCRE_STATIC)
   
   ENDIF(PCRE_BUILD_PCRE32)
   
 # pcrecpp  # pcrecpp
 IF(PCRE_BUILD_PCRECPP)  IF(PCRE_BUILD_PCRECPP)
 ADD_LIBRARY(pcrecpp ${PCRECPP_HEADERS} ${PCRECPP_SOURCES})  ADD_LIBRARY(pcrecpp ${PCRECPP_HEADERS} ${PCRECPP_SOURCES})
Line 583  IF(PCRE_BUILD_TESTS) Line 712  IF(PCRE_BUILD_TESTS)
   IF(PCRE_BUILD_PCRE16)    IF(PCRE_BUILD_PCRE16)
     LIST(APPEND PCRETEST_SOURCES pcre16_printint.c)      LIST(APPEND PCRETEST_SOURCES pcre16_printint.c)
   ENDIF(PCRE_BUILD_PCRE16)    ENDIF(PCRE_BUILD_PCRE16)
     IF(PCRE_BUILD_PCRE32)
       LIST(APPEND PCRETEST_SOURCES pcre32_printint.c)
     ENDIF(PCRE_BUILD_PCRE32)
   
   ADD_EXECUTABLE(pcretest ${PCRETEST_SOURCES})    ADD_EXECUTABLE(pcretest ${PCRETEST_SOURCES})
   SET(targets ${targets} pcretest)    SET(targets ${targets} pcretest)
Line 592  IF(PCRE_BUILD_TESTS) Line 724  IF(PCRE_BUILD_TESTS)
   IF(PCRE_BUILD_PCRE16)    IF(PCRE_BUILD_PCRE16)
     LIST(APPEND PCRETEST_LIBS pcre16)      LIST(APPEND PCRETEST_LIBS pcre16)
   ENDIF(PCRE_BUILD_PCRE16)    ENDIF(PCRE_BUILD_PCRE16)
     IF(PCRE_BUILD_PCRE32)
       LIST(APPEND PCRETEST_LIBS pcre32)
     ENDIF(PCRE_BUILD_PCRE32)
   TARGET_LINK_LIBRARIES(pcretest ${PCRETEST_LIBS})    TARGET_LINK_LIBRARIES(pcretest ${PCRETEST_LIBS})
   
   IF(PCRE_SUPPORT_JIT)    IF(PCRE_SUPPORT_JIT)
Line 604  IF(PCRE_BUILD_TESTS) Line 739  IF(PCRE_BUILD_TESTS)
     IF(PCRE_BUILD_PCRE16)      IF(PCRE_BUILD_PCRE16)
       LIST(APPEND PCRE_JIT_TEST_LIBS pcre16)        LIST(APPEND PCRE_JIT_TEST_LIBS pcre16)
     ENDIF(PCRE_BUILD_PCRE16)      ENDIF(PCRE_BUILD_PCRE16)
       IF(PCRE_BUILD_PCRE32)
         LIST(APPEND PCRE_JIT_TEST_LIBS pcre32)
       ENDIF(PCRE_BUILD_PCRE32)
     TARGET_LINK_LIBRARIES(pcre_jit_test ${PCRE_JIT_TEST_LIBS})      TARGET_LINK_LIBRARIES(pcre_jit_test ${PCRE_JIT_TEST_LIBS})
   ENDIF(PCRE_SUPPORT_JIT)    ENDIF(PCRE_SUPPORT_JIT)
   
Line 640  IF(PCRE_BUILD_TESTS) Line 778  IF(PCRE_BUILD_TESTS)
   FILE(WRITE ${PROJECT_BINARY_DIR}/CTestCustom.ctest    FILE(WRITE ${PROJECT_BINARY_DIR}/CTestCustom.ctest
   "# This is a generated file.    "# This is a generated file.
 MESSAGE(\"When testing is complete, review test output in the  MESSAGE(\"When testing is complete, review test output in the
${PROJECT_BINARY_DIR}/Testing/Temporary folder.\")\\\"${PROJECT_BINARY_DIR}/Testing/Temporary\\\" folder.\")
MESSAGE(\"\")MESSAGE(\" \")
 ")  ")
   
   FILE(WRITE ${PROJECT_BINARY_DIR}/pcre_test.sh    FILE(WRITE ${PROJECT_BINARY_DIR}/pcre_test.sh
Line 649  MESSAGE(\"\") Line 787  MESSAGE(\"\")
 # This is a generated file.  # This is a generated file.
 srcdir=${PROJECT_SOURCE_DIR}  srcdir=${PROJECT_SOURCE_DIR}
 pcretest=${PCRETEST_EXE}  pcretest=${PCRETEST_EXE}
source ${PROJECT_SOURCE_DIR}/RunTest. ${PROJECT_SOURCE_DIR}/RunTest
 if test \"$?\" != \"0\"; then exit 1; fi  if test \"$?\" != \"0\"; then exit 1; fi
 # End  # End
 ")  ")
Line 665  if test \"$?\" != \"0\"; then exit 1; fi Line 803  if test \"$?\" != \"0\"; then exit 1; fi
 srcdir=${PROJECT_SOURCE_DIR}  srcdir=${PROJECT_SOURCE_DIR}
 pcregrep=${PCREGREP_EXE}  pcregrep=${PCREGREP_EXE}
 pcretest=${PCRETEST_EXE}  pcretest=${PCRETEST_EXE}
source ${PROJECT_SOURCE_DIR}/RunGrepTest. ${PROJECT_SOURCE_DIR}/RunGrepTest
 if test \"$?\" != \"0\"; then exit 1; fi  if test \"$?\" != \"0\"; then exit 1; fi
 # End  # End
 ")  ")
Line 677  if test \"$?\" != \"0\"; then exit 1; fi Line 815  if test \"$?\" != \"0\"; then exit 1; fi
   
   IF(WIN32)    IF(WIN32)
     # Provide environment for executing the bat file version of RunTest      # Provide environment for executing the bat file version of RunTest
    string(REPLACE "/" "\\" winsrc "${PROJECT_SOURCE_DIR}")    FILE(TO_NATIVE_PATH ${PROJECT_SOURCE_DIR} winsrc)
     FILE(TO_NATIVE_PATH ${PROJECT_BINARY_DIR} winbin)
     FILE(TO_NATIVE_PATH ${PCRETEST_EXE} winexe)
   
    FILE(WRITE ${PROJECT_BINARY_DIR}/pcre_test.txt    FILE(WRITE ${PROJECT_BINARY_DIR}/pcre_test.bat
     "\@REM This is a generated file.      "\@REM This is a generated file.
\@Echo off\@echo off
 setlocal  setlocal
SET\ srcdir=\${srcdir}SET srcdir=\"${winsrc}\"
SET\ pcretest=\${pcretest}SET pcretest=\"${winexe}\"
call \"\${srcdir}\\RunTest.Bat\"if not [%CMAKE_CONFIG_TYPE%]==[] SET pcretest=\"${winbin}\\%CMAKE_CONFIG_TYPE%\\pcretest.exe\"
 call %srcdir%\\RunTest.Bat
 if errorlevel 1 exit /b 1  if errorlevel 1 exit /b 1
 echo RunTest.bat tests successfully completed  echo RunTest.bat tests successfully completed
 ")  ")
   
   FILE(WRITE ${PROJECT_BINARY_DIR}/BatDriver.cmake  
   "# This is a generated file.  
 # this script is run with arguments via the cmake command in add_test(NAME pcre_test_bat)  
 # BatDriver feeds the actual location of pcretest.exe  
 FILE(TO_NATIVE_PATH \${pcretestx} pcretest)  
 FILE(TO_NATIVE_PATH \${srcdirx} srcdir)  
 configure_file(\"\${bindirx}/pcre_test.txt\" \"\${bindirx}/pcre_test.bat\")  
 # MESSAGE(\"cmake\ variable\ pcretest\ is\ \${pcretest}\")  
 # STRING(REPLACE \" \" \"\\ \" bindir \${bindirx})  
 MESSAGE(\"COMMAND pcre_test.bat \")  
 EXECUTE_PROCESS(COMMAND pcre_test.bat  
 WORKING_DIRECTORY .  
 OUTPUT_VARIABLE batoutput)  
 MESSAGE(\"OUTPUT: \${batoutput}\")  
 ")  
   
   ADD_TEST(NAME pcre_test_bat    ADD_TEST(NAME pcre_test_bat
  COMMAND ${CMAKE_COMMAND} -D bindirx=${PROJECT_BINARY_DIR} -D srcdirx=${PROJECT_SOURCE_DIR} -D pcretestx=$<TARGET_FILE:pcretest> -P "${PROJECT_BINARY_DIR}/BatDriver.cmake")  COMMAND pcre_test.bat)
   SET_TESTS_PROPERTIES(pcre_test_bat PROPERTIES    SET_TESTS_PROPERTIES(pcre_test_bat PROPERTIES
   PASS_REGULAR_EXPRESSION "RunTest\\.bat tests successfully completed")    PASS_REGULAR_EXPRESSION "RunTest\\.bat tests successfully completed")
   
Line 767  INSTALL(FILES ${man1} DESTINATION man/man1) Line 892  INSTALL(FILES ${man1} DESTINATION man/man1)
 INSTALL(FILES ${man3} DESTINATION man/man3)  INSTALL(FILES ${man3} DESTINATION man/man3)
 INSTALL(FILES ${html} DESTINATION share/doc/pcre/html)  INSTALL(FILES ${html} DESTINATION share/doc/pcre/html)
   
   IF(MSVC AND INSTALL_MSVC_PDB)
       INSTALL(FILES ${PROJECT_BINARY_DIR}/pcre.pdb
                     ${PROJECT_BINARY_DIR}/pcreposix.pdb
               DESTINATION bin
               CONFIGURATIONS RelWithDebInfo)
       INSTALL(FILES ${PROJECT_BINARY_DIR}/pcred.pdb
                     ${PROJECT_BINARY_DIR}/pcreposixd.pdb
               DESTINATION bin
               CONFIGURATIONS Debug)
   ENDIF(MSVC AND INSTALL_MSVC_PDB)
   
 # help, only for nice output  # help, only for nice output
 IF(BUILD_SHARED_LIBS)  IF(BUILD_SHARED_LIBS)
   SET(BUILD_STATIC_LIBS OFF)    SET(BUILD_STATIC_LIBS OFF)
Line 794  IF(PCRE_SHOW_REPORT) Line 930  IF(PCRE_SHOW_REPORT)
   MESSAGE(STATUS "")    MESSAGE(STATUS "")
   MESSAGE(STATUS "  Build 8 bit PCRE library ........ : ${PCRE_BUILD_PCRE8}")    MESSAGE(STATUS "  Build 8 bit PCRE library ........ : ${PCRE_BUILD_PCRE8}")
   MESSAGE(STATUS "  Build 16 bit PCRE library ....... : ${PCRE_BUILD_PCRE16}")    MESSAGE(STATUS "  Build 16 bit PCRE library ....... : ${PCRE_BUILD_PCRE16}")
     MESSAGE(STATUS "  Build 32 bit PCRE library ....... : ${PCRE_BUILD_PCRE32}")
   MESSAGE(STATUS "  Build C++ library ............... : ${PCRE_BUILD_PCRECPP}")    MESSAGE(STATUS "  Build C++ library ............... : ${PCRE_BUILD_PCRECPP}")
   MESSAGE(STATUS "  Enable JIT compiling support .... : ${PCRE_SUPPORT_JIT}")    MESSAGE(STATUS "  Enable JIT compiling support .... : ${PCRE_SUPPORT_JIT}")
   MESSAGE(STATUS "  Enable UTF support .............. : ${PCRE_SUPPORT_UTF}")    MESSAGE(STATUS "  Enable UTF support .............. : ${PCRE_SUPPORT_UTF}")
Line 801  IF(PCRE_SHOW_REPORT) Line 938  IF(PCRE_SHOW_REPORT)
   MESSAGE(STATUS "  Newline char/sequence ........... : ${PCRE_NEWLINE}")    MESSAGE(STATUS "  Newline char/sequence ........... : ${PCRE_NEWLINE}")
   MESSAGE(STATUS "  \\R matches only ANYCRLF ......... : ${PCRE_SUPPORT_BSR_ANYCRLF}")    MESSAGE(STATUS "  \\R matches only ANYCRLF ......... : ${PCRE_SUPPORT_BSR_ANYCRLF}")
   MESSAGE(STATUS "  EBCDIC coding ................... : ${PCRE_EBCDIC}")    MESSAGE(STATUS "  EBCDIC coding ................... : ${PCRE_EBCDIC}")
     MESSAGE(STATUS "  EBCDIC coding with NL=0x25 ...... : ${PCRE_EBCDIC_NL25}")
   MESSAGE(STATUS "  Rebuild char tables ............. : ${PCRE_REBUILD_CHARTABLES}")    MESSAGE(STATUS "  Rebuild char tables ............. : ${PCRE_REBUILD_CHARTABLES}")
   MESSAGE(STATUS "  No stack recursion .............. : ${PCRE_NO_RECURSE}")    MESSAGE(STATUS "  No stack recursion .............. : ${PCRE_NO_RECURSE}")
   MESSAGE(STATUS "  POSIX mem threshold ............. : ${PCRE_POSIX_MALLOC_THRESHOLD}")    MESSAGE(STATUS "  POSIX mem threshold ............. : ${PCRE_POSIX_MALLOC_THRESHOLD}")
   MESSAGE(STATUS "  Internal link size .............. : ${PCRE_LINK_SIZE}")    MESSAGE(STATUS "  Internal link size .............. : ${PCRE_LINK_SIZE}")
     MESSAGE(STATUS "  Parentheses nest limit .......... : ${PCRE_PARENS_NEST_LIMIT}")
   MESSAGE(STATUS "  Match limit ..................... : ${PCRE_MATCH_LIMIT}")    MESSAGE(STATUS "  Match limit ..................... : ${PCRE_MATCH_LIMIT}")
   MESSAGE(STATUS "  Match limit recursion ........... : ${PCRE_MATCH_LIMIT_RECURSION}")    MESSAGE(STATUS "  Match limit recursion ........... : ${PCRE_MATCH_LIMIT_RECURSION}")
   MESSAGE(STATUS "  Build shared libs ............... : ${BUILD_SHARED_LIBS}")    MESSAGE(STATUS "  Build shared libs ............... : ${BUILD_SHARED_LIBS}")
Line 817  IF(PCRE_SHOW_REPORT) Line 956  IF(PCRE_SHOW_REPORT)
   IF(ZLIB_FOUND)    IF(ZLIB_FOUND)
     MESSAGE(STATUS "  Link pcregrep with libz ......... : ${PCRE_SUPPORT_LIBZ}")      MESSAGE(STATUS "  Link pcregrep with libz ......... : ${PCRE_SUPPORT_LIBZ}")
   ELSE(ZLIB_FOUND)    ELSE(ZLIB_FOUND)
    MESSAGE(STATUS "  Link pcregrep with libz ......... : None" )    MESSAGE(STATUS "  Link pcregrep with libz ......... : Library not found" )
   ENDIF(ZLIB_FOUND)    ENDIF(ZLIB_FOUND)
   IF(BZIP2_FOUND)    IF(BZIP2_FOUND)
     MESSAGE(STATUS "  Link pcregrep with libbz2 ....... : ${PCRE_SUPPORT_LIBBZ2}")      MESSAGE(STATUS "  Link pcregrep with libbz2 ....... : ${PCRE_SUPPORT_LIBBZ2}")
   ELSE(BZIP2_FOUND)    ELSE(BZIP2_FOUND)
    MESSAGE(STATUS "  Link pcregrep with libbz2 ....... : None" )    MESSAGE(STATUS "  Link pcregrep with libbz2 ....... : Library not found" )
   ENDIF(BZIP2_FOUND)    ENDIF(BZIP2_FOUND)
  IF(NOT PCRE_SUPPORT_LIBREADLINE)  IF(EDITLINE_FOUND)
    MESSAGE(STATUS "  Link pcretest with libreadline .. : None" )    MESSAGE(STATUS "  Link pcretest with libeditline .. : ${PCRE_SUPPORT_LIBEDIT}")
  ELSE(NOT PCRE_SUPPORT_LIBREADLINE)  ELSE(EDITLINE_FOUND)
     MESSAGE(STATUS "  Link pcretest with libeditline .. : Library not found" )
   ENDIF(EDITLINE_FOUND)
   IF(READLINE_FOUND)
     MESSAGE(STATUS "  Link pcretest with libreadline .. : ${PCRE_SUPPORT_LIBREADLINE}")      MESSAGE(STATUS "  Link pcretest with libreadline .. : ${PCRE_SUPPORT_LIBREADLINE}")
  ENDIF(NOT PCRE_SUPPORT_LIBREADLINE)  ELSE(READLINE_FOUND)
     MESSAGE(STATUS "  Link pcretest with libreadline .. : Library not found" )
   ENDIF(READLINE_FOUND)
   MESSAGE(STATUS "  Support Valgrind .................: ${PCRE_SUPPORT_VALGRIND}")
   MESSAGE(STATUS "  Support coverage .................: ${PCRE_SUPPORT_COVERAGE}")
 
   IF(MINGW AND NOT PCRE_STATIC)    IF(MINGW AND NOT PCRE_STATIC)
     MESSAGE(STATUS "  Non-standard dll names (prefix) . : ${NON_STANDARD_LIB_PREFIX}")      MESSAGE(STATUS "  Non-standard dll names (prefix) . : ${NON_STANDARD_LIB_PREFIX}")
     MESSAGE(STATUS "  Non-standard dll names (suffix) . : ${NON_STANDARD_LIB_SUFFIX}")      MESSAGE(STATUS "  Non-standard dll names (suffix) . : ${NON_STANDARD_LIB_SUFFIX}")
   ENDIF(MINGW AND NOT PCRE_STATIC)    ENDIF(MINGW AND NOT PCRE_STATIC)
   
     IF(MSVC)
       MESSAGE(STATUS "  Install MSVC .pdb files ..........: ${INSTALL_MSVC_PDB}")
     ENDIF(MSVC)
   
   MESSAGE(STATUS "")    MESSAGE(STATUS "")
 ENDIF(PCRE_SHOW_REPORT)  ENDIF(PCRE_SHOW_REPORT)
   
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.5

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>