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 CEE_USE_QT5

Browse Source
This commit is contained in:
Magne Sjaastad 2019-02-08 11:02:26 +01:00
parent 5dd8f34c3e
commit 6f7730c1f5
7 changed files with 35 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

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

1
Fwk/VizFwk/CMakeLists.txt
View File

@ -47,6 +47,7 @@ add_subdirectory(LibUtilities)
option(CEE_BUILD_GUI_QT "Build GUI library for Qt" ON)
if (CEE_BUILD_GUI_QT)
option(CEE_USE_QT5 "Use Qt5" OFF)
add_subdirectory(LibGuiQt)
endif()

14
Fwk/VizFwk/LibGuiQt/CMakeLists.txt
View File

@ -10,16 +10,12 @@ if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-long-long")
endif()
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 (CEE_USE_QT5)
find_package(Qt5 COMPONENTS Core Gui OpenGL Widgets REQUIRED)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGL REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
endif(CEE_USE_QT5)
set(CEE_HEADER_FILES
cvfqtBasicAboutDialog.h
@ -49,7 +45,7 @@ target_include_directories(${PROJECT_NAME}
)
if ( NOT CMAKE_AUTOMOC )
if (Qt5Core_FOUND)
if (CEE_USE_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
@ -57,7 +53,7 @@ if ( NOT CMAKE_AUTOMOC )
endif()
endif()
if (Qt5Core_FOUND)
if (CEE_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Widgets)
endif()

14
Fwk/VizFwk/TestApps/Qt/QtMinimal/CMakeLists.txt
View File

@ -12,17 +12,15 @@ endif()
find_package(OpenGL)
find_package(Qt5 CONFIG COMPONENTS Core)
if (Qt5Core_FOUND)
message(STATUS "Found Qt5")
find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Widgets)
if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS Core Gui OpenGL Widgets REQUIRED)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGL REQUIRED)
include(${QT_USE_FILE})
if (QT4_FOUND)
message(STATUS "Found Qt4")
endif(QT4_FOUND)
endif(Qt5Core_FOUND)
endif(CEE_USE_QT5)
include_directories(${LibCore_SOURCE_DIR})
include_directories(${LibGeometry_SOURCE_DIR})
@ -48,7 +46,7 @@ QMWidget.h
# Run MOC on the headers
add_definitions(-DCVF_USING_CMAKE)
set(MOC_SOURCE_FILES)
if (Qt5Core_FOUND)
if (CEE_USE_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets)
else()
@ -60,7 +58,7 @@ endif()
add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES} ${MOC_SOURCE_FILES})
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${QT_LIBRARIES})
if (Qt5Core_FOUND)
if (CEE_USE_QT5)
foreach (qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
@ -80,4 +78,4 @@ else()
execute_process(COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}4.dll ${CMAKE_BINARY_DIR}/Release/${qtlib}4.dll)
endforeach( qtlib )
endif(MSVC)
endif(Qt5Core_FOUND)
endif(CEE_USE_QT5)

17
Fwk/VizFwk/TestApps/Qt/QtMultiView/CMakeLists.txt
View File

@ -12,18 +12,15 @@ endif()
find_package(OpenGL)
find_package(Qt5 CONFIG COMPONENTS Core)
if (Qt5Core_FOUND)
message(STATUS "Found Qt5")
find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Widgets)
if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS Core Gui OpenGL Widgets REQUIRED)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGL REQUIRED)
include(${QT_USE_FILE})
if (QT4_FOUND)
message(STATUS "Found Qt4")
endif(QT4_FOUND)
endif(Qt5Core_FOUND)
endif(CEE_USE_QT5)
include_directories(${LibCore_SOURCE_DIR})
include_directories(${LibGeometry_SOURCE_DIR})
@ -51,17 +48,17 @@ QMVWidget.h
# Run MOC on the headers
add_definitions(-DCVF_USING_CMAKE)
set(MOC_SOURCE_FILES)
if (Qt5Core_FOUND)
if (CEE_USE_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets)
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif()
endif(CEE_USE_QT5)
add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES} ${MOC_SOURCE_FILES})
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${QT_LIBRARIES})
if (Qt5Core_FOUND)
if (CEE_USE_QT5)
foreach (qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
@ -81,4 +78,4 @@ else()
execute_process(COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}4.dll ${CMAKE_BINARY_DIR}/Release/${qtlib}4.dll)
endforeach( qtlib )
endif(MSVC)
endif(Qt5Core_FOUND)
endif(CEE_USE_QT5)

16
Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/CMakeLists.txt
View File

@ -12,17 +12,15 @@ endif()
find_package(OpenGL)
find_package(Qt5 CONFIG COMPONENTS Core)
if (Qt5Core_FOUND)
message(STATUS "Found Qt5")
find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Widgets)
if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS Core Gui OpenGL Widgets REQUIRED)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGL REQUIRED)
include(${QT_USE_FILE})
if (QT4_FOUND)
message(STATUS "Found Qt4")
endif(QT4_FOUND)
endif(Qt5Core_FOUND)
endif(CEE_USE_QT5)
include_directories(${LibCore_SOURCE_DIR})
include_directories(${LibGeometry_SOURCE_DIR})
@ -60,18 +58,18 @@ QSRSnippetWidget.h
# Run MOC on the headers
add_definitions(-DCVF_USING_CMAKE)
set(MOC_SOURCE_FILES)
if (Qt5Core_FOUND)
if (CEE_USE_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets)
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif()
endif(CEE_USE_QT5)
add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES} ${MOC_SOURCE_FILES})
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${QT_LIBRARIES})
if (Qt5Core_FOUND)
if (CEE_USE_QT5)
foreach (qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
@ -91,4 +89,4 @@ else()
execute_process(COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}4.dll ${CMAKE_BINARY_DIR}/Release/${qtlib}4.dll)
endforeach( qtlib )
endif(MSVC)
endif(Qt5Core_FOUND)
endif(CEE_USE_QT5)

12
Fwk/VizFwk/Tests/LibGuiQt_UnitTests/CMakeLists.txt
View File

@ -7,17 +7,15 @@ project(LibGuiQt_UnitTests)
find_package(OpenGL)
find_package(Qt5 CONFIG COMPONENTS Core)
if (Qt5Core_FOUND)
message(STATUS "Found Qt5")
find_package(Qt5 CONFIG REQUIRED Core OpenGL Widgets)
if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS Core Gui OpenGL Widgets REQUIRED)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGL REQUIRED)
include(${QT_USE_FILE})
if (QT4_FOUND)
message(STATUS "Found Qt4")
endif(QT4_FOUND)
endif(Qt5Core_FOUND)
endif(CEE_USE_QT5)
include_directories(${LibCore_SOURCE_DIR})
include_directories(${LibIo_SOURCE_DIR})
@ -36,9 +34,9 @@ cvfqtUtils-Test.cpp
LibGuiQt_UnitTests.cpp
)
if (Qt5Core_FOUND)
if (CEE_USE_QT5)
set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Widgets)
endif(Qt5Core_FOUND)
endif(CEE_USE_QT5)
if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))