Merge branch 'backport-3.31-file-MAKE_DIRECTORY-result-var'

5 months ago · 41d91387f6
5 changed files with 17 additions and 1 deletions
--- a/Tests/RunCMake/file-MAKE_DIRECTORY/MAKE_DIRECTORY-after-RESULT-result.txt
+++ b/Tests/RunCMake/file-MAKE_DIRECTORY/MAKE_DIRECTORY-after-RESULT-result.txt
@ -0,0 +1 @@
+1
--- a/Tests/RunCMake/file-MAKE_DIRECTORY/MAKE_DIRECTORY-after-RESULT-stderr.txt
+++ b/Tests/RunCMake/file-MAKE_DIRECTORY/MAKE_DIRECTORY-after-RESULT-stderr.txt
@ -0,0 +1,8 @@
+^CMake Error at [^
+]*/Tests/RunCMake/file-MAKE_DIRECTORY/MAKE_DIRECTORY-after-RESULT\.cmake:[0-9]+ \(file\):
+  file MAKE_DIRECTORY called with unexpected
+
+  arguments:
+
+    [^
+]*/Tests/RunCMake/file-MAKE_DIRECTORY/MAKE_DIRECTORY-after-RESULT-build/after$
--- a/Tests/RunCMake/file-MAKE_DIRECTORY/MAKE_DIRECTORY-after-RESULT.cmake
+++ b/Tests/RunCMake/file-MAKE_DIRECTORY/MAKE_DIRECTORY-after-RESULT.cmake
@ -0,0 +1,6 @@
+file(MAKE_DIRECTORY
+  "${CMAKE_CURRENT_BINARY_DIR}/before"
+  RESULT resultVal
+  "${CMAKE_CURRENT_BINARY_DIR}/after"
+)
+message(STATUS "Result=${resultVal}")
--- a/Tests/RunCMake/file-MAKE_DIRECTORY/RunCMakeTest.cmake
+++ b/Tests/RunCMake/file-MAKE_DIRECTORY/RunCMakeTest.cmake
@ -5,3 +5,4 @@ run_cmake_script(MAKE_DIRECTORY-Result-one-dir-FAIL)
 run_cmake_script(MAKE_DIRECTORY-Result-one-dir-SUCCESS)
 run_cmake_script(MAKE_DIRECTORY-Result-many-dirs-FAIL)
 run_cmake_script(MAKE_DIRECTORY-Result-many-dirs-SUCCESS)
+run_cmake_script(MAKE_DIRECTORY-after-RESULT)