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 VizFwk : Use variable CAF_USE_QT5

Browse Source
This commit is contained in:
Magne Sjaastad
2019-02-08 11:28:14 +01:00
parent 6f7730c1f5
commit 9a88c33de0
12 changed files with 73 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -375,6 +375,10 @@ 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)

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

@@ -3,16 +3,12 @@ cmake_minimum_required (VERSION 2.8.12)
project (CommonCode)
# Qt
if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Widgets)
if (CAF_USE_QT5)
find_package(Qt5 COMPONENTS Core Gui OpenGL Widgets REQUIRED)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
endif(CAF_USE_QT5)
# Open GL
find_package( OpenGL )
@@ -23,11 +19,11 @@ set( MOC_HEADER_FILES
)
if ( NOT CMAKE_AUTOMOC )
if (Qt5Core_FOUND)
if (CAF_USE_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif()
endif(CAF_USE_QT5)
endif()
@@ -67,9 +63,9 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}
)
if (Qt5Core_FOUND)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets)
endif()
endif(CAF_USE_QT5)
target_link_libraries ( ${PROJECT_NAME}
LibCore

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

@@ -1,17 +1,14 @@
cmake_minimum_required (VERSION 2.8.12)
project (cafAnimControl)
# Qt
if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
# 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(Qt5Core_FOUND)
endif(CAF_USE_QT5)
set( MOC_HEADER_FILES
@@ -19,11 +16,11 @@ set( MOC_HEADER_FILES
cafAnimationToolBar.h
)
if (Qt5Core_FOUND)
if (CAF_USE_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif()
endif(CAF_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,9 +54,9 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}
)
if (Qt5Core_FOUND)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
endif()
endif(CAF_USE_QT5)
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})

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

@@ -5,12 +5,12 @@ if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
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(Qt5Core_FOUND)
endif(CAF_USE_QT5)
project (cafCommand)
@@ -21,12 +21,12 @@ set (MOC_HEADER_FILES
cafCmdFeatureManager.h
)
if (Qt5Core_FOUND)
if (CAF_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()
endif(CAF_USE_QT5)
set( PROJECT_FILES

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

@@ -3,16 +3,12 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafPdmCvf)
# Qt
if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
if (CAF_USE_QT5)
find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
endif(CAF_USE_QT5)
# These headers need to go through Qt's MOC compiler
@@ -22,11 +18,11 @@ set (MOC_HEADER_FILES
# Run MOC on the headers
add_definitions(-DCVF_USING_CMAKE)
if (Qt5Core_FOUND)
if (CAF_USE_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif()
endif(CAF_USE_QT5)
add_library( ${PROJECT_NAME}
cafPdmCoreColor3f.h
@@ -60,9 +56,9 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}
)
if (Qt5Core_FOUND)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
endif()
endif(CAF_USE_QT5)
target_link_libraries ( ${PROJECT_NAME}

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

@@ -3,16 +3,12 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafProjectDataModel)
# Qt
if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
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(Qt5Core_FOUND)
endif(CAF_USE_QT5)
set( PROJECT_FILES
cafFactory.h
@@ -29,9 +25,9 @@ add_library( ${PROJECT_NAME}
${PROJECT_FILES}
)
if (Qt5Core_FOUND)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
endif()
endif(CAF_USE_QT5)
target_link_libraries ( ${PROJECT_NAME}
cafPdmUiCore

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

@@ -3,16 +3,12 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafPdmCore)
# Qt
if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core)
if (CAF_USE_QT5)
find_package(Qt5 COMPONENTS Core REQUIRED)
else()
find_package(Qt4 COMPONENTS QtCore REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
endif(CAF_USE_QT5)
set( PROJECT_FILES
@@ -68,9 +64,9 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}
)
if (Qt5Core_FOUND)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
endif()
endif(CAF_USE_QT5)
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})

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

@@ -3,16 +3,12 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafPdmUiCore)
# Qt
if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
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(Qt5Core_FOUND)
endif(CAF_USE_QT5)
include_directories (
@@ -27,11 +23,11 @@ set (MOC_HEADER_FILES
# Run MOC on the headers
add_definitions(-DCVF_USING_CMAKE)
if (Qt5Core_FOUND)
if (CAF_USE_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif()
endif(CAF_USE_QT5)
set( PROJECT_FILES
@@ -83,9 +79,9 @@ add_library( ${PROJECT_NAME}
${MOC_SOURCE_FILES}
)
if (Qt5Core_FOUND)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
endif()
endif(CAF_USE_QT5)
target_link_libraries ( ${PROJECT_NAME}
cafPdmCore

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

@@ -3,16 +3,12 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafPdmXml)
# Qt
if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Xml)
if (CAF_USE_QT5)
find_package(Qt5 COMPONENTS Core Xml REQUIRED)
else()
find_package(Qt4 COMPONENTS QtCore QtXml REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
endif(CAF_USE_QT5)
include_directories (
..
@@ -52,9 +48,9 @@ add_library( ${PROJECT_NAME}
${PROJECT_FILES}
)
if (Qt5Core_FOUND)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Xml)
endif()
endif(CAF_USE_QT5)
target_link_libraries ( ${PROJECT_NAME}
cafPdmCore

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

@@ -8,16 +8,12 @@ endif (MSVC)
project (cafUserInterface)
# Qt
if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
if (CAF_USE_QT5)
find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
endif(CAF_USE_QT5)
# These headers need to go through Qt's MOC compiler
set (MOC_HEADER_FILES
@@ -57,11 +53,11 @@ set (MOC_HEADER_FILES
)
if ( NOT CMAKE_AUTOMOC )
if (Qt5Core_FOUND)
if (CAF_USE_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif()
endif(CAF_USE_QT5)
endif()
@@ -178,9 +174,9 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}
)
if (Qt5Core_FOUND)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
endif()
endif(CAF_USE_QT5)
target_link_libraries ( ${PROJECT_NAME}
cafProjectDataModel

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

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

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

@@ -5,16 +5,13 @@ project (cafVizExtensions)
# Open GL
find_package( OpenGL )
if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Widgets)
# Qt
if (CAF_USE_QT5)
find_package(Qt5 COMPONENTS Core Gui OpenGL Widgets REQUIRED)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
endif(CAF_USE_QT5)
add_library( ${PROJECT_NAME}
cafDisplayCoordTransform.cpp
@@ -55,9 +52,9 @@ target_include_directories(${PROJECT_NAME}
)
if (Qt5Core_FOUND)
if (CAF_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets)
endif()
endif(CAF_USE_QT5)
target_link_libraries ( ${PROJECT_NAME}
LibCore