diff --git a/Jenkinsfile b/Jenkinsfile index 6288f2b8c831a0d0f3a1d6902719cd9e8bc3afc6..f495abbbf8edf0255899854aa11388f532dc1d38 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -458,6 +458,7 @@ pipeline { '-DOGS_CPU_ARCHITECTURE=core2 ' + '-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON ' + '-DOGS_BUILD_UTILS=ON ' + + '-DOGS_BUILD_GUI=ON ' + '-DOGS_CONAN_BUILD=missing ' + '-DCMAKE_OSX_DEPLOYMENT_TARGET="10.14" ' + '-DOGS_USE_NETCDF=ON ' diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index 66ddbdf639d4b6042972439262dce9a7666d73ab..e225bac790e778180b107b410c713c1dffa4bdf0 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -73,7 +73,7 @@ if(OGS_BUILD_GUI) bzip2/1.0.8 zlib/1.2.11 ) - if(UNIX AND NOT APPLE) + if(UNIX) set(CONAN_REQUIRES ${CONAN_REQUIRES} qt/5.14.1@bincrafters/stable) else() set(CONAN_REQUIRES ${CONAN_REQUIRES} qt/5.13.2@bincrafters/stable)