diff options
| author | Peter Kuemmel <syntheticpp@gmx.net> | 2012-06-18 11:39:29 (GMT) |
|---|---|---|
| committer | Peter Kuemmel <syntheticpp@gmx.net> | 2012-06-18 11:39:29 (GMT) |
| commit | eb410e8dd8f4d1401d11713f398d38e0f250b136 (patch) | |
| tree | 548df4567f89347b7e765cd44bb9038ef96d0598 | |
| parent | 5ead31da6341eb5a410f9f5b7b65cd5dcd8f0eae (diff) | |
| download | CMake-eb410e8dd8f4d1401d11713f398d38e0f250b136.zip CMake-eb410e8dd8f4d1401d11713f398d38e0f250b136.tar.gz CMake-eb410e8dd8f4d1401d11713f398d38e0f250b136.tar.bz2 | |
Ninja: disable cldeps for bcc32, it's too old, and ninja would also not build
| -rw-r--r-- | Source/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/cmcldeps.cxx | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 557f065..bf75958 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -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) diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx index 374ee10..7d3c4bd 100644 --- a/Source/cmcldeps.cxx +++ b/Source/cmcldeps.cxx @@ -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()); |