Browse Source

Make borland pass all the tests on XP (and 2000?)

Andy Cedilnik 23 years ago
parent
commit
be6a5696ba
2 changed files with 2 additions and 3 deletions
  1. 1 2
      Source/cmSystemTools.cxx
  2. 1 1
      Templates/CMakeBorlandWindowsSystemConfig.cmake

+ 1 - 2
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; 
           }
  
         }

+ 1 - 1
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")