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

add dependency for configure files and use short path in WIN32 cmake test

Browse Source
This commit is contained in:
Bill Hoffman 2001-10-26 15:42:02 -04:00
parent f586f7df8d
commit 1c5c899fd7
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/cmConfigureFileCommand.cxx
View File

@ -90,6 +90,7 @@ void cmConfigureFileCommand::FinalPass()
void cmConfigureFileCommand::ConfigureFile() void cmConfigureFileCommand::ConfigureFile()
{ {
m_Makefile->ExpandVariablesInString(m_InputFile); m_Makefile->ExpandVariablesInString(m_InputFile);
m_Makefile->AddCMakeDependFile(m_InputFile.c_str());
m_Makefile->ExpandVariablesInString(m_OuputFile); m_Makefile->ExpandVariablesInString(m_OuputFile);
cmSystemTools::ConvertToUnixSlashes(m_OuputFile); cmSystemTools::ConvertToUnixSlashes(m_OuputFile);
std::string::size_type pos = m_OuputFile.rfind('/'); std::string::size_type pos = m_OuputFile.rfind('/');

4
Source/cmMakefile.h
View File

@ -493,6 +493,10 @@ public:
const std::vector<std::string>& GetListFiles() const const std::vector<std::string>& GetListFiles() const
{ return m_ListFiles; } { return m_ListFiles; }
///! When the file changes cmake will be re-run from the build system.
void AddCMakeDependFile(const char* file)
{ m_ListFiles.push_back(file);}
/** /**
* Dump documentation to a file. If 0 is returned, the * Dump documentation to a file. If 0 is returned, the
* operation failed. * operation failed.

18
Source/cmaketest.cxx
View File

@ -3,6 +3,9 @@
#include "cmake.h" #include "cmake.h"
#include "cmListFileCache.h" #include "cmListFileCache.h"
#include "cmMakefileGenerator.h" #include "cmMakefileGenerator.h"
#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__BORLANDC__)
#include "windows.h"
#endif
// this is a test driver program for cmake. // this is a test driver program for cmake.
int main (int argc, char *argv[]) int main (int argc, char *argv[])
@ -60,8 +63,21 @@ int main (int argc, char *argv[])
cmListFileCache::GetInstance()->ClearCache(); cmListFileCache::GetInstance()->ClearCache();
// now build the test // now build the test
std::string makeCommand = MAKEPROGRAM; std::string makeCommand = MAKEPROGRAM;
makeCommand += " ";
#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__BORLANDC__) #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__BORLANDC__)
// if there are spaces in the makeCommand, assume a full path
// and convert it to a path with no spaces in it as the
// RunCommand does not like spaces
if(makeCommand.find(' ') != std::string::npos)
{
char *buffer = new char[makeCommand.size()+1];
if(GetShortPathName(makeCommand.c_str(), buffer,
makeCommand.size()+1) != 0)
{
makeCommand = buffer;
delete [] buffer;
}
}
makeCommand += " ";
makeCommand += executableName; makeCommand += executableName;
makeCommand += ".dsw /MAKE \"ALL_BUILD - Debug\" /REBUILD"; makeCommand += ".dsw /MAKE \"ALL_BUILD - Debug\" /REBUILD";
#else #else