From 83751af2198a4eb298bdc814c56d0a4a4698e1df Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Sat, 23 Nov 2013 23:48:43 +0100 Subject: [PATCH] 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 --- Modules/CMakeFindEclipseCDT4.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/CMakeFindEclipseCDT4.cmake b/Modules/CMakeFindEclipseCDT4.cmake index b67e0f09a..85c1fdf5b 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()