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

System : Remove support for Qt4

Browse Source
This commit is contained in:
Magne Sjaastad
2020-04-23 22:59:37 +02:00
parent e4547b8e0d
commit 4b372b438e
23 changed files with 87 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OctavePlugin/CMakeLists.txt
View File

@@ -108,21 +108,6 @@ else()
SET(OCTAVE_QT_QTCORE_LIB Qt5Core)
SET(OCTAVE_QT_QTNETWORK_LIB Qt5Network)
else()
message(STATUS "Compiling Octave plugins using system Qt4 - include path located at ${QT_QMAKE_EXECUTABLE}")
SET(OCTAVE_QT_QTCORE_INCLUDE_DIR ${QT_QTCORE_INCLUDE_DIR})
SET(OCTAVE_QT_QTNETWORK_INCLUDE_DIR ${QT_QTNETWORK_INCLUDE_DIR})
SET(OCTAVE_QT_LIBRARY_DIR ${QT_LIBRARY_DIR})
if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
SET(OCTAVE_QT_QTCORE_LIB QtCore4)
SET(OCTAVE_QT_QTNETWORK_LIB QtNetwork4)
else()
SET(OCTAVE_QT_QTCORE_LIB QtCore)
SET(OCTAVE_QT_QTNETWORK_LIB QtNetwork)
endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
endif(Qt5Core_FOUND)
endif(RESINSIGHT_OCTAVE_PLUGIN_QT)