Commit 467153dd authored by Ben Cooksley's avatar Ben Cooksley

Switch Windows to using JOM to perform builds

parent f7623689
......@@ -31,7 +31,7 @@ makeCommand = "make -j {cpuCount} -l {maximumLoad}"
# Windows is a bit special though
if sys.platform == 'win32':
# We use NMake on Windows at the moment
makeCommand = "nmake"
makeCommand = "jom"
# FreeBSD also likes to do things slightly different
if sys.platform == 'freebsd11':
makeCommand = "gmake -j {cpuCount}"
......
......@@ -70,7 +70,7 @@ class CMake(object):
# Are we on Windows?
if sys.platform == 'win32':
# We want a NMake based build, rather than the default MSBuild
cmakeCommand.append('-G "NMake Makefiles"')
cmakeCommand.append('-G "NMake Makefiles JOM"')
# Finally we drag in options specified by the build specification
cmakeCommand.append( buildSpecification['cmake-options'] )
......
......@@ -38,7 +38,7 @@ makeCommand = "make -j {cpuCount} -l {maximumLoad} install"
# Windows is a bit special though
if sys.platform == 'win32':
# We use NMake on Windows at the moment
makeCommand = "nmake install"
makeCommand = "jom install"
# FreeBSD also likes to do things slightly different
if sys.platform == 'freebsd11':
makeCommand = "gmake -j {cpuCount} install"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment