[Cmake-commits] [cmake-commits] alex committed cmake.cxx 1.440 1.441 cmExtraEclipseCDT4Generator.cxx 1.30 1.31 cmGlobalKdevelopGenerator.cxx 1.34 1.35

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv24016

Modified Files:
	cmake.cxx cmExtraEclipseCDT4Generator.cxx 
	cmGlobalKdevelopGenerator.cxx 
Log Message:
disable cmake's verbose output in the Eclipse and KDevelop generators

The Eclipse and KDevelop generators set the VERBOSE environment variable to
TRUE in the project files, because they must be able to "see" the full
command lines and errors, otherwise they can't parse the errors. But the
VERBOSE env.var. also enables cmakes own verbose output, which can be quite
long. This commit introduces an environment variable CMAKE_NO_VERBOSE, which
when set disables cmake's verbose output also when VERBOSE is set. This
env.var is now set by both the Eclipse and the KDevelop generators.

Alex


Index: cmExtraEclipseCDT4Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExtraEclipseCDT4Generator.cxx,v
retrieving revision 1.30
retrieving revision 1.31
diff -C 2 -d -r1.30 -r1.31
*** cmExtraEclipseCDT4Generator.cxx	22 Nov 2009 10:01:04 -0000	1.30
--- cmExtraEclipseCDT4Generator.cxx	23 Dec 2009 18:51:45 -0000	1.31
***************
*** 215,220 ****
      "\t\t\t\t<dictionary>\n"
      "\t\t\t\t\t<key>org.eclipse.cdt.make.core.environment</key>\n"
!     "\t\t\t\t\t<value>VERBOSE=1|</value>\n"  // enforce VERBOSE Makefile output
!     "\t\t\t\t\t<value>"
      ;
    // set vsvars32.bat environment available at CMake time,
--- 215,219 ----
      "\t\t\t\t<dictionary>\n"
      "\t\t\t\t\t<key>org.eclipse.cdt.make.core.environment</key>\n"
!     "\t\t\t\t\t<value>VERBOSE=1|CMAKE_NO_VERBOSE=1|"  // enforce VERBOSE Makefile output
      ;
    // set vsvars32.bat environment available at CMake time,
***************
*** 223,229 ****
      {
      if (getenv("PATH"))
!       {
        fout << "PATH=" << getenv("PATH") << "|";
!       }
      if (getenv("INCLUDE"))
        {
--- 222,228 ----
      {
      if (getenv("PATH"))
!     {
        fout << "PATH=" << getenv("PATH") << "|";
!     }
      if (getenv("INCLUDE"))
        {
***************
*** 231,235 ****
        }
      if (getenv("LIB"))
!       {
        fout << "LIB=" << getenv("LIB") << "|";
        }
--- 230,234 ----
        }
      if (getenv("LIB"))
!     {
        fout << "LIB=" << getenv("LIB") << "|";
        }

Index: cmGlobalKdevelopGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalKdevelopGenerator.cxx,v
retrieving revision 1.34
retrieving revision 1.35
diff -C 2 -d -r1.34 -r1.35
*** cmGlobalKdevelopGenerator.cxx	28 Sep 2009 15:42:41 -0000	1.34
--- cmGlobalKdevelopGenerator.cxx	23 Dec 2009 18:51:46 -0000	1.35
***************
*** 476,479 ****
--- 476,480 ----
          "        <default>\n"
          "          <envvar value=\"1\" name=\"VERBOSE\" />\n"
+         "          <envvar value=\"1\" name=\"CMAKE_NO_VERBOSE\" />\n"
          "        </default>\n"
          "      </environments>\n"

Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.440
retrieving revision 1.441
diff -C 2 -d -r1.440 -r1.441
*** cmake.cxx	8 Dec 2009 14:38:33 -0000	1.440
--- cmake.cxx	23 Dec 2009 18:51:45 -0000	1.441
***************
*** 1419,1424 ****
        {
        // Use the make system's VERBOSE environment variable to enable
!       // verbose output.
!       bool verbose = cmSystemTools::GetEnv("VERBOSE") != 0;
  
        // Create a cmake object instance to process dependencies.
--- 1419,1426 ----
        {
        // Use the make system's VERBOSE environment variable to enable
!       // verbose output. This can be skipped by also setting CMAKE_NO_VERBOSE
!       // (which is set by the Eclipse and KDevelop generators).
!       bool verbose = ((cmSystemTools::GetEnv("VERBOSE") != 0) 
!                        && (cmSystemTools::GetEnv("CMAKE_NO_VERBOSE") == 0));
  
        // Create a cmake object instance to process dependencies.
***************
*** 2521,2527 ****
    // We do not need to rerun CMake.  Check dependency integrity.  Use
    // the make system's VERBOSE environment variable to enable verbose
!   // output.
!   bool verbose = cmSystemTools::GetEnv("VERBOSE") != 0;
!   
    // This method will check the integrity of the build system if the
    // option was given on the command line.  It reads the given file to
--- 2523,2531 ----
    // We do not need to rerun CMake.  Check dependency integrity.  Use
    // the make system's VERBOSE environment variable to enable verbose
!   // output. This can be skipped by setting CMAKE_NO_VERBOSE (which is set
!   // by the Eclipse and KDevelop generators).
!   bool verbose = ((cmSystemTools::GetEnv("VERBOSE") != 0) 
!                    && (cmSystemTools::GetEnv("CMAKE_NO_VERBOSE") == 0));
! 
    // This method will check the integrity of the build system if the
    // option was given on the command line.  It reads the given file to