kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

STYLE: fix line lengths and add "remove -f" to the docs

Browse Source 
Alex
This commit is contained in:
Alexander Neundorf 2007-07-17 10:44:09 -04:00
parent 95a8331edb
commit a4429ad30a
3 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmLocalGenerator.cxx
View File

@ -65,7 +65,8 @@ cmLocalGenerator::~cmLocalGenerator()
void cmLocalGenerator::Configure() void cmLocalGenerator::Configure()
{ {
cmLocalGenerator* previousLg = this->GetGlobalGenerator()->GetCurrentLocalGenerator(); cmLocalGenerator* previousLg =
this->GetGlobalGenerator()->GetCurrentLocalGenerator();
this->GetGlobalGenerator()->SetCurrentLocalGenerator(this); this->GetGlobalGenerator()->SetCurrentLocalGenerator(this);
// make sure the CMakeFiles dir is there // make sure the CMakeFiles dir is there

14
Source/cmake.cxx
View File

@ -853,22 +853,24 @@ void CMakeCommandUsage(const char* program)
<< "Usage: " << program << " -E [command] [arguments ...]\n" << "Usage: " << program << " -E [command] [arguments ...]\n"
<< "Available commands: \n" << "Available commands: \n"
<< " chdir dir cmd [args]... - run command in a given directory\n" << " chdir dir cmd [args]... - run command in a given directory\n"
<< " copy file destination - copy file to destination (either file or " << " copy file destination - copy file to destination (either file "
"directory)\n" "or directory)\n"
<< " copy_if_different in-file out-file - copy file if input has " << " copy_if_different in-file out-file - copy file if input has "
"changed\n" "changed\n"
<< " copy_directory source destination - copy directory 'source' " << " copy_directory source destination - copy directory 'source' "
"content to directory 'destination'\n" "content to directory 'destination'\n"
<< " compare_files file1 file2 - check if file1 is same as file2\n" << " compare_files file1 file2 - check if file1 is same as file2\n"
<< " echo [string]... - displays arguments as text\n" << " echo [string]... - displays arguments as text\n"
<< " echo_append [string]... - displays arguments as text but no new" << " echo_append [string]... - displays arguments as text but no new "
" line\n" "line\n"
<< " environment - display the current enviroment\n" << " environment - display the current enviroment\n"
<< " make_directory dir - create a directory\n" << " make_directory dir - create a directory\n"
<< " md5sum file1 [...] - compute md5sum of files\n" << " md5sum file1 [...] - compute md5sum of files\n"
<< " remove_directory dir - remove a directory and its contents\n" << " remove_directory dir - remove a directory and its contents\n"
<< " remove file1 file2 ... - remove the file(s)\n" << " remove [-f] file1 file2 ... - remove the file(s), use -f to force "
<< " tar [cxt][vfz] file.tar file/dir1 file/dir2 ... - create a tar.\n" "it\n"
<< " tar [cxt][vfz] file.tar file/dir1 file/dir2 ... - create a tar "
"archive\n"
<< " time command [args] ... - run command and return elapsed time\n" << " time command [args] ... - run command and return elapsed time\n"
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
<< " write_regv key value - write registry value\n" << " write_regv key value - write registry value\n"

8
Source/cmakemain.cxx
View File

@ -211,12 +211,14 @@ static std::string cmakemainGetStack(void *clientdata)
return msg; return msg;
} }
static void cmakemainErrorCallback(const char* m, const char* title, bool& nomore, void *clientdata) static void cmakemainErrorCallback(const char* m, const char* title,
bool& nomore, void *clientdata)
{ {
std::cerr << m << cmakemainGetStack(clientdata) << std::endl << std::flush; std::cerr << m << cmakemainGetStack(clientdata) << std::endl << std::flush;
} }
static void cmakemainProgressCallback(const char *m, float prog, void* clientdata) static void cmakemainProgressCallback(const char *m, float prog,
void* clientdata)
{ {
cmMakefile* mf = cmakemainGetMakefile(clientdata); cmMakefile* mf = cmakemainGetMakefile(clientdata);
std::string dir; std::string dir;
@ -233,7 +235,7 @@ static void cmakemainProgressCallback(const char *m, float prog, void* clientdat
if ((prog < 0) || (!dir.empty())) if ((prog < 0) || (!dir.empty()))
{ {
std::cout << "-- " << m << dir << cmakemainGetStack(clientdata) << std::endl; std::cout << "-- " << m << dir << cmakemainGetStack(clientdata)<<std::endl;
} }
std::cout.flush(); std::cout.flush();