OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4473 Qt5 : Set Qt5 as default Qt version

Browse Source 
Still possible to use Qt4 by RESINSIGHT_BUILD_WITH_QT5=OFF
This commit is contained in:
Magne Sjaastad
2019-06-07 12:32:22 +02:00
parent 3e9ef51c6b
commit 74718c38fc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@@ -15,6 +15,6 @@ build_script:
if exist "%QT5%" set Path=%QT5%\bin;%Path%
cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -DRESINSIGHT_BUILD_WITH_QT5=true -DRESINSIGHT_ENABLE_COTIRE=on "-DCMAKE_PREFIX_PATH=%QT5%" ..
cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -DRESINSIGHT_ENABLE_COTIRE=on "-DCMAKE_PREFIX_PATH=%QT5%" ..
cmake --build . --target ResInsight_unity --config Release

2
CMakeLists.txt
View File

@@ -253,7 +253,7 @@ list(APPEND THIRD_PARTY_LIBRARIES
################################################################################
# Qt
################################################################################
option(RESINSIGHT_BUILD_WITH_QT5 "Use Qt5" OFF)
option(RESINSIGHT_BUILD_WITH_QT5 "Use Qt5" ON)
if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Gui OpenGL Network Script ScriptTools Widgets)