[Cmake-commits] [cmake-commits] hoffman committed cmake.cxx 1.399 1.400

[cmake-commits at cmake.org]

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

Modified Files:
	cmake.cxx 
Log Message:
ENH: fix bootstrap test and warning


Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.399
retrieving revision 1.400
diff -C 2 -d -r1.399 -r1.400
*** cmake.cxx	15 Oct 2008 17:56:06 -0000	1.399
--- cmake.cxx	15 Oct 2008 19:13:06 -0000	1.400
***************
*** 35,41 ****
  # include "cmVariableWatch.h"
  # include <cmsys/Terminal.h>
  #endif
  
- #include <cmsys/CommandLineArguments.hxx>
  #include <cmsys/Directory.hxx>
  #include <cmsys/Process.h>
--- 35,41 ----
  # include "cmVariableWatch.h"
  # include <cmsys/Terminal.h>
+ # include <cmsys/CommandLineArguments.hxx>
  #endif
  
  #include <cmsys/Directory.hxx>
  #include <cmsys/Process.h>
***************
*** 4381,4389 ****
                      &output, 
                      makeProgram.c_str(),
!                     config.c_str(), clean, false, 0, true);
  }
  
  int cmake::DoBuild(int ac, char* av[])
  {
    std::string target;
    std::string config = "Debug";
--- 4381,4394 ----
                      &output, 
                      makeProgram.c_str(),
!                     config.c_str(), clean, false, 0, true,
!                     extraBuildOptions.c_str());
  }
  
  int cmake::DoBuild(int ac, char* av[])
  {
+ #ifndef CMAKE_BUILD_WITH_CMAKE
+   std::cerr << "This cmake does not support --build\n";
+   return -1;
+ #else
    std::string target;
    std::string config = "Debug";
***************
*** 4415,4417 ****
--- 4420,4423 ----
    cmake cm;
    return cm.Build(dir, target, config, extraBuildOptions, clean);
+ #endif
  }