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

ENH: fixes for borland compiler testing

Browse Source
This commit is contained in:
Bill Hoffman 2001-10-03 15:49:52 -04:00
parent e2eaa3efba
commit 8f652aad21
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/Dart.cmake
View File

@ -26,6 +26,9 @@ IF(BUILD_TESTING)
# find programs used by testing # find programs used by testing
# look for the make program # look for the make program
IF( BCB_BIN_PATH )
FIND_PROGRAM(MAKEPROGRAM make ${BCB_BIN_PATH} )
ENDIF( BCB_BIN_PATH )
IF(NOT UNIX) IF(NOT UNIX)
FIND_PROGRAM(MAKEPROGRAM msdev ) FIND_PROGRAM(MAKEPROGRAM msdev )
ENDIF(NOT UNIX) ENDIF(NOT UNIX)

5
Source/CMakeLists.txt
View File

@ -40,7 +40,10 @@ IF (WIN32)
SOURCE_FILES(SRCS cmDSWWriter.cxx cmDSPWriter.cxx cmMSProjectGenerator.cxx) SOURCE_FILES(SRCS cmDSWWriter.cxx cmDSPWriter.cxx cmMSProjectGenerator.cxx)
SOURCE_FILES(SRCS cmBorlandMakefileGenerator.cpp) SOURCE_FILES(SRCS cmBorlandMakefileGenerator.cpp)
IF(NOT UNIX) IF(NOT UNIX)
SUBDIRS(MFCDialog) IF( CMAKE_CXX_COMPILER MATCHES Borland )
ELSE (CMAKE_CXX_COMPILER MATCHES Borland )
SUBDIRS(MFCDialog)
ENDIF( CMAKE_CXX_COMPILER MATCHES Borland)
ENDIF(NOT UNIX) ENDIF(NOT UNIX)
ENDIF (WIN32) ENDIF (WIN32)

4
Source/cmake.cxx
View File

@ -324,7 +324,9 @@ int cmake::Generate(const std::vector<std::string>& args, bool buildMakefiles)
} }
else else
{ {
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(__BORLANDC__)
gen = new cmBorlandMakefileGenerator;
#elif defined(_WIN32) && !defined(__CYGWIN__)
gen = new cmMSProjectGenerator; gen = new cmMSProjectGenerator;
#else #else
gen = new cmUnixMakefileGenerator; gen = new cmUnixMakefileGenerator;

11
Source/cmaketest.cxx
View File

@ -61,7 +61,7 @@ int main (int argc, char *argv[])
// now build the test // now build the test
std::string makeCommand = MAKEPROGRAM; std::string makeCommand = MAKEPROGRAM;
makeCommand += " "; makeCommand += " ";
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__BORLANDC__)
makeCommand += executableName; makeCommand += executableName;
makeCommand += ".dsw /MAKE \"ALL_BUILD - Debug\" /REBUILD"; makeCommand += ".dsw /MAKE \"ALL_BUILD - Debug\" /REBUILD";
#else #else
@ -117,6 +117,15 @@ int main (int argc, char *argv[])
{ {
fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str()); fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str());
} }
if(!cmSystemTools::FileExists(fullPath.c_str()))
{
std::cerr << "Could not find path to executable, perhaps it was not built: " <<
executableName << "\n";
std::cerr << "Error: " << fullPath.c_str() << " execution failed\n";
// return to the original directory
cmSystemTools::ChangeDirectory(cwd.c_str());
return 1;
}
if (!cmSystemTools::RunCommand(fullPath.c_str(), output)) if (!cmSystemTools::RunCommand(fullPath.c_str(), output))
{ {
std::cerr << "Error: " << fullPath.c_str() << " execution failed\n"; std::cerr << "Error: " << fullPath.c_str() << " execution failed\n";