From: Ivan Zhakov <ivan@apache.org>
Date: Sun, 4 Aug 2024 11:01:17 +0000 (+0000)
Subject: Merge r1902366 from trunk:
X-Git-Tag: 2.4.63-candidate~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4bcc1062fa2da8931fbf1ce3db0c9da150a30e7;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1902366 from trunk:

  *) CMake: Use full path to gen_test_char.exe in CUSTOM_COMMAND.

Submitted by: ivan
Reviewed By: ylavic, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1919663 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b30547d397..2fc767f3335 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -628,11 +628,10 @@ ENDIF()
 CONFIGURE_FILE(os/win32/BaseAddr.ref ${PROJECT_BINARY_DIR}/ COPYONLY)
 
 ADD_EXECUTABLE(gen_test_char server/gen_test_char.c)
-GET_TARGET_PROPERTY(GEN_TEST_CHAR_EXE gen_test_char LOCATION)
 ADD_CUSTOM_COMMAND(
   COMMENT "Generating character tables, test_char.h, for current locale"
   DEPENDS gen_test_char
-  COMMAND ${GEN_TEST_CHAR_EXE} > ${PROJECT_BINARY_DIR}/test_char.h
+  COMMAND $<TARGET_FILE:gen_test_char> > ${PROJECT_BINARY_DIR}/test_char.h
   OUTPUT ${PROJECT_BINARY_DIR}/test_char.h
 )
 ADD_CUSTOM_TARGET(
diff --git a/STATUS b/STATUS
index 587ece39f82..5e7e282d1f2 100644
--- a/STATUS
+++ b/STATUS
@@ -157,11 +157,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) CMake: Use full path to gen_test_char.exe in CUSTOM_COMMAND.
-     trunk patch: http://svn.apache.org/r1902366
-     2.4.x patch: svn merge -c r1902366 ^/httpd/httpd/trunk .
-     +1: ivan, ylavic, covener
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]