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

#4061 : Harmonize how to find Qt5

Browse Source
This commit is contained in:
Magne Sjaastad
2019-02-08 13:22:33 +01:00
parent 3586988d1d
commit 2fd54b1d0a
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,15 +8,11 @@ if (MSVC)
endif() endif()
if (RESINSIGHT_BUILD_WITH_QT5) if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET) find_package(Qt5 COMPONENTS Concurrent Core OpenGL PrintSupport Widgets REQUIRED)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Concurrent Core OpenGL PrintSupport Widgets)
else() else()
find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGL qtmain REQUIRED) find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGL qtmain REQUIRED)
include(${QT_USE_FILE}) include(${QT_USE_FILE})
endif(Qt5Core_FOUND) 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
@@ -282,11 +278,11 @@ qwt_wheel.h
set(MOC_SOURCE_FILES) set(MOC_SOURCE_FILES)
if (Qt5Core_FOUND) if (RESINSIGHT_BUILD_WITH_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} ) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else() else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} ) qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif() 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})
@@ -296,9 +292,9 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
if (Qt5Core_FOUND) if (RESINSIGHT_BUILD_WITH_QT5)
target_link_libraries(${PROJECT_NAME} Qt5::Concurrent Qt5::Core Qt5::OpenGL Qt5::PrintSupport Qt5::Widgets) target_link_libraries(${PROJECT_NAME} Qt5::Concurrent Qt5::Core Qt5::OpenGL Qt5::PrintSupport Qt5::Widgets)
endif() endif(RESINSIGHT_BUILD_WITH_QT5)
if (COMMAND ri_apply_cotire) if (COMMAND ri_apply_cotire)
ri_apply_cotire() ri_apply_cotire()