diff options
| author | Brad King <brad.king@kitware.com> | 2022-09-23 12:44:06 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-09-23 12:44:23 (GMT) |
| commit | 3a1db0f3adb94aa16d9b037cb19d3910f8697cd8 (patch) | |
| tree | 720a2ef404f01c502e7570a058534e410f3fcc66 /Source/cmCoreTryCompile.cxx | |
| parent | ba770994af4687837e449f83c9183c5e07bd4d5d (diff) | |
| parent | aac542f2f160e133e8d43fa665a8b1ebbf90f106 (diff) | |
| download | CMake-3a1db0f3adb94aa16d9b037cb19d3910f8697cd8.zip CMake-3a1db0f3adb94aa16d9b037cb19d3910f8697cd8.tar.gz CMake-3a1db0f3adb94aa16d9b037cb19d3910f8697cd8.tar.bz2 | |
Merge topic 'try_run-no-project'
aac542f2f1 try_run: Remove PROJECT support
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7702
Diffstat (limited to 'Source/cmCoreTryCompile.cxx')
| -rw-r--r-- | Source/cmCoreTryCompile.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index 3ef62a0..7e7f8d2 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -192,9 +192,6 @@ auto const TryCompileOldArgParser = .Bind(4, &Arguments::TargetName) /* keep semicolon on own line */; -auto const TryRunProjectArgParser = - makeTryRunParser(TryCompileBaseProjectArgParser); - auto const TryRunSourcesArgParser = makeTryRunParser(TryCompileBaseNonProjectArgParser); @@ -226,11 +223,10 @@ Arguments cmCoreTryCompile::ParseArgs( std::vector<std::string> unparsedArguments; const auto& second = *(++args.begin()); - if (second == "PROJECT") { - // New PROJECT signature. - auto arguments = this->ParseArgs( - args, isTryRun ? TryRunProjectArgParser : TryCompileProjectArgParser, - unparsedArguments); + if (!isTryRun && second == "PROJECT") { + // New PROJECT signature (try_compile only). + auto arguments = + this->ParseArgs(args, TryCompileProjectArgParser, unparsedArguments); if (!arguments.BinaryDirectory) { arguments.BinaryDirectory = unique_binary_directory; } |