kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Peter Kuemmel 2012-06-18 13:39:29 +02:00
parent 5ead31da63
commit eb410e8dd8
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CMakeLists.txt
View File

@ -383,7 +383,7 @@ IF(CMAKE_ENABLE_NINJA)
cmNinjaUtilityTargetGenerator.h cmNinjaUtilityTargetGenerator.h
) )
ADD_DEFINITIONS(-DCMAKE_USE_NINJA) 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) SET_SOURCE_FILES_PROPERTIES(cmcldeps.cxx PROPERTIES COMPILE_DEFINITIONS _WIN32_WINNT=0x0501)
ADD_EXECUTABLE(cmcldeps cmcldeps.cxx) ADD_EXECUTABLE(cmcldeps cmcldeps.cxx)
INSTALL_TARGETS(/bin cmcldeps) INSTALL_TARGETS(/bin cmcldeps)

7
Source/cmcldeps.cxx
View File

@ -33,9 +33,6 @@
#endif #endif
// bcc32 only finds remove(const char*)
namespace stlport { }
#if defined(_WIN64) #if defined(_WIN64)
typedef unsigned __int64 cmULONG_PTR; typedef unsigned __int64 cmULONG_PTR;
#else #else
@ -433,10 +430,8 @@ bool SubprocessSet::DoWork() {
subproc->OnPipeReady(); subproc->OnPipeReady();
if (subproc->Done()) { if (subproc->Done()) {
using namespace std;
using namespace stlport;
std::vector<Subprocess*>::iterator end = std::vector<Subprocess*>::iterator end =
remove(running_.begin(), running_.end(), subproc); std::remove(running_.begin(), running_.end(), subproc);
if (running_.end() != end) { if (running_.end() != end) {
finished_.push(subproc); finished_.push(subproc);
running_.resize(end - running_.begin()); running_.resize(end - running_.begin());