Skip to content

Commit

Permalink
Merge r1902366 from trunk:
Browse files Browse the repository at this point in the history
  *) 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
  • Loading branch information
Ivan Zhakov committed Aug 4, 2024
1 parent eab1e70 commit d4bcc10
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
5 changes: 0 additions & 5 deletions STATUS
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]

Expand Down

0 comments on commit d4bcc10

Please sign in to comment.