diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2002-09-30 11:09:31 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2002-09-30 11:09:31 (GMT) |
| commit | be6a5696bafff4f431d09fa038cec74db0949557 (patch) | |
| tree | 4bf6016c199863c4ad97e7f6d4ca987fee217190 | |
| parent | d789b135026cb8acda06cf8e624903629dc00c95 (diff) | |
| download | CMake-be6a5696bafff4f431d09fa038cec74db0949557.zip CMake-be6a5696bafff4f431d09fa038cec74db0949557.tar.gz CMake-be6a5696bafff4f431d09fa038cec74db0949557.tar.bz2 | |
Make borland pass all the tests on XP (and 2000?)
| -rw-r--r-- | Source/cmSystemTools.cxx | 3 | ||||
| -rw-r--r-- | Templates/CMakeBorlandWindowsSystemConfig.cmake | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 852c7e7..bf57b5c 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -1434,9 +1434,8 @@ bool WindowsRunCommand(const char* command, const char* dir, ReadFile(read_stdout,buf,1023,&bread,NULL); //read the stdout pipe - std::cout << buf << std::flush; memset(buf, 0, sizeof(buf)); - + std::cout << buf << std::flush; } } diff --git a/Templates/CMakeBorlandWindowsSystemConfig.cmake b/Templates/CMakeBorlandWindowsSystemConfig.cmake index e81c34e..a19922c 100644 --- a/Templates/CMakeBorlandWindowsSystemConfig.cmake +++ b/Templates/CMakeBorlandWindowsSystemConfig.cmake @@ -84,7 +84,7 @@ SET (CMAKE_SHLIB_SUFFIX ".dll" CACHE STRING SET (CMAKE_MODULE_SUFFIX ".dll" CACHE STRING "Module library suffix.") -FIND_PROGRAM(CMAKE_MAKE_PROGRAM make ${BCB_BIN_PATH}) +FIND_PROGRAM(CMAKE_MAKE_PROGRAM make NAMES bmake ${BCB_BIN_PATH}) # We will hardcode them for now. Make sure to fix that in the future SET (CMAKE_SIZEOF_INT 4 CACHE INTERNAL "Size of int data type") |