mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 08:20:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Use shorter paths in RunCMake.ExternalProject

Browse Source
This commit is contained in:
Brad King
2025-10-09 18:55:16 -04:00
parent 48b5d61970
commit c555e10fd4
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Tests/RunCMake/ExternalProject/EnvVars-build-stdout.txt
View File

@@ -1,32 +1,32 @@
.*(Performing custom step for 'CustomCommandEnvVars'|CustomCommandEnvVars-custom).*
.*(Performing custom step for 'CustomCommand'|CustomCommand-custom).*
*-- Variable - CustomVar: custom.*
*-- Variable - CustomVar2: custom2.*
*-- Stage: custom
*-- Separator: ;
*-- List: 1;2;3
.*(Performing configure step for 'CustomCommandEnvVars'|CustomCommandEnvVars-configure).*
.*(Performing configure step for 'CustomCommand'|CustomCommand-configure).*
*-- Stage: config
*-- Separator: ;
*-- List: 4;5;6.*
*-- Variable - Stage: config.*
*-- Variable - ListVar: 4;5;6
.*(Performing build step for 'CustomCommandEnvVars'|CustomCommandEnvVars-build).*
.*(Performing build step for 'CustomCommand'|CustomCommand-build).*
*-- Stage: build
*-- Separator: ;
*-- List: 4;5;6
.*(Performing install step for 'CustomCommandEnvVars'|CustomCommandEnvVars-install).*
.*(Performing install step for 'CustomCommand'|CustomCommand-install).*
*-- Stage: install
*-- Separator: ;
*-- List: 4;5;6
.*(Performing test step for 'CustomCommandEnvVars'|CustomCommandEnvVars-test).*
.*(Performing test step for 'CustomCommand'|CustomCommand-test).*
*-- Stage: test
*-- Separator: ;
*-- List: 4;5;6
.*(Performing configure step for 'DefaultCommandEnvVars'|DefaultCommandEnvVars-configure).*
.*(Performing configure step for 'DefaultCommand'|DefaultCommand-configure).*
*-- ConfigVar: config
*-- Separator: ,
*-- List: 7,8,9
.*(Performing build step for 'DefaultCommandEnvVars'|DefaultCommandEnvVars-build).*
.*(Performing build step for 'DefaultCommand'|DefaultCommand-build).*
.*-- Stage: build
*-- Separator: ,
*-- List: 7,8,9,10

12
Tests/RunCMake/ExternalProject/EnvVars.cmake
View File

@@ -6,7 +6,7 @@ include(ExternalProject)
# Comma list-separator
set(ScriptPath "${CMAKE_CURRENT_SOURCE_DIR}/EnvVars/EchoVar.cmake")
ExternalProject_Add(CustomCommandEnvVars
ExternalProject_Add(CustomCommand
DOWNLOAD_COMMAND ""
UPDATE_COMMAND ""
PATCH_COMMAND ""
@@ -37,7 +37,7 @@ ExternalProject_Add(CustomCommandEnvVars
ListVar=set:4,5,6
ListSeparator=set:,)
ExternalProject_Add_Step(CustomCommandEnvVars custom
ExternalProject_Add_Step(CustomCommand custom
DEPENDERS configure
COMMAND "${CMAKE_COMMAND}" -DVARNAME=CustomVar -P ${ScriptPath}
COMMAND "${CMAKE_COMMAND}" -DVARNAME=CustomVar2 -P ${ScriptPath}
@@ -54,12 +54,12 @@ ExternalProject_Add_Step(CustomCommandEnvVars custom
#
# No list separator
ExternalProject_Add(DefaultCommandEnvVars
ExternalProject_Add(DefaultCommand
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/EnvVars"
DOWNLOAD_COMMAND ""
UPDATE_COMMAND ""
PATCH_COMMAND ""
DEPENDS CustomCommandEnvVars
DEPENDS CustomCommand
CMAKE_ARGS
-DVARIABLE=ConfigVar
CONFIGURE_ENVIRONMENT_MODIFICATION
@@ -80,12 +80,12 @@ ExternalProject_Add(DefaultCommandEnvVars
if(NOT WIN32)
# Ensure that using `:` as a list-separator does not break setting environment
# variables
ExternalProject_Add(DefaultCommandListSepEnvVars
ExternalProject_Add(DefaultCommandListSep
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/EnvVars"
DOWNLOAD_COMMAND ""
UPDATE_COMMAND ""
PATCH_COMMAND ""
DEPENDS DefaultCommandEnvVars
DEPENDS DefaultCommand
LIST_SEPARATOR :
CMAKE_ARGS
-DVARIABLE=ConfigVar