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

ENH: fix bootstrap test and warning

This commit is contained in:
Bill Hoffman 2008-10-15 15:13:06 -04:00
parent 1777bb502a
commit 3fc5ca34f9
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmake.cxx
View File

@ -34,9 +34,9 @@
# include "cmDependsFortran.h" // For -E cmake_copy_f90_mod callback. # include "cmDependsFortran.h" // For -E cmake_copy_f90_mod callback.
# include "cmVariableWatch.h" # include "cmVariableWatch.h"
# include <cmsys/Terminal.h> # include <cmsys/Terminal.h>
# include <cmsys/CommandLineArguments.hxx>
#endif #endif
#include <cmsys/CommandLineArguments.hxx>
#include <cmsys/Directory.hxx> #include <cmsys/Directory.hxx>
#include <cmsys/Process.h> #include <cmsys/Process.h>
#include <cmsys/Glob.hxx> #include <cmsys/Glob.hxx>
@ -4380,11 +4380,16 @@ int cmake::Build(const std::string& dir,
projName.c_str(), target.c_str(), projName.c_str(), target.c_str(),
&output, &output,
makeProgram.c_str(), makeProgram.c_str(),
config.c_str(), clean, false, 0, true); config.c_str(), clean, false, 0, true,
extraBuildOptions.c_str());
} }
int cmake::DoBuild(int ac, char* av[]) 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 target;
std::string config = "Debug"; std::string config = "Debug";
std::string extraBuildOptions; std::string extraBuildOptions;
@ -4414,4 +4419,5 @@ int cmake::DoBuild(int ac, char* av[])
} }
cmake cm; cmake cm;
return cm.Build(dir, target, config, extraBuildOptions, clean); return cm.Build(dir, target, config, extraBuildOptions, clean);
#endif
} }