You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by iv...@apache.org on 2023/01/17 16:35:27 UTC
svn commit: r1906741 - in /apr/apr/branches/1.6.x: ./ CMakeLists.txt
Author: ivan
Date: Tue Jan 17 16:35:26 2023
New Revision: 1906741
URL: http://svn.apache.org/viewvc?rev=1906741&view=rev
Log:
On 1.6.x branch: Merge r1902088 from 1.8.x branch:
Merge r1895514 and r1902063 from trunk.
Modified:
apr/apr/branches/1.6.x/ (props changed)
apr/apr/branches/1.6.x/CMakeLists.txt
Propchange: apr/apr/branches/1.6.x/
------------------------------------------------------------------------------
Merged /apr/apr/branches/1.8.x:r1902088
Merged /apr/apr/trunk:r1895514,1902063
Modified: apr/apr/branches/1.6.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/CMakeLists.txt?rev=1906741&r1=1906740&r2=1906741&view=diff
==============================================================================
--- apr/apr/branches/1.6.x/CMakeLists.txt (original)
+++ apr/apr/branches/1.6.x/CMakeLists.txt Tue Jan 17 16:35:26 2023
@@ -49,11 +49,11 @@ CONFIGURE_FILE(include/apr.hwc
${PROJECT_BINARY_DIR}/apr.h)
ADD_EXECUTABLE(gen_test_char tools/gen_test_char.c)
-GET_TARGET_PROPERTY(GEN_TEST_CHAR_EXE gen_test_char LOCATION)
+
ADD_CUSTOM_COMMAND(
COMMENT "Generating character tables, apr_escape_test_char.h, for current locale"
DEPENDS gen_test_char
- COMMAND ${GEN_TEST_CHAR_EXE} > ${PROJECT_BINARY_DIR}/apr_escape_test_char.h
+ COMMAND $<TARGET_FILE:gen_test_char> > ${PROJECT_BINARY_DIR}/apr_escape_test_char.h
OUTPUT ${PROJECT_BINARY_DIR}/apr_escape_test_char.h
)
ADD_CUSTOM_TARGET(