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

ENH: make CMake less verbose/precious

This commit is contained in:
Sebastien Barre 2002-04-22 15:16:54 -04:00
parent 64beaa8b9c
commit 6083e3c127
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmNMakeMakefileGenerator.cxx
View File

@ -238,7 +238,7 @@ void cmNMakeMakefileGenerator::BuildInSubDirectory(std::ostream& fout,
<< "$(MAKE) $(MAKESILENT) rebuild_cache\n"; << "$(MAKE) $(MAKESILENT) rebuild_cache\n";
if (!silent) if (!silent)
{ {
fout << "\techo Building " << target1 << " in directory " << directory << "\n"; fout << "\techo " << directory << ": building " << target1 << "\n";
} }
fout << "\tcd " << dir << "\n" fout << "\tcd " << dir << "\n"
<< "\t$(MAKE) -$(MAKEFLAGS) $(MAKESILENT) " << target1 << "\n"; << "\t$(MAKE) -$(MAKEFLAGS) $(MAKESILENT) " << target1 << "\n";
@ -247,7 +247,7 @@ void cmNMakeMakefileGenerator::BuildInSubDirectory(std::ostream& fout,
{ {
if (!silent) if (!silent)
{ {
fout << "\techo Building " << target2 << " in directory " << directory << "\n"; fout << "\techo " << directory << ": building " << target2 << "\n";
} }
fout << "\t$(MAKE) -$(MAKEFLAGS) $(MAKESILENT) " << target2 << "\n"; fout << "\t$(MAKE) -$(MAKEFLAGS) $(MAKESILENT) " << target2 << "\n";
} }

6
Source/cmUnixMakefileGenerator.cxx
View File

@ -1183,7 +1183,7 @@ void cmUnixMakefileGenerator::BuildInSubDirectory(std::ostream& fout,
<< "; then $(MAKE) rebuild_cache; fi\n"; << "; then $(MAKE) rebuild_cache; fi\n";
if (!silent) if (!silent)
{ {
fout << "\techo Building " << target1 << " in directory " << directory << "\n"; fout << "\techo " << directory << ": building " << target1 << "\n";
} }
fout << "\t@cd " << directory fout << "\t@cd " << directory
<< "; $(MAKE) -$(MAKEFLAGS) " << target1 << "\n"; << "; $(MAKE) -$(MAKEFLAGS) " << target1 << "\n";
@ -1192,7 +1192,7 @@ void cmUnixMakefileGenerator::BuildInSubDirectory(std::ostream& fout,
{ {
if (!silent) if (!silent)
{ {
fout << "\techo Building " << target2 << " in directory " << directory << "\n"; fout << "\techo " << directory << ": building " << target2 << "\n";
} }
fout << "\t@cd " << directory fout << "\t@cd " << directory
<< "; $(MAKE) -$(MAKEFLAGS) " << target2 << "\n"; << "; $(MAKE) -$(MAKEFLAGS) " << target2 << "\n";
@ -1280,7 +1280,7 @@ void cmUnixMakefileGenerator::OutputSubDirectoryRules(std::ostream& fout)
"default_target", "default_target",
0, "$(TARGETS)", 0, "$(TARGETS)",
SubDirectories, SubDirectories,
true); false);
this->OutputSubDirectoryVars(fout, "SUBDIR_CLEAN", "clean", this->OutputSubDirectoryVars(fout, "SUBDIR_CLEAN", "clean",
"clean", "clean",
0, 0, 0, 0,

4
Templates/CMakeNMakeWindowsSystemConfig.cmake
View File

@ -49,7 +49,7 @@ SET (CMAKE_BUILD_TYPE Debug CACHE STRING
SET (CMAKE_CXX_COMPILER cl CACHE FILEPATH SET (CMAKE_CXX_COMPILER cl CACHE FILEPATH
"Name of C++ compiler used.") "Name of C++ compiler used.")
SET (CMAKE_CXX_FLAGS "/W3 /Zm1000 /GX /GR" CACHE STRING SET (CMAKE_CXX_FLAGS "/nologo /W3 /Zm1000 /GX /GR" CACHE STRING
"Flags used by the compiler during all build types, /GX /GR are for exceptions and rtti in VC++, /Zm1000 increases the compiler's memory allocation to support ANSI C++/stdlib.") "Flags used by the compiler during all build types, /GX /GR are for exceptions and rtti in VC++, /Zm1000 increases the compiler's memory allocation to support ANSI C++/stdlib.")
SET (CMAKE_CXX_FLAGS_DEBUG "/MDd /Zi /Od /GZ" CACHE STRING SET (CMAKE_CXX_FLAGS_DEBUG "/MDd /Zi /Od /GZ" CACHE STRING
@ -69,7 +69,7 @@ SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD /Zi /O2" CACHE STRING
SET (CMAKE_C_COMPILER cl CACHE FILEPATH SET (CMAKE_C_COMPILER cl CACHE FILEPATH
"Name of C compiler used.") "Name of C compiler used.")
SET (CMAKE_C_FLAGS "/W3 /Zm1000" CACHE STRING SET (CMAKE_C_FLAGS "/nologo /W3 /Zm1000" CACHE STRING
"Flags for C compiler.") "Flags for C compiler.")
SET (CMAKE_C_LIBPATH_FLAG "-LIBPATH:" CACHE STRING SET (CMAKE_C_LIBPATH_FLAG "-LIBPATH:" CACHE STRING

2
Templates/CMakeWindowsSystemConfig.cmake
View File

@ -21,7 +21,7 @@ SET (CMAKE_CXX_FLAGS_MINSIZEREL "/MD /O1" CACHE STRING
SET (CMAKE_CXX_FLAGS_DEBUG "/MDd /Zi /Od /GZ" CACHE STRING SET (CMAKE_CXX_FLAGS_DEBUG "/MDd /Zi /Od /GZ" CACHE STRING
"Flags used by the compiler during debug builds") "Flags used by the compiler during debug builds")
SET (CMAKE_CXX_FLAGS "/W3 /Zm1000 /GX /GR" CACHE STRING SET (CMAKE_CXX_FLAGS "/nologo /W3 /Zm1000 /GX /GR" CACHE STRING
"Flags used by the compiler during all build types, /GX /GR are for exceptions and rtti in VC++, /Zm1000 increases the compiler's memory allocation to support ANSI C++/stdlib") "Flags used by the compiler during all build types, /GX /GR are for exceptions and rtti in VC++, /Zm1000 increases the compiler's memory allocation to support ANSI C++/stdlib")
SET (CMAKE_EXTRA_LINK_FLAGS "/STACK:10000000" CACHE STRING SET (CMAKE_EXTRA_LINK_FLAGS "/STACK:10000000" CACHE STRING