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

updated for out of tree builds

This commit is contained in:
Ken Martin 2001-05-21 09:50:24 -04:00
parent 4a2ebf219d
commit 06f403b274
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/CMakeSetup.dsw
View File

@ -24,16 +24,16 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name CMakeSetupCMD
Project_Dep_Name CMakeLib
End Project Dependency
Begin Project Dependency
Project_Dep_Name CMakeLib
Project_Dep_Name cmake
End Project Dependency
}}}
###############################################################################
Project: "CMakeSetupCMD"=.\CMakeSetupCMD.dsp - Package Owner=<4>
Project: "DumpDocumentation"=.\DumpDocumentation.dsp - Package Owner=<4>
Package=<5>
{{{
@ -48,7 +48,7 @@ Package=<4>
###############################################################################
Project: "DumpDocumentation"=.\DumpDocumentation.dsp - Package Owner=<4>
Project: "cmake"=.\cmake.dsp - Package Owner=<4>
Package=<5>
{{{

6
Source/MFCDialog/CMakeSetupDialog.cpp
View File

@ -319,6 +319,8 @@ void CMakeSetupDialog::OnBuildProjects()
}
// Make sure we are working from the cache on disk
this->LoadCacheFromDiskToGUI();
// duh
// Create a makefile object
cmMakefile makefile;
makefile.SetMakefileGenerator(new cmMSProjectGenerator);
@ -343,6 +345,8 @@ void CMakeSetupDialog::OnBuildProjects()
makefile.GenerateMakefile();
// Save the cache
cmCacheManager::GetInstance()->SaveCache(&makefile);
// end duh
// update the GUI with any new values in the caused by the
// generation process
this->LoadCacheFromDiskToGUI();
@ -471,7 +475,7 @@ void CMakeSetupDialog::LoadCacheFromDiskToGUI()
("CMAKE_ROOT", root.c_str(),
"Path to CMake installation.", cmCacheManager::INTERNAL);
std::string cMakeCMD = "\""+cmSystemTools::GetProgramPath(fname);
cMakeCMD += "/CMakeSetupCMD.exe\"";
cMakeCMD += "/cmake.exe\"";
// Save the value in the cache
cmCacheManager::GetInstance()->AddCacheEntry("CMAKE_COMMAND",

3
Source/cmake.cxx
View File

@ -46,6 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "cmMSProjectGenerator.h"
#else
#include "cmUnixMakefileGenerator.h"
#endif
int main(int ac, char** av)
{
cmake foo;
@ -56,7 +58,6 @@ int main(int ac, char** av)
}
return foo.Generate(ac,av);
}
#endif
void cmake::Usage(const char* program)
{