summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Neundorf <neundorf@kde.org>2013-11-23 22:48:43 (GMT)
committerAlex Neundorf <neundorf@kde.org>2013-11-23 22:48:43 (GMT)
commit83751af2198a4eb298bdc814c56d0a4a4698e1df (patch)
tree83bab6303ab411616268e8c948a35e80da5340dc
parent26ccafea462604180cc900d92e087eff4c0bfe85 (diff)
downloadCMake-83751af2198a4eb298bdc814c56d0a4a4698e1df.zip
CMake-83751af2198a4eb298bdc814c56d0a4a4698e1df.tar.gz
CMake-83751af2198a4eb298bdc814c56d0a4a4698e1df.tar.bz2
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
-rw-r--r--Modules/CMakeFindEclipseCDT4.cmake2
1 files changed, 1 insertions, 1 deletions
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()