Commit eb410e8d authored by Peter Kuemmel's avatar Peter Kuemmel

Ninja: disable cldeps for bcc32, it's too old, and ninja would also not build

parent 5ead31da
......@@ -383,7 +383,7 @@ IF(CMAKE_ENABLE_NINJA)
cmNinjaUtilityTargetGenerator.h
)
ADD_DEFINITIONS(-DCMAKE_USE_NINJA)
IF(WIN32 AND NOT CYGWIN)
IF(WIN32 AND NOT CYGWIN AND NOT BORLAND)
SET_SOURCE_FILES_PROPERTIES(cmcldeps.cxx PROPERTIES COMPILE_DEFINITIONS _WIN32_WINNT=0x0501)
ADD_EXECUTABLE(cmcldeps cmcldeps.cxx)
INSTALL_TARGETS(/bin cmcldeps)
......
......@@ -33,9 +33,6 @@
#endif
// bcc32 only finds remove(const char*)
namespace stlport { }
#if defined(_WIN64)
typedef unsigned __int64 cmULONG_PTR;
#else
......@@ -433,10 +430,8 @@ bool SubprocessSet::DoWork() {
subproc->OnPipeReady();
if (subproc->Done()) {
using namespace std;
using namespace stlport;
std::vector<Subprocess*>::iterator end =
remove(running_.begin(), running_.end(), subproc);
std::remove(running_.begin(), running_.end(), subproc);
if (running_.end() != end) {
finished_.push(subproc);
running_.resize(end - running_.begin());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment