Revision: 1239
http://www.exim.org/viewvc/pcre2?view=rev&revision=1239
Author: ph10
Date: 2020-03-24 17:45:28 +0000 (Tue, 24 Mar 2020)
Log Message:
-----------
Change setting of CMAKE_MODULE_PATH from SET to LIST(APPEND...) to allow a
setting from the command line to be included.
Modified Paths:
--------------
code/trunk/CMakeLists.txt
code/trunk/ChangeLog
Modified: code/trunk/CMakeLists.txt
===================================================================
--- code/trunk/CMakeLists.txt 2020-03-24 17:25:58 UTC (rev 1238)
+++ code/trunk/CMakeLists.txt 2020-03-24 17:45:28 UTC (rev 1239)
@@ -85,7 +85,8 @@
# 2018-11-14 PH removed unnecessary checks for stdint.h and inttypes.h
# 2018-11-16 PH added PCRE2GREP_SUPPORT_CALLOUT_FORK support and tidied
# 2019-02-16 PH hacked to avoid CMP0026 policy issue (see comments below)
-# 2020-03-26 PH renamed dftables as pcre2_dftables (as elsewhere)
+# 2020-03-16 PH renamed dftables as pcre2_dftables (as elsewhere)
+# 2020-03-24 PH changed CMAKE_MODULE_PATH definition to add, not replace
PROJECT(PCRE2 C)
@@ -96,8 +97,12 @@
# GET_TARGET_PROPERTY. This should no longer be required.
# CMAKE_POLICY(SET CMP0026 OLD)
-SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) # for FindReadline.cmake
+# For FindReadline.cmake. This was changed to allow setting CMAKE_MODULE_PATH
+# on the command line.
+# SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+LIST(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${PROJECT_SOURCE_DIR}/src")
# external packages
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2020-03-24 17:25:58 UTC (rev 1238)
+++ code/trunk/ChangeLog 2020-03-24 17:45:28 UTC (rev 1239)
@@ -93,6 +93,9 @@
(c) PCRE2_CONFIG_TABLES_LENGTH is added to pcre2_config() so that an
application that wants to save tables in binary knows how long they are.
+
+22. Changed setting of CMAKE_MODULE_PATH in CMakeLists.txt from SET to
+LIST(APPEND...) to allow a setting from the command line to be included.
Version 10.34 21-November-2019
