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

Update CMake to only look for Qt5 if RESINSIGHT_BUILD_WITH_QT5 is set

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-12-10 14:49:38 +01:00
parent 81e2132752
commit 17e12a92a0
18 changed files with 75 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/CMakeLists.txt
View File

@@ -5,7 +5,10 @@ project (ApplicationCode)
# Open GL # Open GL
find_package( OpenGL ) find_package( OpenGL )
find_package(Qt5Core CONFIG QUIET) if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Network Script Widgets) find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Network Script Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Script Qt5::Widgets) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Script Qt5::Widgets)

5
ApplicationCode/WellPathImportSsihub/CMakeLists.txt
View File

@@ -2,7 +2,10 @@ cmake_minimum_required (VERSION 2.8.12)
project (WellPathImportSsihub) project (WellPathImportSsihub)
find_package(Qt5Core CONFIG QUIET) if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Network) find_package(Qt5 CONFIG REQUIRED Core Network)
else() else()

11
CMakeLists.txt
View File

@@ -232,13 +232,20 @@ list(APPEND THIRD_PARTY_LIBRARIES
################################################################################ ################################################################################
# Qt # Qt
################################################################################ ################################################################################
find_package(Qt5Core CONFIG QUIET) if (RESINSIGHT_BUILD_WITH_QT5)
message(STATUS "Attempting to build with Qt5")
find_package(Qt5 COMPONENTS Core QUIET)
else()
message(STATUS "Attempting to build with Qt4")
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
message(STATUS "Found Qt5") message(STATUS "Found Qt5")
find_package (Qt5 CONFIG REQUIRED Core Widgets OpenGL Network Script ScriptTools) find_package (Qt5 CONFIG REQUIRED Core Widgets OpenGL Network Script ScriptTools)
else() else()
message(STATUS "No Qt5 found, trying Qt4") if (RESINSIGHT_BUILD_WITH_QT5)
message("Could not find Qt5. Trying with Qt4")
endif(RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED) find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
if (QT_VERSION_MINOR LESS 6) if (QT_VERSION_MINOR LESS 6)
message(FATAL_ERROR "Qt 4.6 is required, please specify qmake for variable QT_QMAKE_EXECUTABLE") message(FATAL_ERROR "Qt 4.6 is required, please specify qmake for variable QT_QMAKE_EXECUTABLE")

5
Fwk/AppFwk/CommonCode/CMakeLists.txt
View File

@@ -3,7 +3,10 @@ cmake_minimum_required (VERSION 2.8.12)
project (CommonCode) project (CommonCode)
# Qt # Qt
find_package(Qt5Core CONFIG QUIET) if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Widgets) find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Widgets)
else() else()

5
Fwk/AppFwk/cafAnimControl/CMakeLists.txt
View File

@@ -2,7 +2,10 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafAnimControl) project (cafAnimControl)
# Qt # Qt
find_package(Qt5Core CONFIG QUIET) if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets) find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
else() else()

5
Fwk/AppFwk/cafCommand/CMakeLists.txt
View File

@@ -1,7 +1,10 @@
cmake_minimum_required (VERSION 2.8.12) cmake_minimum_required (VERSION 2.8.12)
# Qt # Qt
find_package(Qt5Core CONFIG QUIET) if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets) find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
else() else()

5
Fwk/AppFwk/cafPdmCvf/CMakeLists.txt
View File

@@ -3,7 +3,10 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafPdmCvf) project (cafPdmCvf)
# Qt # Qt
find_package(Qt5Core CONFIG QUIET) if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets) find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
else() else()

5
Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt
View File

@@ -3,7 +3,10 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafProjectDataModel) project (cafProjectDataModel)
# Qt # Qt
find_package(Qt5Core CONFIG QUIET) if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets) find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
else() else()

5
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt
View File

@@ -3,7 +3,10 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafPdmCore) project (cafPdmCore)
# Qt # Qt
find_package(Qt5Core CONFIG QUIET) if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core) find_package(Qt5 CONFIG REQUIRED Core)
else() else()

5
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt
View File

@@ -3,7 +3,10 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafPdmUiCore) project (cafPdmUiCore)
# Qt # Qt
find_package(Qt5Core CONFIG QUIET) if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets) find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
else() else()

5
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt
View File

@@ -3,7 +3,10 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafPdmXml) project (cafPdmXml)
# Qt # Qt
find_package(Qt5Core CONFIG QUIET) if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Xml) find_package(Qt5 CONFIG REQUIRED Core Xml)
else() else()

5
Fwk/AppFwk/cafUserInterface/CMakeLists.txt
View File

@@ -8,7 +8,10 @@ endif (MSVC)
project (cafUserInterface) project (cafUserInterface)
# Qt # Qt
find_package(Qt5 COMPONENTS Core QUIET) if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets) find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
else() else()

5
Fwk/AppFwk/cafViewer/CMakeLists.txt
View File

@@ -3,7 +3,10 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafViewer) project (cafViewer)
# Qt # Qt
find_package(Qt5Core CONFIG QUIET) if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Widgets) find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Widgets)
else() else()

4
Fwk/AppFwk/cafVizExtensions/CMakeLists.txt
View File

@@ -5,8 +5,10 @@ project (cafVizExtensions)
# Open GL # Open GL
find_package( OpenGL ) find_package( OpenGL )
if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5Core CONFIG QUIET)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Widgets) find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Widgets)
else() else()

4
Fwk/VizFwk/LibGuiQt/CMakeLists.txt
View File

@@ -10,8 +10,10 @@ if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-long-long") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-long-long")
endif() endif()
if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5Core CONFIG QUIET)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Widgets) find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Widgets)
else() else()

5
ThirdParty/Qwt/src/CMakeLists.txt vendored
View File

@@ -7,7 +7,10 @@ if (MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267")
endif() endif()
find_package(Qt5Core CONFIG QUIET) if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Concurrent Core OpenGL PrintSupport Widgets) find_package(Qt5 CONFIG REQUIRED Concurrent Core OpenGL PrintSupport Widgets)
else() else()

5
ThirdParty/expressionparser/CMakeLists.txt vendored
View File

@@ -7,7 +7,10 @@ if(MSVC)
message(STATUS "MSVC: Enabled increased number of sections in object files") message(STATUS "MSVC: Enabled increased number of sections in object files")
endif() endif()
find_package(Qt5Core CONFIG QUIET) if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core) find_package(Qt5 CONFIG REQUIRED Core)
else() else()

5
ThirdParty/nightcharts/CMakeLists.txt vendored
View File

@@ -2,7 +2,10 @@ cmake_minimum_required (VERSION 2.8.12)
project (nightcharts) project (nightcharts)
find_package(Qt5Core CONFIG QUIET) if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Widgets) find_package(Qt5 CONFIG REQUIRED Core Widgets)
else() else()