summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2020-12-03 15:41:54 +0000
committerph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2020-12-03 15:41:54 +0000
commite0be6df97de6ce1e8d90b1ea65ee623a0c77f1d4 (patch)
tree2e36e24b84cf0401047a66dd636bd4141dfc878a
parent2d98a50b21461b0b0e942a99cddf94945ccbecab (diff)
downloadpcre2-e0be6df97de6ce1e8d90b1ea65ee623a0c77f1d4.tar.gz
Fixed a Windows CMake testing issue, as advised by Daniel Richard G.
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@1286 6239d852-aaf2-0410-a92c-79f79f948069
-rw-r--r--CMakeLists.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8670aae..aec2979 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,6 +93,7 @@
# 2020-04-25 Carlo added function check for mkostemp used in ProtExecAllocator
# 2020-04-28 PH added function check for memfd_create based on Carlo's patch
# 2020-05-25 PH added a check for Intel CET
+# 2020-12-03 PH altered the definition of pcre2test as suggested by Daniel
PROJECT(PCRE2 C)
@@ -851,7 +852,9 @@ if test \"$?\" != \"0\"; then exit 1; fi
\@echo off
setlocal
SET srcdir=\"${winsrc}\"
-SET pcre2test=\"${winexe}\"
+# The next line was replaced by the following one after a user comment.
+# SET pcre2test=\"${winexe}\"
+SET pcre2test=\"${winbin}\\pcre2test.exe\"
if not [%CMAKE_CONFIG_TYPE%]==[] SET pcre2test=\"${winbin}\\%CMAKE_CONFIG_TYPE%\\pcre2test.exe\"
call %srcdir%\\RunTest.Bat
if errorlevel 1 exit /b 1