diff options
| author | Brad King <brad.king@kitware.com> | 2022-06-22 12:41:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-06-22 12:41:50 (GMT) |
| commit | 8321c3d08e2b332705ae6884aab3278049498a6d (patch) | |
| tree | b6d1cc0581110d6e7a4b8896195d803526da366f | |
| parent | 73afa6e9ae8a585b05cf3faf94a0aee8c20978f7 (diff) | |
| parent | 5022b42f8bc2a31a77c4bdac814166cc955105c6 (diff) | |
| download | CMake-8321c3d08e2b332705ae6884aab3278049498a6d.zip CMake-8321c3d08e2b332705ae6884aab3278049498a6d.tar.gz CMake-8321c3d08e2b332705ae6884aab3278049498a6d.tar.bz2 | |
Merge branch 'backport-3.23-ExternalProject-stamp-cfgdir' into release-3.23
Merge-request: !7396
| -rw-r--r-- | Modules/ExternalProject.cmake | 4 | ||||
| -rw-r--r-- | Modules/ExternalProject/mkdirs.cmake.in | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 7f16fdc..cb62c99 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -1651,6 +1651,7 @@ function(_ep_set_directories name) ${script_filename} @ONLY ) + unset(cfgdir) # do not leak into mkdirs.cmake script include(${script_filename}) endfunction() @@ -2419,11 +2420,12 @@ endfunction() function(_ep_add_mkdir_command name) ExternalProject_Get_Property(${name} tmp_dir) set(script_filename "${tmp_dir}/${name}-mkdirs.cmake") + _ep_get_configuration_subdir_suffix(cfgdir) ExternalProject_Add_Step(${name} mkdir INDEPENDENT TRUE COMMENT "Creating directories for '${name}'" - COMMAND ${CMAKE_COMMAND} -P ${script_filename} + COMMAND ${CMAKE_COMMAND} -Dcfgdir=${cfgdir} -P ${script_filename} ) endfunction() diff --git a/Modules/ExternalProject/mkdirs.cmake.in b/Modules/ExternalProject/mkdirs.cmake.in index d30a2e7..bb835cf 100644 --- a/Modules/ExternalProject/mkdirs.cmake.in +++ b/Modules/ExternalProject/mkdirs.cmake.in @@ -17,3 +17,6 @@ set(configSubDirs @CMAKE_CONFIGURATION_TYPES@) foreach(subDir IN LISTS configSubDirs) file(MAKE_DIRECTORY "@stamp_dir@/${subDir}") endforeach() +if(cfgdir) + file(MAKE_DIRECTORY "@stamp_dir@${cfgdir}") # cfgdir has leading slash +endif() |