diff options
| author | ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069> | 2020-03-24 17:45:28 +0000 |
|---|---|---|
| committer | ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069> | 2020-03-24 17:45:28 +0000 |
| commit | f4910a14d8b56bc5fd520fd4fc48ca77b10df7ca (patch) | |
| tree | 7cdb44359b80339e8e9dcc8404e74fd2097d5e34 | |
| parent | 36550126dbf52a4169580d53b773418554eb3d1d (diff) | |
| download | pcre2-f4910a14d8b56bc5fd520fd4fc48ca77b10df7ca.tar.gz | |
Change setting of CMAKE_MODULE_PATH from SET to LIST(APPEND...) to allow a
setting from the command line to be included.
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@1239 6239d852-aaf2-0410-a92c-79f79f948069
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | ChangeLog | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c271b79..a033877 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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,7 +97,11 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0) # 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") @@ -93,6 +93,9 @@ character tables handling have been done: (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 |