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

Add Qt5 test to AppFwk main CMakeLists.txt and update CAF to use CEE_USE_QT5

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-05-28 09:08:32 +02:00
parent c7a9f64575
commit 8f3eb6a748
13 changed files with 151 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -332,6 +332,15 @@ set_property(TARGET
PROPERTY FOLDER "Thirdparty"
)
################################################################################
# App and Viz Framework Qt5 setting
################################################################################
if (RESINSIGHT_BUILD_WITH_QT5)
set(CEE_USE_QT5 ON)
endif(RESINSIGHT_BUILD_WITH_QT5)
################################################################################
# Vizualization Framework
################################################################################
@ -357,10 +366,6 @@ if (CMAKE_COMPILER_IS_GNUCC)
endif()
if (RESINSIGHT_BUILD_WITH_QT5)
set(CEE_USE_QT5 ON)
endif(RESINSIGHT_BUILD_WITH_QT5)
add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibCore)
add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibGeometry)
add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibRender)
@ -385,10 +390,6 @@ set_property(TARGET
# Application Framework
################################################################################
if (RESINSIGHT_BUILD_WITH_QT5)
set(CAF_USE_QT5 ON)
endif(RESINSIGHT_BUILD_WITH_QT5)
add_subdirectory(Fwk/AppFwk/cafAnimControl)
add_subdirectory(Fwk/AppFwk/cafViewer)

8
Fwk/AppFwk/CMakeLists.txt
View File

@ -8,7 +8,13 @@ if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
message("Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING")
endif()
find_package(Qt5Core CONFIG QUIET)
# Qt
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5)
find_package(Qt5Core CONFIG QUIET)
endif(CEE_USE_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Widgets)
else()

23
Fwk/AppFwk/CommonCode/CMakeLists.txt
View File

@ -3,12 +3,19 @@ cmake_minimum_required (VERSION 2.8.12)
project (CommonCode)
# Qt
if (CAF_USE_QT5)
find_package(Qt5 COMPONENTS Core Gui OpenGL Widgets REQUIRED)
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5)
find_package(Qt5Core CONFIG QUIET)
endif(CEE_USE_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
include(${QT_USE_FILE})
endif(CAF_USE_QT5)
endif(Qt5Core_FOUND)
# Open GL
find_package( OpenGL )
@ -19,11 +26,11 @@ set( MOC_HEADER_FILES
)
if ( NOT CMAKE_AUTOMOC )
if (CAF_USE_QT5)
if (CEE_USE_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CAF_USE_QT5)
endif(CEE_USE_QT5)
endif()
@ -63,10 +70,6 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}
)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets)
endif(CAF_USE_QT5)
target_link_libraries ( ${PROJECT_NAME}
LibCore
LibGeometry

26
Fwk/AppFwk/cafAnimControl/CMakeLists.txt
View File

@ -3,13 +3,19 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafAnimControl)
# Qt
if (CAF_USE_QT5)
find_package(Qt5 COMPONENTS Core Gui OpenGL Widgets REQUIRED)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
include(${QT_USE_FILE})
endif(CAF_USE_QT5)
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5)
find_package(Qt5Core CONFIG QUIET)
endif(CEE_USE_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
set( MOC_HEADER_FILES
cafFrameAnimationControl.h
@ -17,11 +23,11 @@ set( MOC_HEADER_FILES
cafPopupMenuButton.h
)
if (CAF_USE_QT5)
if (CEE_USE_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CAF_USE_QT5)
endif(CEE_USE_QT5)
# NOTE! Resources in this subfolder appends to the variable QRC_FILES in parent scope
# CMakeList.txt in the application folder (parent scope) must use the following syntax
@ -57,10 +63,6 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}
)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
endif(CAF_USE_QT5)
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})
if (MSVC)

20
Fwk/AppFwk/cafCommand/CMakeLists.txt
View File

@ -1,12 +1,19 @@
cmake_minimum_required (VERSION 2.8.12)
# Qt
if (CAF_USE_QT5)
find_package(Qt5 COMPONENTS Core Gui OpenGL Widgets REQUIRED)
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5)
find_package(Qt5Core CONFIG QUIET)
endif(CEE_USE_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
include(${QT_USE_FILE})
endif(CAF_USE_QT5)
endif(Qt5Core_FOUND)
project (cafCommand)
@ -17,12 +24,11 @@ set (MOC_HEADER_FILES
cafCmdFeatureManager.h
)
if (CAF_USE_QT5)
if (CEE_USE_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CAF_USE_QT5)
endif(CEE_USE_QT5)
set( PROJECT_FILES

20
Fwk/AppFwk/cafPdmCvf/CMakeLists.txt
View File

@ -3,12 +3,19 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafPdmCvf)
# Qt
if (CAF_USE_QT5)
find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5)
find_package(Qt5Core CONFIG QUIET)
endif(CEE_USE_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
include(${QT_USE_FILE})
endif(CAF_USE_QT5)
endif(Qt5Core_FOUND)
add_definitions(-DCVF_USING_CMAKE)
@ -40,11 +47,6 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}
)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
endif(CAF_USE_QT5)
target_link_libraries ( ${PROJECT_NAME}
cafUserInterface
LibCore

20
Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt
View File

@ -3,12 +3,20 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafProjectDataModel)
# Qt
if (CAF_USE_QT5)
find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5)
find_package(Qt5Core CONFIG QUIET)
endif(CEE_USE_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
else()
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
include(${QT_USE_FILE})
endif(CAF_USE_QT5)
endif(Qt5Core_FOUND)
set( PROJECT_FILES
cafFactory.h
@ -25,10 +33,6 @@ add_library( ${PROJECT_NAME}
${PROJECT_FILES}
)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
endif(CAF_USE_QT5)
target_link_libraries ( ${PROJECT_NAME}
cafPdmUiCore
cafPdmXml

19
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt
View File

@ -3,12 +3,19 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafPdmCore)
# Qt
if (CAF_USE_QT5)
find_package(Qt5 COMPONENTS Core REQUIRED)
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5)
find_package(Qt5Core CONFIG QUIET)
endif(CEE_USE_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG 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(CAF_USE_QT5)
endif(Qt5Core_FOUND)
set( PROJECT_FILES
@ -64,10 +71,6 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}
)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
endif(CAF_USE_QT5)
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})
if (MSVC)

