Skip to content
Snippets Groups Projects
Commit a43610d1 authored by Lars Bilke's avatar Lars Bilke
Browse files

Revert "[Jenkins] Fix mac-gui job."

This reverts commit 35bf0fc5.
parent 35bf0fc5
No related branches found
No related tags found
No related merge requests found
...@@ -528,7 +528,7 @@ pipeline { ...@@ -528,7 +528,7 @@ pipeline {
'-DOGS_CPU_ARCHITECTURE=core2 ' + '-DOGS_CPU_ARCHITECTURE=core2 ' +
'-DOGS_BUILD_UTILS=ON ' + '-DOGS_BUILD_UTILS=ON ' +
'-DOGS_BUILD_GUI=ON ' + '-DOGS_BUILD_GUI=ON ' +
'-DOGS_USE_CONAN=ON ' + '-DOGS_USE_CONAN=OFF ' +
'-DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" ' + '-DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" ' +
'-DOGS_USE_NETCDF=ON ' '-DOGS_USE_NETCDF=ON '
} }
......
...@@ -68,7 +68,7 @@ if(OGS_BUILD_GUI) ...@@ -68,7 +68,7 @@ if(OGS_BUILD_GUI)
zlib/1.2.11 zlib/1.2.11
) )
if(UNIX) if(UNIX)
set(CONAN_REQUIRES ${CONAN_REQUIRES} qt/${ogs.tested_version.qt.linux}@bincrafters/testing) set(CONAN_REQUIRES ${CONAN_REQUIRES} qt/${ogs.tested_version.qt.linux}@bincrafters/stable)
else() else()
set(CONAN_REQUIRES ${CONAN_REQUIRES} qt/${ogs.tested_version.qt.win}@bincrafters/stable) set(CONAN_REQUIRES ${CONAN_REQUIRES} qt/${ogs.tested_version.qt.win}@bincrafters/stable)
endif() endif()
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
"tested_version": { "tested_version": {
"vtk": "8.2.0", "vtk": "8.2.0",
"qt": { "qt": {
"linux": "5.14.2", "linux": "5.14.1",
"win": "5.13.2" "win": "5.13.2"
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment