diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-13 13:54:24 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-13 13:54:24 (GMT) |
| commit | 18e00ac7b918865c38a2e34ee584e18c1126c663 (patch) | |
| tree | 7383c63f1bf6f4bce043183a670b1102742acbae /Source/cmMakefile.h | |
| parent | 3b14a4bca417eeafac3daeb306a72dcbba47246e (diff) | |
| parent | ea5324cd4b570ea757a6da96a7bc85538943e008 (diff) | |
| download | CMake-18e00ac7b918865c38a2e34ee584e18c1126c663.zip CMake-18e00ac7b918865c38a2e34ee584e18c1126c663.tar.gz CMake-18e00ac7b918865c38a2e34ee584e18c1126c663.tar.bz2 | |
Merge topic 'avoid-cmMakefile-IssueMessage-after-configure'
ea5324cd cmMakefile: Port messages for compile features to cmake
df8c3130 cmGlobalGenerator: Don't use cmMakefile::IssueMessage after configure
946d1e50 cmMakefile: Avoid IssueMessage after configure is finished
096c7754 cmLocalGenerator: Store Backtrace for the directory
Diffstat (limited to 'Source/cmMakefile.h')
| -rw-r--r-- | Source/cmMakefile.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 7b1b334..81c3f71 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -933,11 +933,12 @@ private: std::vector<cmSourceFile*> QtUiFilesWithOptions; - bool AddRequiredTargetCFeature(cmTarget* target, - const std::string& feature) const; + bool AddRequiredTargetCFeature(cmTarget* target, const std::string& feature, + std::string* error = 0) const; bool AddRequiredTargetCxxFeature(cmTarget* target, - const std::string& feature) const; + const std::string& feature, + std::string* error = 0) const; void CheckNeededCLanguage(const std::string& feature, bool& needC90, bool& needC99, bool& needC11) const; |