summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2021-01-14 17:14:58 +0000
committerph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2021-01-14 17:14:58 +0000
commitd20ab1e7506ac54acb96f1f975f68d270687e706 (patch)
treee99e0bd98a1b029644bcccb93ae3610320a9fb7e
parent32e83fc2d59413d13039cc31db1558d9c0e3b874 (diff)
downloadpcre2-d20ab1e7506ac54acb96f1f975f68d270687e706.tar.gz
Another CMake patch for Windows, fixes #2688.
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@1294 6239d852-aaf2-0410-a92c-79f79f948069
-rw-r--r--CMakeLists.txt2
-rw-r--r--ChangeLog3
2 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aec2979..71ba693 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,7 +110,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
LIST(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I\"${PROJECT_SOURCE_DIR}/src\"")
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src)
# external packages
FIND_PACKAGE( BZip2 )
diff --git a/ChangeLog b/ChangeLog
index 231a24e..3fd886a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@ Courreges-Anglas via Nam Nguyen. This fixes RunGrepTest for OpenBSD.
with a NULL dereference. I don't think this case could ever occur in practice,
but I have put in a check in order to get rid of the compiler error.
+3. An alternative patch for CMakeLists.txt because 10.36 # 4 breaks CMake on
+Windows. Patch from email@cs-ware.de fixes bugzilla #2688.
+
Version 10.36 04-December-2020
------------------------------