#3752 Upgrade ResInsight CMake-system to support both Qt5 and Qt5

This commit is contained in:
Gaute Lindkvist
2018-11-27 09:47:44 +01:00
parent 5c66b901c3
commit 6cee9eb9e6
6 changed files with 137 additions and 45 deletions

View File

@@ -2,8 +2,16 @@ cmake_minimum_required (VERSION 2.8.12)
project (WellPathImportSsihub)
find_package(Qt5Core CONFIG QUIET)
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
set( QOBJECT_HEADERS
set( QT_MOC_HEADERS
RiuWellImportWizard.h
)
@@ -12,8 +20,13 @@ set( QT_UI_FILES
)
if ( NOT CMAKE_AUTOMOC )
qt4_wrap_cpp( MOC_FILES_CPP ${QOBJECT_HEADERS} )
qt4_wrap_ui( FORM_FILES_CPP ${QT_UI_FILES} )
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()
endif()
include_directories(
@@ -37,13 +50,17 @@ add_library( ${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}/../FileInterface/RifJsonEncodeDecode.cpp
${MOC_FILES_CPP}
${MOC_SOURCE_FILES}
${FORM_FILES_CPP}
${HEADER_FILES}
)
if (Qt5Core_FOUND)
set(QT_LIBRARIES Qt5::Core Qt5::Network)
endif()
target_link_libraries ( ${PROJECT_NAME}
cafUserInterface cafPdmCvf CommonCode
cafUserInterface cafPdmCvf CommonCode ${QT_LIBRARIES}
)
source_group("" FILES ${PROJECT_FILES})