[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5709-g75f4a82

[Alexander Neundorf]

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  75f4a82144cf3643e887ade282da2d12f108f9a9 (commit)
       via  83751af2198a4eb298bdc814c56d0a4a4698e1df (commit)
      from  7053c8559c377f681e1f1102092193a9ca7269a2 (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=75f4a82144cf3643e887ade282da2d12f108f9a9
commit 75f4a82144cf3643e887ade282da2d12f108f9a9
Merge: 7053c85 83751af
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Sat Nov 23 18:43:08 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 23 18:43:08 2013 -0500

    Merge topic 'EclipseParallelMakeOnlyOnUnixHosts' into next
    
    83751af Eclipse: add -j only on UNIX hosts


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83751af2198a4eb298bdc814c56d0a4a4698e1df
commit 83751af2198a4eb298bdc814c56d0a4a4698e1df
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sat Nov 23 23:48:43 2013 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sat Nov 23 23:48:43 2013 +0100

    Eclipse: add -j only on UNIX hosts
    
    The previous version added -jN to the make invokation if UNIX
    was set, but this was true also when cross compiling.
    What we are actually interested in is CMAKE_HOST_UNIX, i.e.
    whether the build host is UNIX.
    Or we should check more exactly what CMAKE_MAKE_PROGRAM is.
    
    Alex

diff --git a/Modules/CMakeFindEclipseCDT4.cmake b/Modules/CMakeFindEclipseCDT4.cmake
index b67e0f0..85c1fdf 100644
--- a/Modules/CMakeFindEclipseCDT4.cmake
+++ b/Modules/CMakeFindEclipseCDT4.cmake
@@ -78,7 +78,7 @@ processorcount(_CMAKE_ECLIPSE_PROCESSOR_COUNT)
 
 # Only set -j if we are under UNIX and if the make-tool used actually has "make" in the name
 # (we may also get here in the future e.g. for ninja)
-if("${_CMAKE_ECLIPSE_PROCESSOR_COUNT}" GREATER 1  AND  UNIX  AND  "${CMAKE_MAKE_PROGRAM}" MATCHES make)
+if("${_CMAKE_ECLIPSE_PROCESSOR_COUNT}" GREATER 1  AND  CMAKE_HOST_UNIX  AND  "${CMAKE_MAKE_PROGRAM}" MATCHES make)
   set(_CMAKE_ECLIPSE_INITIAL_MAKE_ARGS "-j${_CMAKE_ECLIPSE_PROCESSOR_COUNT}")
 endif()
 

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

Summary of changes:
 Modules/CMakeFindEclipseCDT4.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake