diff options
| -rw-r--r-- | Source/cmExprParser.cxx | 6 | ||||
| -rw-r--r-- | Source/cmExprParserHelper.cxx | 14 | ||||
| -rw-r--r-- | Source/cmFLTKWrapUICommand.cxx | 7 |
3 files changed, 10 insertions, 17 deletions
diff --git a/Source/cmExprParser.cxx b/Source/cmExprParser.cxx index d1b2fa8..a389c7c 100644 --- a/Source/cmExprParser.cxx +++ b/Source/cmExprParser.cxx @@ -121,7 +121,8 @@ This file must be translated to C and modified to build everywhere. Run bison like this: - bison --yacc --name-prefix=cmExpr_yy --defines=cmExprParserTokens.h -ocmExprParser.cxx cmExprParser.y + bison --yacc --name-prefix=cmExpr_yy --defines=cmExprParserTokens.h + -ocmExprParser.cxx cmExprParser.y Modify cmExprParser.cxx: - remove TABs @@ -161,7 +162,8 @@ static void cmExprError(yyscan_t yyscanner, const char* message); #endif #ifdef _MSC_VER # pragma warning (disable: 4102) /* Unused goto label. */ -# pragma warning (disable: 4065) /* Switch statement contains default but no case. */ +# pragma warning (disable: 4065) /* Switch statement contains default but + no case. */ #endif diff --git a/Source/cmExprParserHelper.cxx b/Source/cmExprParserHelper.cxx index 1b6852d..bf9d25f 100644 --- a/Source/cmExprParserHelper.cxx +++ b/Source/cmExprParserHelper.cxx @@ -72,7 +72,8 @@ int cmExprParserHelper::ParseString(const char* str, int verb) if ( Verbose ) { - std::cerr << "Expanding [" << str << "] produced: [" << this->Result << "]" << std::endl; + std::cerr << "Expanding [" << str << "] produced: [" + << this->Result << "]" << std::endl; } return 1; } @@ -109,19 +110,8 @@ int cmExprParserHelper::LexInput(char* buf, int maxlen) void cmExprParserHelper::Error(const char* str) { unsigned long pos = static_cast<unsigned long>(this->InputBufferPos); - //fprintf(stderr, "Argument Parser Error: %s (%lu / Line: %d)\n", str, pos, this->CurrentLine); cmOStringStream ostr; ostr << str << " (" << pos << ")"; - /* - int cc; - std::cerr << "String: ["; - for ( cc = 0; cc < 30 && *(this->InputBuffer.c_str() + this->InputBufferPos + cc); - cc ++ ) - { - std::cerr << *(this->InputBuffer.c_str() + this->InputBufferPos + cc); - } - std::cerr << "]" << std::endl; - */ this->ErrorString = ostr.str(); } diff --git a/Source/cmFLTKWrapUICommand.cxx b/Source/cmFLTKWrapUICommand.cxx index c6097c4..2412d55 100644 --- a/Source/cmFLTKWrapUICommand.cxx +++ b/Source/cmFLTKWrapUICommand.cxx @@ -139,9 +139,10 @@ void cmFLTKWrapUICommand::FinalPass() std::string msg = "In CMake 2.2 the FLTK_WRAP_UI command sets a variable to the list of " "source files that should be added to your executable or library. It " - "appears that you have not added these source files to your target. You " - "should change your CMakeLists.txt file to directly add the generated " - "files to the target. For example FTLK_WRAP_UI(foo src1 src2 src3) " + "appears that you have not added these source files to your target. " + "You should change your CMakeLists.txt file to " + "directly add the generated files to the target. " + "For example FTLK_WRAP_UI(foo src1 src2 src3) " "will create a variable named foo_FLTK_UI_SRCS that contains the list " "of sources to add to your target when you call ADD_LIBRARY or " "ADD_EXECUTABLE. For now CMake will add the sources to your target " |