Browse Source

ENH: make CMake less verbose/precious

Sebastien Barre 23 years ago
parent
commit
6083e3c127

+ 2 - 2
Source/cmNMakeMakefileGenerator.cxx

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

+ 3 - 3
Source/cmUnixMakefileGenerator.cxx

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

+ 2 - 2
Templates/CMakeNMakeWindowsSystemConfig.cmake

@@ -49,7 +49,7 @@ SET (CMAKE_BUILD_TYPE Debug CACHE STRING
 SET (CMAKE_CXX_COMPILER cl CACHE FILEPATH
      "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.")
 
 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
      "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.")
 
 SET (CMAKE_C_LIBPATH_FLAG "-LIBPATH:" CACHE STRING

+ 1 - 1
Templates/CMakeWindowsSystemConfig.cmake

@@ -21,7 +21,7 @@ SET (CMAKE_CXX_FLAGS_MINSIZEREL "/MD /O1" CACHE STRING
 SET (CMAKE_CXX_FLAGS_DEBUG "/MDd /Zi /Od /GZ" CACHE STRING
      "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")
 
 SET (CMAKE_EXTRA_LINK_FLAGS "/STACK:10000000" CACHE STRING