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

[Conan] Upgrade Qt to 5.12.2 from bincrafters.

parent 476edd41
No related branches found
No related tags found
No related merge requests found
...@@ -33,7 +33,7 @@ set(CONAN_REQUIRES ...@@ -33,7 +33,7 @@ set(CONAN_REQUIRES
set(CONAN_OPTIONS set(CONAN_OPTIONS
boost:header_only=True boost:header_only=True
Qt:qtxmlpatterns=True qt:qtxmlpatterns=True
VTK:minimal=True VTK:minimal=True
VTK:ioxml=True VTK:ioxml=True
CACHE INTERNAL "" CACHE INTERNAL ""
...@@ -66,12 +66,15 @@ if(OGS_BUILD_GUI) ...@@ -66,12 +66,15 @@ if(OGS_BUILD_GUI)
set(CONAN_REQUIRES ${CONAN_REQUIRES} set(CONAN_REQUIRES ${CONAN_REQUIRES}
Shapelib/1.3.0@bilke/stable Shapelib/1.3.0@bilke/stable
libgeotiff/1.4.2@bilke/stable libgeotiff/1.4.2@bilke/stable
Qt/5.11.2@bilke/stable qt/5.12.2@bincrafters/stable
lzma/5.2.4@bincrafters/stable # 5.2.3 is not built for Xcode 10 lzma/5.2.4@bincrafters/stable # 5.2.3 is not built for Xcode 10
) )
set(CONAN_OPTIONS ${CONAN_OPTIONS} set(CONAN_OPTIONS ${CONAN_OPTIONS}
VTK:minimal=False VTK:minimal=False
VTK:qt=True VTK:qt=True
qt:with_sqlite3=False
qt:with_mysql=False
qt:with_odbc=False
) )
endif() endif()
......
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