summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2020-06-05 15:58:28 +0000
committerph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2020-06-05 15:58:28 +0000
commitfaeeedb95d5334129926db886dbc21e5c15c329d (patch)
tree507dd096748cdba7689db5d6d2f322110caf26ae
parentba4aade745bccba409edccd1685e93ab0568d4b8 (diff)
downloadpcre2-faeeedb95d5334129926db886dbc21e5c15c329d.tar.gz
Allow spaces in directory name in CMake build (fixes #2588).
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@1262 6239d852-aaf2-0410-a92c-79f79f948069
-rw-r--r--CMakeLists.txt2
-rw-r--r--ChangeLog8
2 files changed, 9 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 763b40b..bd75929 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,7 +109,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")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I\"${PROJECT_SOURCE_DIR}/src\"")
# external packages
FIND_PACKAGE( BZip2 )
diff --git a/ChangeLog b/ChangeLog
index eb2b62f..1871d3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,14 @@ invalid utf8 mode is enabled.
does.
- Fix typo: MACTHED_STRING->MATCHED_STRING
+
+4. Updated CMakeLists.txt with another patch from Wolfgang Stöggl (Bugzilla
+#2588):
+
+ - Add escaped double quotes around include directory in CMakeLists.txt to
+ allow spaces in directory names.
+
+ - This fixes a cmake error, if the path of the pcre2 source contains a space.
Version 10.35 09-May-2020