Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
3369c857
Unverified
Commit
3369c857
authored
5 years ago
by
Gigg, Martyn Anthony
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Use ProcessorCount function rather than hardcoding parallelisation level
parent
a9f42003
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
buildconfig/CMake/ExternalSipPyQt4.cmake
+8
-1
8 additions, 1 deletion
buildconfig/CMake/ExternalSipPyQt4.cmake
with
8 additions
and
1 deletion
buildconfig/CMake/ExternalSipPyQt4.cmake
+
8
−
1
View file @
3369c857
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 -j
24
2> build.log
BUILD_COMMAND make -j
${
NPROCESSORS
}
2> build.log
DEPENDS extern-pyqt4-sip
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment