From 3369c857c0d2771ee39eb454f85ba38d2b91bd6a Mon Sep 17 00:00:00 2001
From: Martyn Gigg <martyn.gigg@stfc.ac.uk>
Date: Wed, 22 Jan 2020 13:17:12 +0000
Subject: [PATCH] Use ProcessorCount function rather than hardcoding
parallelisation level
---
buildconfig/CMake/ExternalSipPyQt4.cmake | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/buildconfig/CMake/ExternalSipPyQt4.cmake b/buildconfig/CMake/ExternalSipPyQt4.cmake
index d08a3210393..2aece3fb4f7 100644
--- a/buildconfig/CMake/ExternalSipPyQt4.cmake
+++ b/buildconfig/CMake/ExternalSipPyQt4.cmake
@@ -1,4 +1,5 @@
include(ExternalProject)
+include(ProcessorCount)
set(_SIP_PYQT_DIR extern-pyt4-sip)
set(_SIP_PYQT_INSTALL_DIR ${_SIP_PYQT_DIR}/install)
@@ -35,6 +36,12 @@ set(_pyqt4_lib_site_packages ${PRIVATE_PYQT_SITE_PACKAGES}/PyQt4)
set(PYQT4_PYUIC "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/internal-pyuic.py" CACHE STRING "Location of the pyuic script" FORCE)
configure_file(${CMAKE_MODULE_PATH}/internal-pyuic.py.in ${PYQT4_PYUIC} @ONLY)
+# Determine core count for make step
+ProcessorCount(NPROCESSORS)
+if(NPROCESSORS EQUAL 0)
+ set(NPROCESSORS 1)
+endif()
+
ExternalProject_Add(extern-pyqt4
PREFIX ${_SIP_PYQT_DIR}/pyqt4
INSTALL_DIR ${_SIP_PYQT_INSTALL_DIR}
@@ -55,7 +62,7 @@ ExternalProject_Add(extern-pyqt4
--no-deprecated
--qmake=/usr/bin/qmake-qt4
--no-qsci-api
- BUILD_COMMAND make -j24 2> build.log
+ BUILD_COMMAND make -j${NPROCESSORS} 2> build.log
DEPENDS extern-pyqt4-sip
)
--
GitLab