diff options
| author | David Cole <david.cole@kitware.com> | 2012-10-17 20:43:36 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-10-17 20:43:36 (GMT) |
| commit | a58cd0d7a4550add92367e43fb3b044d85289c3a (patch) | |
| tree | 4cc64bee76656e13372f95c173b0df9e205928af | |
| parent | b61baf0c5c1e4886f0f799588584cdd2d7ad8ce0 (diff) | |
| parent | a573a856581118d7a9d8dd7be1f613ba7b1ddb04 (diff) | |
| download | CMake-a58cd0d7a4550add92367e43fb3b044d85289c3a.zip CMake-a58cd0d7a4550add92367e43fb3b044d85289c3a.tar.gz CMake-a58cd0d7a4550add92367e43fb3b044d85289c3a.tar.bz2 | |
Merge topic 'suncc-compile-fix'
a573a85 Attempt to fix the compile of cmake on Sun CC.
| -rw-r--r-- | Source/cmGeneratorExpressionEvaluator.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index 92e2052..287066a 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -17,7 +17,10 @@ #include "cmGeneratorExpression.h" //---------------------------------------------------------------------------- -static void reportError(cmGeneratorExpressionContext *context, +#if !defined(__SUNPRO_CC) || __SUNPRO_CC > 0x510 +static +#endif +void reportError(cmGeneratorExpressionContext *context, const std::string &expr, const std::string &result) { context->HadError = true; |