--- code/trunk/CMakeLists.txt 2008/01/28 15:27:17 318 +++ code/trunk/CMakeLists.txt 2009/03/23 12:05:20 405 @@ -15,22 +15,27 @@ # PCRE_SUPPORT_LIBBZ2. # 2008-01-20 Brought up to date to include several new features by Christian # Ehrlicher. -# 2008-01-22 Sheri added options for backward compatibility of library names when -# building with minGW: +# 2008-01-22 Sheri added options for backward compatibility of library names +# when building with minGW: # if "ON", NON_STANDARD_LIB_PREFIX causes shared libraries to -# be built without "lib" as prefix. (The libraries will be named pcre.dll, -# pcreposix.dll and pcrecpp.dll). +# be built without "lib" as prefix. (The libraries will be named +# pcre.dll, pcreposix.dll and pcrecpp.dll). # if "ON", NON_STANDARD_LIB_SUFFIX causes shared libraries to # be built with suffix of "-0.dll". (The libraries will be named # libpcre-0.dll, libpcreposix-0.dll and libpcrecpp-0.dll - same names # built by default with Configure and Make. # 2008-01-23 PH removed the automatic build of pcredemo. +# 2008-04-22 PH modified READLINE support so it finds NCURSES when needed. +# 2008-07-03 PH updated for revised UCP property support (change of files) +# 2009-03-23 PH applied Steven Van Ingelgem's patch to change the name +# CMAKE_BINARY_DIR to PROJECT_BINARY_DIR so that it works when PCRE +# is included within another project. PROJECT(PCRE C CXX) CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6) -SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) # for FindReadline.cmake +SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) # for FindReadline.cmake # external packages FIND_PACKAGE( BZip2 ) @@ -178,9 +183,15 @@ SET(SUPPORT_UCP 1) ENDIF(PCRE_SUPPORT_UNICODE_PROPERTIES) +# This next one used to contain +# SET(PCRETEST_LIBS ${READLINE_LIBRARY}) +# but I was advised to add the NCURSES test as well, along with +# some modifications to cmake/FindReadline.cmake which should +# make it possible to override the default if necessary. PH + IF(PCRE_SUPPORT_LIBREADLINE) SET(SUPPORT_LIBREADLINE 1) - SET(PCRETEST_LIBS ${READLINE_LIBRARY}) + SET(PCRETEST_LIBS ${READLINE_LIBRARY} ${NCURSES_LIBRARY}) ENDIF(PCRE_SUPPORT_LIBREADLINE) IF(PCRE_SUPPORT_LIBZ) @@ -224,24 +235,23 @@ ENDIF(PCRE_NO_RECURSE) # Output files - CONFIGURE_FILE(config-cmake.h.in - ${CMAKE_BINARY_DIR}/config.h + ${PROJECT_BINARY_DIR}/config.h @ONLY) CONFIGURE_FILE(pcre.h.generic - ${CMAKE_BINARY_DIR}/pcre.h + ${PROJECT_BINARY_DIR}/pcre.h COPYONLY) # What about pcre-config and libpcre.pc? IF(PCRE_BUILD_PCRECPP) CONFIGURE_FILE(pcre_stringpiece.h.in - ${CMAKE_BINARY_DIR}/pcre_stringpiece.h + ${PROJECT_BINARY_DIR}/pcre_stringpiece.h @ONLY) CONFIGURE_FILE(pcrecpparg.h.in - ${CMAKE_BINARY_DIR}/pcrecpparg.h + ${PROJECT_BINARY_DIR}/pcrecpparg.h @ONLY) ENDIF(PCRE_BUILD_PCRECPP) @@ -257,21 +267,21 @@ COMMENT "Generating character tables (pcre_chartables.c) for current locale" DEPENDS dftables COMMAND ${DFTABLES_EXE} - ARGS ${CMAKE_BINARY_DIR}/pcre_chartables.c - OUTPUT ${CMAKE_BINARY_DIR}/pcre_chartables.c + ARGS ${PROJECT_BINARY_DIR}/pcre_chartables.c + OUTPUT ${PROJECT_BINARY_DIR}/pcre_chartables.c ) ELSE(PCRE_REBUILD_CHARTABLES) - CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/pcre_chartables.c.dist - ${CMAKE_BINARY_DIR}/pcre_chartables.c + CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/pcre_chartables.c.dist + ${PROJECT_BINARY_DIR}/pcre_chartables.c COPYONLY) ENDIF(PCRE_REBUILD_CHARTABLES) # Source code -SET(PCRE_HEADERS ${CMAKE_BINARY_DIR}/pcre.h) +SET(PCRE_HEADERS ${PROJECT_BINARY_DIR}/pcre.h) SET(PCRE_SOURCES - ${CMAKE_BINARY_DIR}/pcre_chartables.c + ${PROJECT_BINARY_DIR}/pcre_chartables.c pcre_compile.c pcre_config.c pcre_dfa_exec.c @@ -287,7 +297,7 @@ pcre_study.c pcre_tables.c pcre_try_flipped.c - pcre_ucp_searchfuncs.c + pcre_ucd.c pcre_valid_utf8.c pcre_version.c pcre_xclass.c @@ -300,8 +310,8 @@ SET(PCRECPP_HEADERS pcrecpp.h pcre_scanner.h - ${CMAKE_BINARY_DIR}/pcrecpparg.h - ${CMAKE_BINARY_DIR}/pcre_stringpiece.h + ${PROJECT_BINARY_DIR}/pcrecpparg.h + ${PROJECT_BINARY_DIR}/pcre_stringpiece.h ) SET(PCRECPP_SOURCES @@ -327,7 +337,7 @@ # Libraries # pcre -ADD_LIBRARY(pcre ${PCRE_HEADERS} ${PCRE_SOURCES} ${CMAKE_BINARY_DIR}/config.h) +ADD_LIBRARY(pcre ${PCRE_HEADERS} ${PCRE_SOURCES} ${PROJECT_BINARY_DIR}/config.h) ADD_LIBRARY(pcreposix ${PCREPOSIX_HEADERS} ${PCREPOSIX_SOURCES}) TARGET_LINK_LIBRARIES(pcreposix pcre) IF(MINGW AND NOT PCRE_STATIC) @@ -410,19 +420,19 @@ # Write out a CTest configuration file that sets some needed environment # variables for the test scripts. # -FILE(WRITE ${CMAKE_BINARY_DIR}/CTestCustom.ctest +FILE(WRITE ${PROJECT_BINARY_DIR}/CTestCustom.ctest "# This is a generated file. -SET(ENV{srcdir} ${CMAKE_SOURCE_DIR}) +SET(ENV{srcdir} ${PROJECT_SOURCE_DIR}) SET(ENV{pcregrep} ${PCREGREP_EXE}) SET(ENV{pcretest} ${PCRETEST_EXE}) ") IF(UNIX) - ADD_TEST(pcre_test ${CMAKE_SOURCE_DIR}/RunTest) - ADD_TEST(pcre_grep_test ${CMAKE_SOURCE_DIR}/RunGrepTest) + ADD_TEST(pcre_test ${PROJECT_SOURCE_DIR}/RunTest) + ADD_TEST(pcre_grep_test ${PROJECT_SOURCE_DIR}/RunGrepTest) ENDIF(UNIX) IF(WIN32) - ADD_TEST(pcre_test cmd /C ${CMAKE_SOURCE_DIR}/RunTest.bat) + ADD_TEST(pcre_test cmd /C ${PROJECT_SOURCE_DIR}/RunTest.bat) ENDIF(WIN32) GET_TARGET_PROPERTY(PCRECPP_UNITTEST_EXE @@ -452,9 +462,9 @@ INSTALL(FILES ${PCRE_HEADERS} ${PCREPOSIX_HEADERS} DESTINATION include) -FILE(GLOB html ${CMAKE_SOURCE_DIR}/doc/html/*.html) -FILE(GLOB man1 ${CMAKE_SOURCE_DIR}/doc/*.1) -FILE(GLOB man3 ${CMAKE_SOURCE_DIR}/doc/*.3) +FILE(GLOB html ${PROJECT_SOURCE_DIR}/doc/html/*.html) +FILE(GLOB man1 ${PROJECT_SOURCE_DIR}/doc/*.1) +FILE(GLOB man3 ${PROJECT_SOURCE_DIR}/doc/*.3) IF(PCRE_BUILD_PCRECPP) INSTALL(TARGETS pcrecpp