diff options
| author | Brad King <brad.king@kitware.com> | 2008-03-20 22:25:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-03-20 22:25:59 (GMT) |
| commit | a6a673979dded1cc97a76c193e29bab64b00480e (patch) | |
| tree | bf8c8d7b6260059a997d0f49c8ce07f730a00682 /Source | |
| parent | 8e2f45c24b98ad97be584c61528a82807ef5cebe (diff) | |
| download | CMake-a6a673979dded1cc97a76c193e29bab64b00480e.zip CMake-a6a673979dded1cc97a76c193e29bab64b00480e.tar.gz CMake-a6a673979dded1cc97a76c193e29bab64b00480e.tar.bz2 | |
ENH: Add "if(POLICY policy-id)" option for IF command.
- This will help projects support multiple CMake versions.
- In order to set a policy when using a newer CMake but still
working with an older CMake one may write
if(POLICY CMP1234)
cmake_policy(SET CMP1234 NEW)
endif(POLICY CMP1234)
- Note that since CMake 2.4 does not have if(POLICY) supporting
it will also require using "if(COMMAND cmake_policy)"
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmIfCommand.cxx | 17 | ||||
| -rw-r--r-- | Source/cmIfCommand.h | 3 |
2 files changed, 20 insertions, 0 deletions
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx index b39e57c..517348c 100644 --- a/Source/cmIfCommand.cxx +++ b/Source/cmIfCommand.cxx @@ -357,6 +357,23 @@ bool cmIfCommand::IsTrue(const std::vector<std::string> &args, IncrementArguments(newArgs,argP1,argP2); reducible = 1; } + // does a policy exist + if (*arg == "POLICY" && argP1 != newArgs.end()) + { + cmPolicies::PolicyID pid; + if(makefile->GetPolicies()->GetPolicyID((argP1)->c_str(), pid)) + { + *arg = "1"; + } + else + { + *arg = "0"; + } + newArgs.erase(argP1); + argP1 = arg; + IncrementArguments(newArgs,argP1,argP2); + reducible = 1; + } // is a variable defined if (*arg == "DEFINED" && argP1 != newArgs.end()) { diff --git a/Source/cmIfCommand.h b/Source/cmIfCommand.h index 8576274..bdccdf3 100644 --- a/Source/cmIfCommand.h +++ b/Source/cmIfCommand.h @@ -139,6 +139,9 @@ public: " if(COMMAND command-name)\n" "True if the given name is a command, macro or function that can be " "invoked.\n" + " if(POLICY policy-id)\n" + "True if the given name is an existing policy " + "(of the form CMP<NNNN>).\n" " if(EXISTS file-name)\n" " if(EXISTS directory-name)\n" "True if the named file or directory exists. " |