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

#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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,13 +7,6 @@ if (MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267")
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
# Compiles static library
# Some bits removed (at least SVG)
@@ -275,15 +268,15 @@ qwt_thermo.h
qwt_wheel.h
)
set(MOC_SOURCE_FILES)
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()
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)
add_library(${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES} ${MOC_SOURCE_FILES})
@@ -292,9 +285,7 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}
)
if (RESINSIGHT_BUILD_WITH_QT5)
target_link_libraries(${PROJECT_NAME} Qt5::Concurrent Qt5::Core Qt5::OpenGL Qt5::PrintSupport Qt5::Widgets)
endif(RESINSIGHT_BUILD_WITH_QT5)
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})
if (COMMAND caf_apply_cotire)
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")
endif()
if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core REQUIRED)
find_package(Qt5 COMPONENTS REQUIRED Core)
set(QT_LIBRARIES Qt5::Core)
else()
find_package(Qt4 COMPONENTS QtCore REQUIRED)
find_package(Qt4 COMPONENTS QtCore REQUIRED)
include(${QT_USE_FILE})
endif(RESINSIGHT_BUILD_WITH_QT5)
@@ -35,8 +37,6 @@ if(MSVC)
${CMAKE_CURRENT_SOURCE_DIR}
)
if (RESINSIGHT_BUILD_WITH_QT5)
target_link_libraries(${PROJECT_NAME} Qt5::Core)
endif(RESINSIGHT_BUILD_WITH_QT5)
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})
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)
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()
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
find_package(Qt4 COMPONENTS QtCore QtWidgets)
include(${QT_USE_FILE})
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
endif(RESINSIGHT_BUILD_WITH_QT5)
list (APPEND MAIN_SOURCE_FILES
@@ -26,8 +29,6 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}
)
if (RESINSIGHT_BUILD_WITH_QT5)
target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Widgets)
endif(RESINSIGHT_BUILD_WITH_QT5)
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})
source_group("" FILES ${PROJECT_FILES})