svn commit: r1920902 - /subversion/trunk/CMakeLists.txt

Author: jun66j5
Date: Wed Sep 25 09:43:08 2024
New Revision: 1920902

URL: http://svn.apache.org/viewvc?rev=1920902&view=rev
Log:
cmake: Fix cmdline.* tests failing when multi-config generator is used.

* CMakeLists.txt
  (): Use `$<TARGET_FILE_DIR:...>` rather than `CMAKE_CURRENT_BINARY_DIR`.

Modified:
    subversion/trunk/CMakeLists.txt

Modified: subversion/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/subversion/trunk/CMakeLists.txt?rev=1920902&r1=1920901&r2=1920902&view=diff
==============================================================================
--- subversion/trunk/CMakeLists.txt (original)
+++ subversion/trunk/CMakeLists.txt Wed Sep 25 09:43:08 2024
@@ -668,19 +668,20 @@ if(SVN_ENABLE_TESTS)
   foreach(py_test_path ${PYTHON_TESTS})
     # Keep `.py'.
     get_filename_component(py_test_name ${py_test_path} NAME_WLE)
+    set(binary_dir $<TARGET_FILE_DIR:svn>)
 
     add_test(
       NAME
         "cmdline.${py_test_name}"
       COMMAND
         "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/build/run_tests.py"
-        --bin ${CMAKE_CURRENT_BINARY_DIR}
-        --tools-bin ${CMAKE_CURRENT_BINARY_DIR}
+        --bin ${binary_dir}
+        --tools-bin ${binary_dir}
         --verbose
         --log-to-stdout
         --set-log-level=WARNING
         ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_BINARY_DIR}
+        ${binary_dir}
         ${py_test_path}
     )
   endforeach()