diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index 670a3094e4cc79140d500d9e94860fda7bc7b541..87431d640aa1643510d8dc4f24e922fffcf4b820 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -69,10 +69,18 @@ if(OGS_BUILD_GUI) set(CONAN_REQUIRES ${CONAN_REQUIRES} shapelib/1.3.0@bilke/stable libgeotiff/1.4.2@bilke/stable - qt/5.13.2@bincrafters/stable - # Fix for "Conflict in pcre/8.41@bincrafters/stable" + # Overrides for dependency mismatches bzip2/1.0.8 + zlib/1.2.11 ) + if(UNIX AND NOT APPLE) + set(CONAN_REQUIRES ${CONAN_REQUIRES} + qt/5.12.4@bincrafters/stable + # Override for using older version with less (broken) dependencies + xkbcommon/0.8.3@bincrafters/stable) + else() + set(CONAN_REQUIRES ${CONAN_REQUIRES} qt/5.13.2@bincrafters/stable) + endif() set(CONAN_OPTIONS ${CONAN_OPTIONS} vtk:minimal=False vtk:qt=True