26
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt
View File

@ -3,13 +3,19 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafPdmUiCore)
# Qt
if (CAF_USE_QT5)
find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
else()
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
include(${QT_USE_FILE})
endif(CAF_USE_QT5)
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5)
find_package(Qt5Core CONFIG QUIET)
endif(CEE_USE_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
else()
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
include_directories (
..
@ -25,11 +31,11 @@ set (MOC_HEADER_FILES
# Run MOC on the headers
add_definitions(-DCVF_USING_CMAKE)
if (CAF_USE_QT5)
if (CEE_USE_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CAF_USE_QT5)
endif(CEE_USE_QT5)
set( PROJECT_FILES
@ -86,10 +92,6 @@ add_library( ${PROJECT_NAME}
${MOC_SOURCE_FILES}
)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
endif(CAF_USE_QT5)
target_link_libraries ( ${PROJECT_NAME}
cafPdmCore
${QT_LIBRARIES}

19
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt
View File

@ -3,12 +3,19 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafPdmXml)
# Qt
if (CAF_USE_QT5)
find_package(Qt5 COMPONENTS Core Xml REQUIRED)
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5)
find_package(Qt5Core CONFIG QUIET)
endif(CEE_USE_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Xml)
set(QT_LIBRARIES Qt5::Core Qt5::Xml)
else()
find_package(Qt4 COMPONENTS QtCore QtXml REQUIRED)
find_package(Qt4 COMPONENTS QtCore QtXml REQUIRED)
include(${QT_USE_FILE})
endif(CAF_USE_QT5)
endif(Qt5Core_FOUND)
include_directories (
..
@ -48,10 +55,6 @@ add_library( ${PROJECT_NAME}
${PROJECT_FILES}
)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Xml)
endif(CAF_USE_QT5)
target_link_libraries ( ${PROJECT_NAME}
cafPdmCore
${QT_LIBRARIES}

21
Fwk/AppFwk/cafUserInterface/CMakeLists.txt
View File

@ -8,12 +8,19 @@ endif (MSVC)
project (cafUserInterface)
# Qt
if (CAF_USE_QT5)
find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5)
find_package(Qt5Core CONFIG QUIET)
endif(CEE_USE_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
include(${QT_USE_FILE})
endif(CAF_USE_QT5)
endif(Qt5Core_FOUND)
# These headers need to go through Qt's MOC compiler
set (MOC_HEADER_FILES
@ -55,11 +62,11 @@ set (MOC_HEADER_FILES
)
if ( NOT CMAKE_AUTOMOC )
if (CAF_USE_QT5)
if (CEE_USE_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CAF_USE_QT5)
endif(CEE_USE_QT5)
endif()
@ -180,10 +187,6 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}
)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
endif(CAF_USE_QT5)
target_link_libraries ( ${PROJECT_NAME}
cafProjectDataModel
${QT_LIBRARIES}

23
Fwk/AppFwk/cafViewer/CMakeLists.txt
View File

@ -3,12 +3,19 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafViewer)
# Qt
if (CAF_USE_QT5)
find_package(Qt5 COMPONENTS Core Gui OpenGL Widgets REQUIRED)
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5)
find_package(Qt5Core CONFIG QUIET)
endif(CEE_USE_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets OpenGL)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
include(${QT_USE_FILE})
endif(CAF_USE_QT5)
endif(Qt5Core_FOUND)
# These headers need to go through Qt's MOC compiler
set( MOC_HEADER_FILES
@ -16,11 +23,11 @@ set( MOC_HEADER_FILES
)
if ( NOT CMAKE_AUTOMOC )
if (CAF_USE_QT5)
if (CEE_USE_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CAF_USE_QT5)
endif(CEE_USE_QT5)
endif()
@ -48,10 +55,6 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}
)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets)
endif(CAF_USE_QT5)
target_link_libraries ( ${PROJECT_NAME}
LibCore
LibGeometry

20
Fwk/AppFwk/cafVizExtensions/CMakeLists.txt
View File

@ -6,12 +6,19 @@ project (cafVizExtensions)
find_package( OpenGL )
# Qt
if (CAF_USE_QT5)
find_package(Qt5 COMPONENTS Core Gui OpenGL Widgets REQUIRED)
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5)
find_package(Qt5Core CONFIG QUIET)
endif(CEE_USE_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets OpenGL)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
include(${QT_USE_FILE})
endif(CAF_USE_QT5)
endif(Qt5Core_FOUND)
add_library( ${PROJECT_NAME}
cafDisplayCoordTransform.cpp
@ -51,11 +58,6 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}
)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets)
endif(CAF_USE_QT5)
target_link_libraries ( ${PROJECT_NAME}
LibCore
LibGeometry