Skip to content

Commit 4a8aa7f

Browse files
authored
use cmake from omdev (#1335)
* use cmake from omdev * missed some
1 parent f48ed62 commit 4a8aa7f

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ perl ./runtests.pl -j\$(nproc) -nocolour -with-xml ${params.RUNTESTS_FLAG}
330330
"""
331331
bat """
332332
If Defined LOCALAPPDATA (echo LOCALAPPDATA: %LOCALAPPDATA%) Else (Set "LOCALAPPDATA=C:\\Users\\OpenModelica\\AppData\\Local")
333-
set PATH=C:\\bin\\cmake\\bin;%PATH%
333+
set PATH=C:\\OMDevUCRT\\bin\\cmake\\bin\\;%PATH%
334334
C:\\OMDevUCRT\\tools\\msys\\usr\\bin\\sh --login -i '${env.WORKSPACE}/testMinGWUCRT64-install.sh'
335335
EXIT /b 0
336336
:fail
@@ -392,7 +392,7 @@ zip -r "../OMSimulator-win64-`git describe --tags --abbrev=7 --match=v*.* --excl
392392

393393
retry(2) { bat """
394394
If Defined LOCALAPPDATA (echo LOCALAPPDATA: %LOCALAPPDATA%) Else (Set "LOCALAPPDATA=C:\\Users\\OpenModelica\\AppData\\Local")
395-
set PATH=C:\\bin\\cmake\\bin;%PATH%
395+
set PATH=C:\\OMDevUCRT\\bin\\cmake\\bin;%PATH%
396396
397397
cmake -S . -B build/ -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install/ -DOM_OMS_ENABLE_TESTSUITE:BOOL=ON
398398
IF NOT ["%ERRORLEVEL%"]==["0"] GOTO fail
@@ -443,7 +443,7 @@ perl ./runtests.pl -j\$(nproc) -platform=win -nocolour -with-xml ${params.RUNTES
443443
"""
444444
bat """
445445
If Defined LOCALAPPDATA (echo LOCALAPPDATA: %LOCALAPPDATA%) Else (Set "LOCALAPPDATA=C:\\Users\\OpenModelica\\AppData\\Local")
446-
set PATH=C:\\bin\\cmake\\bin;%PATH%
446+
set PATH=C:\\OMDevUCRT\\bin\\cmake\\bin;%PATH%
447447
448448
C:\\OMDevUCRT\\tools\\msys\\usr\\bin\\sh --login -i '${env.WORKSPACE}/testMSVC64-install.sh'
449449

0 commit comments

Comments
 (0)