mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#4061 Harmonize how Qt5 is found
This commit is contained in:
parent
9a88c33de0
commit
0a2b9241ae
12
ThirdParty/expressionparser/CMakeLists.txt
vendored
12
ThirdParty/expressionparser/CMakeLists.txt
vendored
@ -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 Core REQUIRED)
|
||||||
endif(RESINSIGHT_BUILD_WITH_QT5)
|
|
||||||
|
|
||||||
if (Qt5Core_FOUND)
|
|
||||||
find_package(Qt5 CONFIG REQUIRED Core)
|
|
||||||
else()
|
else()
|
||||||
find_package(Qt4 COMPONENTS QtCore REQUIRED)
|
find_package(Qt4 COMPONENTS QtCore REQUIRED)
|
||||||
include(${QT_USE_FILE})
|
include(${QT_USE_FILE})
|
||||||
endif(Qt5Core_FOUND)
|
endif(RESINSIGHT_BUILD_WITH_QT5)
|
||||||
|
|
||||||
list (APPEND MAIN_SOURCE_FILES
|
list (APPEND MAIN_SOURCE_FILES
|
||||||
ExpressionParser.h
|
ExpressionParser.h
|
||||||
@ -39,8 +35,8 @@ if(MSVC)
|
|||||||
${CMAKE_CURRENT_SOURCE_DIR}
|
${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
if (Qt5Core_FOUND)
|
if (RESINSIGHT_BUILD_WITH_QT5)
|
||||||
target_link_libraries(${PROJECT_NAME} Qt5::Core)
|
target_link_libraries(${PROJECT_NAME} Qt5::Core)
|
||||||
endif()
|
endif(RESINSIGHT_BUILD_WITH_QT5)
|
||||||
|
|
||||||
source_group("" FILES ${PROJECT_FILES})
|
source_group("" FILES ${PROJECT_FILES})
|
||||||
|
12
ThirdParty/nightcharts/CMakeLists.txt
vendored
12
ThirdParty/nightcharts/CMakeLists.txt
vendored
@ -3,15 +3,11 @@ 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 QUIET)
|
find_package(Qt5 COMPONENTS Core Widgets REQUIRED)
|
||||||
endif(RESINSIGHT_BUILD_WITH_QT5)
|
|
||||||
|
|
||||||
if (Qt5Core_FOUND)
|
|
||||||
find_package(Qt5 CONFIG REQUIRED Core Widgets)
|
|
||||||
else()
|
else()
|
||||||
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
|
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
|
||||||
include(${QT_USE_FILE})
|
include(${QT_USE_FILE})
|
||||||
endif(Qt5Core_FOUND)
|
endif(RESINSIGHT_BUILD_WITH_QT5)
|
||||||
|
|
||||||
list (APPEND MAIN_SOURCE_FILES
|
list (APPEND MAIN_SOURCE_FILES
|
||||||
nightcharts.h
|
nightcharts.h
|
||||||
@ -30,8 +26,8 @@ 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::Core Qt5::Widgets)
|
target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Widgets)
|
||||||
endif()
|
endif(RESINSIGHT_BUILD_WITH_QT5)
|
||||||
|
|
||||||
source_group("" FILES ${PROJECT_FILES})
|
source_group("" FILES ${PROJECT_FILES})
|
||||||
|
Loading…
Reference in New Issue
Block a user