OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2024-12-29 10:21:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4448 Clean up ResInsight Qt5-checks

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-05-28 14:11:08 +02:00
parent 9cf0b7cb86
commit 6691dca4ca
6 changed files with 53 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
ApplicationCode/CMakeLists.txt
View File

@ -5,19 +5,6 @@ project (ApplicationCode)
# 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)
if (Qt5Core_FOUND)
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)
else()
set (QT_COMPONENTS_REQUIRED QtCore QtGui QtMain QtOpenGl QtNetwork QtScript)
find_package(Qt4 COMPONENTS ${QT_COMPONENTS_REQUIRED} REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
# NB: The generated file is written to Cmake binary folder to avoid source tree pollution # NB: The generated file is written to Cmake binary folder to avoid source tree pollution
# This folder is added to include_directories # This folder is added to include_directories
CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/ApplicationCode/Adm/RiaVersionInfo.h.cmake CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/ApplicationCode/Adm/RiaVersionInfo.h.cmake
@ -98,6 +85,7 @@ list( APPEND CPP_SOURCES
${UNIT_TEST_FILES} ${UNIT_TEST_FILES}
) )
option(RESINSIGHT_ENABLE_GRPC "Enable the gRPC scripting framework" OFF)
if (RESINSIGHT_ENABLE_GRPC) if (RESINSIGHT_ENABLE_GRPC)
list( APPEND REFERENCED_CMAKE_FILES list( APPEND REFERENCED_CMAKE_FILES
GrpcInterface/CMakeLists.cmake GrpcInterface/CMakeLists.cmake
@ -250,15 +238,6 @@ set ( QT_MOC_HEADERS
SocketInterface/RiaSocketServer.h SocketInterface/RiaSocketServer.h
) )
if (Qt5Core_FOUND)
qt5_wrap_cpp(MOC_SOURCE_FILES ${QT_MOC_HEADERS} )
qt5_wrap_ui( FORM_FILES_CPP ${QT_UI_FILES} )
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${QT_MOC_HEADERS} )
qt4_wrap_ui( FORM_FILES_CPP ${QT_UI_FILES} )
endif()
# NOTE! Resources in subfolders must append to QRC_FILES using the following statement # NOTE! Resources in subfolders must append to QRC_FILES using the following statement
# set( QRC_FILES # set( QRC_FILES
# ${QRC_FILES} # ${QRC_FILES}
@ -271,18 +250,19 @@ set( QRC_FILES
Resources/ResInsight.qrc Resources/ResInsight.qrc
) )
# Runs RCC on specified files if (RESINSIGHT_BUILD_WITH_QT5)
if ( NOT CMAKE_AUTOMOC) find_package(Qt5 COMPONENTS REQUIRED Core Gui OpenGL Network Script Widgets)
if (Qt5Core_FOUND) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Network Qt5::Script Qt5::Widgets)
qt5_add_resources( QRC_FILES_CPP qt5_wrap_cpp(MOC_SOURCE_FILES ${QT_MOC_HEADERS})
${QRC_FILES} qt5_wrap_ui(FORM_FILES_CPP ${QT_UI_FILES})
) qt5_add_resources(QRC_FILES_CPP ${QRC_FILES})
else() else()
qt4_add_resources( QRC_FILES_CPP find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl QtNetwork QtScript REQUIRED)
${QRC_FILES} include(${QT_USE_FILE})
) qt4_wrap_cpp(MOC_SOURCE_FILES ${QT_MOC_HEADERS})
endif(Qt5Core_FOUND) qt4_wrap_ui(FORM_FILES_CPP ${QT_UI_FILES})
endif(NOT CMAKE_AUTOMOC) qt4_add_resources(QRC_FILES_CPP ${QRC_FILES})
endif(RESINSIGHT_BUILD_WITH_QT5)
# Adding resource (RC) files for Windows # Adding resource (RC) files for Windows
if ( MSVC ) if ( MSVC )
@ -486,7 +466,7 @@ endif()
if (MSVC) if (MSVC)
# Qt DLLs # Qt DLLs
if (Qt5Core_FOUND) if (RESINSIGHT_BUILD_WITH_QT5)
message(STATUS "Creating post build step for copying Qt DLLs") message(STATUS "Creating post build step for copying Qt DLLs")
foreach (qtlib ${QT_LIBRARIES}) foreach (qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ResInsight POST_BUILD add_custom_command(TARGET ResInsight POST_BUILD
@ -494,11 +474,11 @@ if (MSVC)
) )
endforeach(qtlib) endforeach(qtlib)
else() else()
set (QTLIBLIST QtCore4 QtCored4 QtGui4 QtGuid4 QtOpenGl4 QtOpenGld4 QtNetwork4 QtNetworkd4 QtScript4 QtScriptd4 QtScriptTools4 QtScriptToolsd4) set (QTLIBLIST QtCore QtGui QtGui QtOpenGl QtNetwork QtScript QtScriptTools)
foreach (qtlib ${QTLIBLIST}) foreach (qtlib ${QTLIBLIST})
list(APPEND RI_DLL_FILENAMES ${QT_BINARY_DIR}/${qtlib}.dll) list(APPEND RI_DLL_FILENAMES ${QT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,${qtlib}d4.dll,${qtlib}4.dll>)
endforeach( qtlib ) endforeach( qtlib )
endif() endif(RESINSIGHT_BUILD_WITH_QT5)
# Odb Dlls # Odb Dlls
if (RESINSIGHT_USE_ODB_API) if (RESINSIGHT_USE_ODB_API)
# Find all the dlls # Find all the dlls
@ -595,7 +575,7 @@ if (RESINSIGHT_PRIVATE_INSTALL)
set (RESINSIGHT_FILES ${RI_DLL_FILENAMES}) set (RESINSIGHT_FILES ${RI_DLL_FILENAMES})
if(Qt5_FOUND AND WIN32 AND TARGET Qt5::qmake AND NOT TARGET Qt5::windeployqt) if(RESINSIGHT_BUILD_WITH_QT5 AND WIN32 AND TARGET Qt5::qmake AND NOT TARGET Qt5::windeployqt)
get_target_property(_qt5_qmake_location Qt5::qmake IMPORTED_LOCATION) get_target_property(_qt5_qmake_location Qt5::qmake IMPORTED_LOCATION)
execute_process( execute_process(

40
ApplicationCode/WellPathImportSsihub/CMakeLists.txt
View File

@ -2,35 +2,20 @@ cmake_minimum_required (VERSION 2.8.12)
project (WellPathImportSsihub) project (WellPathImportSsihub)
if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Network)
else()
find_package(Qt4 COMPONENTS QtCore QtNetwork REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
# These headers need to go through Qt's MOC compiler # These headers need to go through Qt's MOC compiler
set( QT_MOC_HEADERS set( MOC_HEADER_FILES
RiuWellImportWizard.h RiuWellImportWizard.h
) )
if (RESINSIGHT_BUILD_WITH_QT5)
set( QT_UI_FILES find_package(Qt5 COMPONENTS REQUIRED Core Network)
) set(QT_LIBRARIES Qt5::Core Qt5::Network)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
if ( NOT CMAKE_AUTOMOC ) else()
if (Qt5Core_FOUND) find_package(Qt4 COMPONENTS QtCore QtNetwork REQUIRED)
qt5_wrap_cpp(MOC_SOURCE_FILES ${QT_MOC_HEADERS} ) include(${QT_USE_FILE})
qt5_wrap_ui( FORM_FILES_CPP ${QT_UI_FILES} ) qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
else() endif(RESINSIGHT_BUILD_WITH_QT5)
qt4_wrap_cpp(MOC_SOURCE_FILES ${QT_MOC_HEADERS} )
qt4_wrap_ui( FORM_FILES_CPP ${QT_UI_FILES} )
endif()
endif()
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
@ -38,7 +23,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../FileInterface ${CMAKE_CURRENT_SOURCE_DIR}/../FileInterface
) )
add_library( ${PROJECT_NAME} add_library( ${PROJECT_NAME}
RimWellPathImport.h RimWellPathImport.h
RimWellPathImport.cpp RimWellPathImport.cpp
@ -58,10 +42,6 @@ add_library( ${PROJECT_NAME}
${HEADER_FILES} ${HEADER_FILES}
) )
if (Qt5Core_FOUND)
set(QT_LIBRARIES Qt5::Core Qt5::Network)
endif()
target_link_libraries ( ${PROJECT_NAME} target_link_libraries ( ${PROJECT_NAME}
cafUserInterface cafPdmCvf CommonCode ${QT_LIBRARIES} cafUserInterface cafPdmCvf CommonCode ${QT_LIBRARIES}
) )

24
CMakeLists.txt
View File

@ -253,27 +253,13 @@ list(APPEND THIRD_PARTY_LIBRARIES
################################################################################ ################################################################################
# Qt # Qt
################################################################################ ################################################################################
option(RESINSIGHT_BUILD_WITH_QT5 "Use Qt5 folder" OFF) option(RESINSIGHT_BUILD_WITH_QT5 "Use Qt5" OFF)
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 (RESINSIGHT_BUILD_WITH_QT5)
message(STATUS "Found Qt5") find_package(Qt5 COMPONENTS REQUIRED Core Gui OpenGL Network Script ScriptTools Widgets)
find_package (Qt5 CONFIG REQUIRED Core Widgets OpenGL Network Script ScriptTools)
else() else()
if (RESINSIGHT_BUILD_WITH_QT5) find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl QtNetwork QtScript QtScriptTools REQUIRED)
message(WARNING "Could not find Qt5. Trying with Qt4") endif(RESINSIGHT_BUILD_WITH_QT5)
endif(RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
if (QT_VERSION_MINOR LESS 6)
message(FATAL_ERROR "Qt 4.6 is required, please specify qmake for variable QT_QMAKE_EXECUTABLE")
endif()
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
# Open GL # Open GL
find_package( OpenGL ) find_package( OpenGL )

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

@ -7,13 +7,6 @@ if (MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267")
endif() endif()
if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Concurrent Core OpenGL PrintSupport Widgets REQUIRED)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGL qtmain REQUIRED)
include(${QT_USE_FILE})
endif(RESINSIGHT_BUILD_WITH_QT5)
# Adapted from src.pri file in Qwt's source catalog for Qwt 6.1.0 # Adapted from src.pri file in Qwt's source catalog for Qwt 6.1.0
# Compiles static library # Compiles static library
# Some bits removed (at least SVG) # Some bits removed (at least SVG)
@ -275,15 +268,15 @@ qwt_thermo.h
qwt_wheel.h qwt_wheel.h
) )
set(MOC_SOURCE_FILES)
if (RESINSIGHT_BUILD_WITH_QT5) if (RESINSIGHT_BUILD_WITH_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} ) find_package(Qt5 COMPONENTS REQUIRED Concurrent Core Gui OpenGL PrintSupport Widgets)
set(QT_LIBRARIES Qt5::Concurrent Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::PrintSupport Qt5::Widgets)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
else() else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} ) find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
include(${QT_USE_FILE})
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
endif(RESINSIGHT_BUILD_WITH_QT5) endif(RESINSIGHT_BUILD_WITH_QT5)
add_library(${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES} ${MOC_SOURCE_FILES}) add_library(${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES} ${MOC_SOURCE_FILES})
@ -292,9 +285,7 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
if (RESINSIGHT_BUILD_WITH_QT5) target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})
target_link_libraries(${PROJECT_NAME} Qt5::Concurrent Qt5::Core Qt5::OpenGL Qt5::PrintSupport Qt5::Widgets)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (COMMAND caf_apply_cotire) if (COMMAND caf_apply_cotire)
caf_apply_cotire("${PROJECT_NAME}") caf_apply_cotire("${PROJECT_NAME}")

