[Cmake-commits] CMake branch, next, updated. v2.8.8-3207-gff9fb4a

[Peter Kuemmel]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  ff9fb4a7d13bbf78c16e52144767aa6ce2ee541c (commit)
       via  eb410e8dd8f4d1401d11713f398d38e0f250b136 (commit)
      from  2d815148d2aa5d20f261a6cf318e6e88dd6eca62 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff9fb4a7d13bbf78c16e52144767aa6ce2ee541c
commit ff9fb4a7d13bbf78c16e52144767aa6ce2ee541c
Merge: 2d81514 eb410e8
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Mon Jun 18 07:41:25 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 18 07:41:25 2012 -0400

    Merge topic 'ninja-cldeps' into next
    
    eb410e8 Ninja: disable cldeps for bcc32, it's too old, and ninja would also not build


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb410e8dd8f4d1401d11713f398d38e0f250b136
commit eb410e8dd8f4d1401d11713f398d38e0f250b136
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Mon Jun 18 13:39:29 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Mon Jun 18 13:39:29 2012 +0200

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

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());

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeLists.txt |    2 +-
 Source/cmcldeps.cxx   |    7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake