diff options
Diffstat (limited to 'Tests/RunCMake')
4 files changed, 18 insertions, 2 deletions
diff --git a/Tests/RunCMake/CheckSourceCompiles/UnknownArgument-stderr.txt b/Tests/RunCMake/CheckSourceCompiles/UnknownArgument-stderr.txt index eed581a..a7e0af5 100644 --- a/Tests/RunCMake/CheckSourceCompiles/UnknownArgument-stderr.txt +++ b/Tests/RunCMake/CheckSourceCompiles/UnknownArgument-stderr.txt @@ -1,9 +1,11 @@ ^CMake Error at [^ -]*/Modules/CheckSourceCompiles.cmake:[0-9]+ \(message\): +]*/Modules/Internal/CheckSourceCompiles.cmake:[0-9]+ \(message\): Unknown argument: BAD Call Stack \(most recent call first\): + [^ +]*/Modules/CheckSourceCompiles.cmake:[0-9]+ \(cmake_check_source_compiles\) UnknownArgument.cmake:[0-9]+ \(check_source_compiles\) CMakeLists.txt:[0-9]+ \(include\)$ diff --git a/Tests/RunCMake/CheckSourceRuns/UnknownArgument-stderr.txt b/Tests/RunCMake/CheckSourceRuns/UnknownArgument-stderr.txt index 8ae1ea1..9b576b5 100644 --- a/Tests/RunCMake/CheckSourceRuns/UnknownArgument-stderr.txt +++ b/Tests/RunCMake/CheckSourceRuns/UnknownArgument-stderr.txt @@ -1,9 +1,11 @@ ^CMake Error at [^ -]*/Modules/CheckSourceRuns.cmake:[0-9]+ \(message\): +]*/Modules/Internal/CheckSourceRuns.cmake:[0-9]+ \(message\): Unknown argument: BAD Call Stack \(most recent call first\): + [^ +]*/Modules/CheckSourceRuns.cmake:[0-9]+ \(cmake_check_source_runs\) UnknownArgument.cmake:[0-9]+ \(check_source_runs\) CMakeLists.txt:[0-9]+ \(include\)$ diff --git a/Tests/RunCMake/NinjaMultiConfig/PerConfigSources.cmake b/Tests/RunCMake/NinjaMultiConfig/PerConfigSources.cmake new file mode 100644 index 0000000..7483130 --- /dev/null +++ b/Tests/RunCMake/NinjaMultiConfig/PerConfigSources.cmake @@ -0,0 +1,8 @@ +enable_language(C) +file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/main_$<CONFIG>.c" CONTENT +[[int main(void) +{ + return 0; +} +]]) +add_executable(exe "${CMAKE_BINARY_DIR}/main_$<CONFIG>.c") diff --git a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake index ec8804b..6699a09 100644 --- a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake +++ b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake @@ -246,6 +246,10 @@ unset(RunCMake_TEST_BINARY_DIR) run_cmake(CustomCommandDepfile) +set(RunCMake_TEST_OPTIONS "-DCMAKE_CROSS_CONFIGS=all") +run_cmake(PerConfigSources) +unset(RunCMake_TEST_OPTIONS) + set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/PostfixAndLocation-build) set(RunCMake_TEST_OPTIONS "-DCMAKE_CONFIGURATION_TYPES=Debug\\;Release;-DCMAKE_CROSS_CONFIGS=all") run_cmake_configure(PostfixAndLocation) |