From f6f896a5767108d38585463e365d9ee4de93682b Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Sun, 20 Sep 2015 22:47:05 -0400 Subject: [PATCH] testHarness: adjusting the Makefile generator for cmake on Windows --- testHarness/foam-extend/3.2/runDir/Allrun_Experimental | 7 ++++++- testHarness/foam-extend/3.2/runDir/Allrun_Nightly | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/testHarness/foam-extend/3.2/runDir/Allrun_Experimental b/testHarness/foam-extend/3.2/runDir/Allrun_Experimental index 21bba0a29..186882d09 100755 --- a/testHarness/foam-extend/3.2/runDir/Allrun_Experimental +++ b/testHarness/foam-extend/3.2/runDir/Allrun_Experimental @@ -79,7 +79,12 @@ fi # Make sure the CMake and tutorials runtime files are updated # We need cmake version 2.8.0 at least -cmake $WM_PROJECT_DIR +if [ "$WM_ARCH_BASE" == "mingw" ] +then + cmake $WM_PROJECT_DIR -G "MSYS Makefiles" +else + cmake $WM_PROJECT_DIR -G "Unix Makefiles" +fi # All set. Now we can run the available test harness # diff --git a/testHarness/foam-extend/3.2/runDir/Allrun_Nightly b/testHarness/foam-extend/3.2/runDir/Allrun_Nightly index ed5825517..a21748e7c 100755 --- a/testHarness/foam-extend/3.2/runDir/Allrun_Nightly +++ b/testHarness/foam-extend/3.2/runDir/Allrun_Nightly @@ -79,7 +79,12 @@ fi # Make sure the CMake and tutorials runtime files are updated # We need cmake version 2.8.0 at least -cmake $WM_PROJECT_DIR +if [ "$WM_ARCH_BASE" == "mingw" ] +then + cmake $WM_PROJECT_DIR -G "MSYS Makefiles" +else + cmake $WM_PROJECT_DIR -G "Unix Makefiles" +fi # All set. Now we can run the available test harness #