diff options
| -rw-r--r-- | Modules/Dart.cmake | 3 | ||||
| -rw-r--r-- | Source/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Source/cmake.cxx | 4 | ||||
| -rw-r--r-- | Source/cmaketest.cxx | 11 |
4 files changed, 20 insertions, 3 deletions
diff --git a/Modules/Dart.cmake b/Modules/Dart.cmake index 6c6c242..492a8fb 100644 --- a/Modules/Dart.cmake +++ b/Modules/Dart.cmake @@ -26,6 +26,9 @@ IF(BUILD_TESTING) # find programs used by testing # look for the make program + IF( BCB_BIN_PATH ) + FIND_PROGRAM(MAKEPROGRAM make ${BCB_BIN_PATH} ) + ENDIF( BCB_BIN_PATH ) IF(NOT UNIX) FIND_PROGRAM(MAKEPROGRAM msdev ) ENDIF(NOT UNIX) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 2c4410b..f51f358 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -40,7 +40,10 @@ IF (WIN32) SOURCE_FILES(SRCS cmDSWWriter.cxx cmDSPWriter.cxx cmMSProjectGenerator.cxx) SOURCE_FILES(SRCS cmBorlandMakefileGenerator.cpp) 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 (WIN32) diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 18235ee..ff99837 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -324,7 +324,9 @@ int cmake::Generate(const std::vector<std::string>& args, bool buildMakefiles) } else { -#if defined(_WIN32) && !defined(__CYGWIN__) +#if defined(__BORLANDC__) + gen = new cmBorlandMakefileGenerator; +#elif defined(_WIN32) && !defined(__CYGWIN__) gen = new cmMSProjectGenerator; #else gen = new cmUnixMakefileGenerator; diff --git a/Source/cmaketest.cxx b/Source/cmaketest.cxx index 8a6b5df..8756601 100644 --- a/Source/cmaketest.cxx +++ b/Source/cmaketest.cxx @@ -61,7 +61,7 @@ int main (int argc, char *argv[]) // now build the test std::string makeCommand = MAKEPROGRAM; makeCommand += " "; -#if defined(_WIN32) && !defined(__CYGWIN__) +#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__BORLANDC__) makeCommand += executableName; makeCommand += ".dsw /MAKE \"ALL_BUILD - Debug\" /REBUILD"; #else @@ -117,6 +117,15 @@ int main (int argc, char *argv[]) { 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)) { std::cerr << "Error: " << fullPath.c_str() << " execution failed\n"; |