From e0be6df97de6ce1e8d90b1ea65ee623a0c77f1d4 Mon Sep 17 00:00:00 2001 From: ph10 Date: Thu, 3 Dec 2020 15:41:54 +0000 Subject: 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 --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1