diff options
| author | Brad King <brad.king@kitware.com> | 2023-03-01 14:20:56 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-03-01 14:21:03 (GMT) |
| commit | 0c30af2753b26f717065389ec682c385f6b900b5 (patch) | |
| tree | 5bb0de11e9654ddf3b967f597651c60be34e25ec /Source | |
| parent | 446e89b28b971384d8eaecdc617e188082a2ba2c (diff) | |
| parent | 2e469212c89c8a7569cc21e271298040d8a2190c (diff) | |
| download | CMake-0c30af2753b26f717065389ec682c385f6b900b5.zip CMake-0c30af2753b26f717065389ec682c385f6b900b5.tar.gz CMake-0c30af2753b26f717065389ec682c385f6b900b5.tar.bz2 | |
Merge topic 'remove-dart-modules'
2e469212c8 Dart,FindDart: Add policy to remove these modules
6dd2948b4b Tests: Port "testing" test from Dart module to CTest module
1f5ff4d131 Merge branch 'upstream-KWSys' into remove-dart-modules
ec3652a0bd KWSys 2023-02-28 (68534a6a)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8265
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmFindPackageCommand.cxx | 1 | ||||
| -rw-r--r-- | Source/cmIncludeCommand.cxx | 2 | ||||
| -rw-r--r-- | Source/cmPolicies.h | 4 | ||||
| -rw-r--r-- | Source/kwsys/CMakeLists.txt | 6 |
4 files changed, 7 insertions, 6 deletions
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index 5f1a2c5..8acfe83 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -502,6 +502,7 @@ cmFindPackageCommand::cmFindPackageCommand(cmExecutionStatus& status) this->DebugMode = false; this->AppendSearchPathGroups(); + this->DeprecatedFindModules["Dart"] = cmPolicies::CMP0145; this->DeprecatedFindModules["Qt"] = cmPolicies::CMP0084; } diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx index 9242344..3564cf7 100644 --- a/Source/cmIncludeCommand.cxx +++ b/Source/cmIncludeCommand.cxx @@ -20,7 +20,9 @@ bool cmIncludeCommand(std::vector<std::string> const& args, { static std::map<std::string, cmPolicies::PolicyID> DeprecatedModules; if (DeprecatedModules.empty()) { + DeprecatedModules["Dart"] = cmPolicies::CMP0145; DeprecatedModules["Documentation"] = cmPolicies::CMP0106; + DeprecatedModules["FindDart"] = cmPolicies::CMP0145; DeprecatedModules["WriteCompilerDetectionHeader"] = cmPolicies::CMP0120; } diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h index 1eca586..830e14b 100644 --- a/Source/cmPolicies.h +++ b/Source/cmPolicies.h @@ -437,7 +437,9 @@ class cmMakefile; cmPolicies::WARN) \ SELECT(POLICY, CMP0144, \ "find_package uses upper-case <PACKAGENAME>_ROOT variables.", 3, 27, \ - 0, cmPolicies::WARN) + 0, cmPolicies::WARN) \ + SELECT(POLICY, CMP0145, "The Dart and FindDart modules are removed.", 3, \ + 27, 0, cmPolicies::WARN) #define CM_SELECT_ID(F, A1, A2, A3, A4, A5, A6) F(A1) #define CM_FOR_EACH_POLICY_ID(POLICY) \ diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index 2defc6c..2b8eedd 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -201,11 +201,7 @@ endif() # Enable testing if building standalone. if(KWSYS_STANDALONE) - include(Dart) - mark_as_advanced(BUILD_TESTING DART_ROOT TCL_TCLSH) - if(BUILD_TESTING) - enable_testing() - endif() + include(CTest) endif() # Choose default shared/static build if not specified. |