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

ENH: make sure the test tests the right cmake, and not the cmake used to bootstrap this cmake

Browse Source
This commit is contained in:
Bill Hoffman 2002-04-05 09:39:13 -05:00
parent 1182eba905
commit 290c509e11
3 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Makefile.borland
View File

@ -36,7 +36,7 @@ cmCableClassSet.obj \
cmListFileCache.obj \ cmListFileCache.obj \
cmSourceGroup.obj cmSourceGroup.obj
cmake: ${OBJS} cmake.exe: ${OBJS}
bcc32 -ecmake ${OBJS} bcc32 -ecmake ${OBJS}

45
Source/cmaketest.cxx
View File

@ -24,9 +24,21 @@
#include "windows.h" #include "windows.h"
#endif #endif
// Create a class to clean up all the registered generators in case of return
struct CleanUp
{
~CleanUp()
{
cmMakefileGenerator::UnRegisterGenerators();
}
};
// 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)
{ {
CleanUp cleanup;
if (argc < 4) if (argc < 4)
{ {
std::cerr << "Usage: " << argv[0] << " test-src-dir test-bin-dir test-executable\n"; std::cerr << "Usage: " << argv[0] << " test-src-dir test-bin-dir test-executable\n";
@ -69,20 +81,22 @@ int main (int argc, char **argv)
cmSystemTools::ChangeDirectory(binaryDirectory); cmSystemTools::ChangeDirectory(binaryDirectory);
std::vector<std::string> args; std::vector<std::string> args;
std::string intdir = ".";
#ifdef CMAKE_INTDIR
intdir = CMAKE_INTDIR;
#endif
// make sure the same generator is used // make sure the same generator is used
// use this program as the cmake to be run, it should not // use this program as the cmake to be run, it should not
// be run that way but the cmake object requires a vailid path // be run that way but the cmake object requires a vailid path
std::string cmakeCommand = CMAKE_COMMAND; std::string cmakeCommand = CMAKE_BINARY_DIR;
if(cmakeCommand[0] == '\\' && cmakeCommand[1] == '\"') cmakeCommand += "/Source";
{ cmakeCommand += "/";
cmakeCommand = cmakeCommand.substr(2, cmakeCommand.size()-4); cmakeCommand += intdir;
} cmakeCommand += "/cmake";
if(cmakeCommand[0] == '\"') cmakeCommand += cmSystemTools::GetExecutableExtension();
{
cmakeCommand = cmakeCommand.substr(1, cmakeCommand.size()-2);
}
std::cout << "*** " << cmakeCommand << "\n";
args.push_back(cmakeCommand.c_str()); args.push_back(cmakeCommand.c_str());
args.push_back(sourceDirectory); args.push_back(sourceDirectory);
std::string generator = "-G"; std::string generator = "-G";
@ -143,10 +157,6 @@ int main (int argc, char **argv)
std::string lowerCaseCommand = makeCommand; std::string lowerCaseCommand = makeCommand;
cmSystemTools::LowerCase(lowerCaseCommand); cmSystemTools::LowerCase(lowerCaseCommand);
std::string dartMakeCommand = DART_MAKECOMMAND; std::string dartMakeCommand = DART_MAKECOMMAND;
std::string buildtype = "Debug";
#ifdef CMAKE_INTDIR
buildtype = CMAKE_INTDIR;
#endif
// if msdev is the make program then do the following // if msdev is the make program then do the following
// MSDEV 6.0 // MSDEV 6.0
if(lowerCaseCommand.find("msdev") != std::string::npos) if(lowerCaseCommand.find("msdev") != std::string::npos)
@ -163,7 +173,7 @@ int main (int argc, char **argv)
makeCommand += " "; makeCommand += " ";
makeCommand += projectName; makeCommand += projectName;
makeCommand += ".dsw /MAKE \"ALL_BUILD - "; makeCommand += ".dsw /MAKE \"ALL_BUILD - ";
makeCommand += buildtype + "\" /REBUILD"; makeCommand += intdir + "\" /REBUILD";
} }
// MSDEV 7.0 .NET // MSDEV 7.0 .NET
else if (lowerCaseCommand.find("devenv") != std::string::npos) else if (lowerCaseCommand.find("devenv") != std::string::npos)
@ -177,7 +187,7 @@ int main (int argc, char **argv)
makeCommand += " "; makeCommand += " ";
makeCommand += projectName; makeCommand += projectName;
makeCommand += ".sln /rebuild "; makeCommand += ".sln /rebuild ";
makeCommand += buildtype + " /project ALL_BUILD"; makeCommand += intdir + " /project ALL_BUILD";
} }
// command line make program // command line make program
else else
@ -224,7 +234,7 @@ int main (int argc, char **argv)
fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str()); fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str());
} }
// try the Debug extension // try the Debug extension
tryPath = buildtype + "/"; tryPath = intdir + "/";
tryPath += cmSystemTools::GetFilenameName(executableName); tryPath += cmSystemTools::GetFilenameName(executableName);
if(cmSystemTools::FileExists(tryPath.c_str())) if(cmSystemTools::FileExists(tryPath.c_str()))
{ {
@ -245,7 +255,7 @@ int main (int argc, char **argv)
} }
tryPath = executableDirectory; tryPath = executableDirectory;
tryPath += "/"; tryPath += "/";
tryPath += buildtype + "/"; tryPath += intdir + "/";
tryPath += executableName; tryPath += executableName;
tryPath += cmSystemTools::GetExecutableExtension(); tryPath += cmSystemTools::GetExecutableExtension();
if(cmSystemTools::FileExists(tryPath.c_str())) if(cmSystemTools::FileExists(tryPath.c_str()))
@ -280,7 +290,6 @@ int main (int argc, char **argv)
std::cout << output << "\n"; std::cout << output << "\n";
// return to the original directory // return to the original directory
cmSystemTools::ChangeDirectory(cwd.c_str()); cmSystemTools::ChangeDirectory(cwd.c_str());
cmMakefileGenerator::UnRegisterGenerators();
if(ret) if(ret)
{ {
cmSystemTools::Error("test executable ", fullPath.c_str(), cmSystemTools::Error("test executable ", fullPath.c_str(),

2
Source/cmaketest.h.in
View File

@ -1,4 +1,4 @@
#define CMAKE_COMMAND "${CMAKE_COMMAND}" #define CMAKE_BINARY_DIR "${CMake_BINARY_DIR}"
#define MAKEPROGRAM "${MAKEPROGRAM}" #define MAKEPROGRAM "${MAKEPROGRAM}"
#define CMAKE_GENERATOR "${CMAKE_GENERATOR}" #define CMAKE_GENERATOR "${CMAKE_GENERATOR}"
#define DART_MAKECOMMAND "${MAKECOMMAND}" #define DART_MAKECOMMAND "${MAKECOMMAND}"