diff --git a/Jenkinsfile b/Jenkinsfile index 24cee30af8df09a0f6add21cb31e5e42aa3518bc..e2f27244ec32f44e29c502fa73ca3ada9193fb58 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -528,7 +528,7 @@ pipeline { '-DOGS_CPU_ARCHITECTURE=core2 ' + '-DOGS_BUILD_UTILS=ON ' + '-DOGS_BUILD_GUI=ON ' + - '-DOGS_USE_CONAN=ON ' + + '-DOGS_USE_CONAN=OFF ' + '-DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" ' + '-DOGS_USE_NETCDF=ON ' } diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index 95571e1837017e9cbfe3a5125b9583d517c29671..029d78430b682e80bc52089c169b25d968821be3 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -68,7 +68,7 @@ if(OGS_BUILD_GUI) zlib/1.2.11 ) 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() set(CONAN_REQUIRES ${CONAN_REQUIRES} qt/${ogs.tested_version.qt.win}@bincrafters/stable) endif() diff --git a/web/data/versions.json b/web/data/versions.json index 15bba2aaeb69dd65ffcdfce42122b5e5bd9eda53..79563e9cbe903f83655247d00b07d5e0aeb17607 100644 --- a/web/data/versions.json +++ b/web/data/versions.json @@ -20,7 +20,7 @@ "tested_version": { "vtk": "8.2.0", "qt": { - "linux": "5.14.2", + "linux": "5.14.1", "win": "5.13.2" } }