Revision: 206
http://www.exim.org/viewvc/pcre2?view=rev&revision=206
Author: ph10
Date: 2015-02-24 12:35:28 +0000 (Tue, 24 Feb 2015)
Log Message:
-----------
Fix bugs in CMake control file.
Modified Paths:
--------------
code/trunk/CMakeLists.txt
code/trunk/ChangeLog
code/trunk/configure.ac
Modified: code/trunk/CMakeLists.txt
===================================================================
--- code/trunk/CMakeLists.txt 2015-02-23 07:50:53 UTC (rev 205)
+++ code/trunk/CMakeLists.txt 2015-02-24 12:35:28 UTC (rev 206)
@@ -70,9 +70,11 @@
PROJECT(PCRE2 C)
-# Increased minimum to 2.8.0 to support newer add_test features
+# Increased minimum to 2.8.0 to support newer add_test features. Set policy
+# CMP0026 to avoid warnings for the use of LOCATION in GET_TARGET_PROPERTY.
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
+CMAKE_POLICY(SET CMP0026 OLD)
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) # for FindReadline.cmake
@@ -392,6 +394,7 @@
src/pcre2_newline.c
src/pcre2_ord2utf.c
src/pcre2_pattern_info.c
+ src/pcre2_serialize.c
src/pcre2_string_utils.c
src/pcre2_study.c
src/pcre2_substitute.c
@@ -561,6 +564,15 @@
TARGET_LINK_LIBRARIES(pcre2_jit_test ${PCRE2_JIT_TEST_LIBS})
ENDIF(PCRE2_SUPPORT_JIT)
+ # exes in Debug location tested by the RunTest shell script
+ # via "make test"
+
+ IF(PCRE2_BUILD_PCRE2GREP)
+ GET_TARGET_PROPERTY(PCRE2GREP_EXE pcre2grep DEBUG_LOCATION)
+ ENDIF(PCRE2_BUILD_PCRE2GREP)
+
+ GET_TARGET_PROPERTY(PCRE2TEST_EXE pcre2test DEBUG_LOCATION)
+
# =================================================
# Write out a CTest configuration file
#
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2015-02-23 07:50:53 UTC (rev 205)
+++ code/trunk/ChangeLog 2015-02-24 12:35:28 UTC (rev 206)
@@ -82,7 +82,12 @@
16. Improved error message in pcre2test when setting the stack size (-S) fails.
+17. Fixed two bugs in CMakeLists.txt: (1) Some lines had got lost in the
+transfer from PCRE1, meaning that CMake configuration failed if "build tests"
+was selected. (2) The file src/pcre2_serialize.c had not been added to the list
+of PCRE2 sources, which caused a failure to build pcre2test.
+
Version 10.00 05-January-2015
-----------------------------
Modified: code/trunk/configure.ac
===================================================================
--- code/trunk/configure.ac 2015-02-23 07:50:53 UTC (rev 205)
+++ code/trunk/configure.ac 2015-02-24 12:35:28 UTC (rev 206)
@@ -10,7 +10,7 @@
m4_define(pcre2_major, [10])
m4_define(pcre2_minor, [10])
-m4_define(pcre2_prerelease, [-RC1])
+m4_define(pcre2_prerelease, [-RC2])
m4_define(pcre2_date, [2015-02-20])
# NOTE: The CMakeLists.txt file searches for the above variables in the first