10
ThirdParty/expressionparser/CMakeLists.txt vendored
View File

@ -7,10 +7,12 @@ 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()
if (RESINSIGHT_BUILD_WITH_QT5) if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core REQUIRED) find_package(Qt5 COMPONENTS REQUIRED Core)
set(QT_LIBRARIES Qt5::Core)
else() else()
find_package(Qt4 COMPONENTS QtCore REQUIRED) find_package(Qt4 COMPONENTS QtCore REQUIRED)
include(${QT_USE_FILE}) include(${QT_USE_FILE})
endif(RESINSIGHT_BUILD_WITH_QT5) endif(RESINSIGHT_BUILD_WITH_QT5)
@ -35,8 +37,6 @@ if(MSVC)
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
if (RESINSIGHT_BUILD_WITH_QT5) target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})
target_link_libraries(${PROJECT_NAME} Qt5::Core)
endif(RESINSIGHT_BUILD_WITH_QT5)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

11
ThirdParty/nightcharts/CMakeLists.txt vendored
View File

@ -3,10 +3,13 @@ cmake_minimum_required (VERSION 2.8.12)
project (nightcharts) project (nightcharts)
if (RESINSIGHT_BUILD_WITH_QT5) if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core Widgets REQUIRED) find_package(Qt5 COMPONENTS REQUIRED Core Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Widgets)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
else() else()
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED) find_package(Qt4 COMPONENTS QtCore QtWidgets)
include(${QT_USE_FILE}) include(${QT_USE_FILE})
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
endif(RESINSIGHT_BUILD_WITH_QT5) endif(RESINSIGHT_BUILD_WITH_QT5)
list (APPEND MAIN_SOURCE_FILES list (APPEND MAIN_SOURCE_FILES
@ -26,8 +29,6 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
if (RESINSIGHT_BUILD_WITH_QT5) target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})
target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Widgets)
endif(RESINSIGHT_BUILD_WITH_QT5)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})