Change setting of CMAKE_MODULE_PATH from SET to LIST(APPEND...) to allow a

setting from the command line to be included.
This commit is contained in:
Philip.Hazel 2020-03-24 17:45:28 +00:00
parent f988433788
commit 59233b8079
2 changed files with 10 additions and 2 deletions

View File

@ -85,7 +85,8 @@
# 2018-11-14 PH removed unnecessary checks for stdint.h and inttypes.h # 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 # 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) # 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) PROJECT(PCRE2 C)
@ -96,7 +97,11 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
# GET_TARGET_PROPERTY. This should no longer be required. # GET_TARGET_PROPERTY. This should no longer be required.
# CMAKE_POLICY(SET CMP0026 OLD) # 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") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${PROJECT_SOURCE_DIR}/src")

View File

@ -94,6 +94,9 @@ character tables handling have been done:
(c) PCRE2_CONFIG_TABLES_LENGTH is added to pcre2_config() so that an (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. 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 Version 10.34 21-November-2019
------------------------------ ------------------------------