Merge pull request #6701 from vsebe/omr_v2017

Update OMR build compiler to VS 2017 on Windows
eclipse-openj9 · Dec 13, 2022 · f5a790b · f5a790b
2 parents 3d2beb8 + a1b4f7b
commit f5a790b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/buildenv/jenkins/omrbuild.groovy b/buildenv/jenkins/omrbuild.groovy
@@ -274,14 +274,15 @@ SPECS = [
         'reference' : defaultReference,
         'environment' : [
             'GTEST_FILTER=-*dump_test_create_dump_*:*NumaSetAffinity:*NumaSetAffinitySuspended:PortSysinfoTest.sysinfo_test_get_tmp3:ThreadExtendedTest.TestOtherThreadCputime',
-            'GTEST_COLOR=0'
+            'GTEST_COLOR=0',
+            'PATH+TOOLS=/cygdrive/c/CMake/bin/:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio/2017/Community/MSBuild/15.0/Bin/:/cygdrive/c/Program Files (x86)/Windows Kits/10/bin/x86'
         ],
         'ccache' : false,
         'buildSystem' : 'cmake',
         'builds' : [
             [
                 'buildDir' : cmakeBuildDir,
-                'configureArgs' : '-Wdev -G "Visual Studio 11 2012 Win64" -C../cmake/caches/Windows.cmake',
+                'configureArgs' : '-Wdev -G "Visual Studio 15 2017" -A x64 -C../cmake/caches/Windows.cmake',
                 'compile' : 'cmake --build . -- /m'
             ]
         ],