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

System : Remove support for Qt4

Browse Source
This commit is contained in:
Magne Sjaastad
2020-04-23 22:59:37 +02:00
parent e4547b8e0d
commit 4b372b438e
23 changed files with 87 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
ApplicationCode/CMakeLists.txt
View File

@@ -23,17 +23,11 @@ find_package( OpenGL )
option(RESINSIGHT_ENABLE_GRPC "Enable the gRPC scripting framework" OFF) option(RESINSIGHT_ENABLE_GRPC "Enable the gRPC scripting framework" OFF)
option(RESINSIGHT_GRPC_BUNDLE_PYTHON_MODULE "Bundle the gRPC python modules into the install folder" OFF) option(RESINSIGHT_GRPC_BUNDLE_PYTHON_MODULE "Bundle the gRPC python modules into the install folder" OFF)
if (RESINSIGHT_BUILD_WITH_QT5) find_package(Qt5 COMPONENTS Core QUIET)
find_package(Qt5 COMPONENTS Core QUIET)
endif(RESINSIGHT_BUILD_WITH_QT5)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Network Script Widgets Xml Concurrent PrintSupport) find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Network Script Widgets Xml Concurrent PrintSupport)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Script Qt5::Widgets Qt5::Xml Qt5::Concurrent Qt5::PrintSupport) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Script Qt5::Widgets Qt5::Xml Qt5::Concurrent Qt5::PrintSupport)
else()
set (QT_COMPONENTS_REQUIRED QtCore QtGui QtMain QtOpenGl QtNetwork QtScript)
find_package(Qt4 COMPONENTS ${QT_COMPONENTS_REQUIRED} REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND) endif(Qt5Core_FOUND)
# NB: The generated file is written to Cmake binary folder to avoid source tree pollution # NB: The generated file is written to Cmake binary folder to avoid source tree pollution
@@ -300,13 +294,8 @@ set ( QT_MOC_HEADERS
SocketInterface/RiaSocketServer.h SocketInterface/RiaSocketServer.h
) )
if (RESINSIGHT_BUILD_WITH_QT5) qt5_wrap_cpp(MOC_SOURCE_FILES ${QT_MOC_HEADERS} )
qt5_wrap_cpp(MOC_SOURCE_FILES ${QT_MOC_HEADERS} ) qt5_wrap_ui( FORM_FILES_CPP ${QT_UI_FILES} )
qt5_wrap_ui( FORM_FILES_CPP ${QT_UI_FILES} )
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${QT_MOC_HEADERS} )
qt4_wrap_ui( FORM_FILES_CPP ${QT_UI_FILES} )
endif(RESINSIGHT_BUILD_WITH_QT5)
# NOTE! Resources in subfolders must append to QRC_FILES using the following statement # NOTE! Resources in subfolders must append to QRC_FILES using the following statement
@@ -322,15 +311,9 @@ set( QRC_FILES
) )
# Runs RCC on specified files # Runs RCC on specified files
if (RESINSIGHT_BUILD_WITH_QT5) qt5_add_resources( QRC_FILES_CPP
qt5_add_resources( QRC_FILES_CPP ${QRC_FILES}
${QRC_FILES} )
)
else()
qt4_add_resources( QRC_FILES_CPP
${QRC_FILES}
)
endif(RESINSIGHT_BUILD_WITH_QT5)
# Adding resource (RC) files for Windows # Adding resource (RC) files for Windows
if ( MSVC ) if ( MSVC )
@@ -552,29 +535,22 @@ endif()
if (MSVC) if (MSVC)
# Qt DLLs # Qt DLLs
if (RESINSIGHT_BUILD_WITH_QT5) message(STATUS "Creating post build step for copying Qt DLLs")
message(STATUS "Creating post build step for copying Qt DLLs")
foreach (qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ResInsight POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:ResInsight>
)
endforeach(qtlib)
if (_unityTargetName)
foreach (qtlib ${QT_LIBRARIES}) foreach (qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ResInsight POST_BUILD add_custom_command(TARGET ${_unityTargetName} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:ResInsight> COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${_unityTargetName}>
) )
endforeach(qtlib) endforeach(qtlib)
endif(_unityTargetName)
if (_unityTargetName)
foreach (qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ${_unityTargetName} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${_unityTargetName}>
)
endforeach(qtlib)
endif(_unityTargetName)
else()
set (QTLIBLIST QtCore QtGui QtGui QtOpenGl QtNetwork QtScript QtScriptTools)
foreach (qtlib ${QTLIBLIST})
list(APPEND RI_DLL_FILENAMES ${QT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,${qtlib}d4.dll,${qtlib}4.dll>)
endforeach( qtlib )
endif(RESINSIGHT_BUILD_WITH_QT5)
# Odb Dlls # Odb Dlls
if (RESINSIGHT_USE_ODB_API) if (RESINSIGHT_USE_ODB_API)
# Find all the dlls # Find all the dlls
@@ -688,7 +664,7 @@ if (RESINSIGHT_PRIVATE_INSTALL)
set (RESINSIGHT_FILES ${RI_DLL_FILENAMES}) set (RESINSIGHT_FILES ${RI_DLL_FILENAMES})
if(RESINSIGHT_BUILD_WITH_QT5 AND WIN32 AND TARGET Qt5::qmake AND NOT TARGET Qt5::windeployqt) if(WIN32 AND TARGET Qt5::qmake AND NOT TARGET Qt5::windeployqt)
get_target_property(_qt5_qmake_location Qt5::qmake IMPORTED_LOCATION) get_target_property(_qt5_qmake_location Qt5::qmake IMPORTED_LOCATION)
execute_process( execute_process(

16
CMakeLists.txt
View File

@@ -270,14 +270,7 @@ list(APPEND THIRD_PARTY_LIBRARIES
################################################################################ ################################################################################
# Qt # Qt
################################################################################ ################################################################################
option(RESINSIGHT_BUILD_WITH_QT5 "Use Qt5" ON) find_package(Qt5 COMPONENTS REQUIRED Core Gui OpenGL Network Script ScriptTools Widgets)
mark_as_advanced(FORCE RESINSIGHT_BUILD_WITH_QT5)
if (RESINSIGHT_BUILD_WITH_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Gui OpenGL Network Script ScriptTools Widgets)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl QtNetwork QtScript QtScriptTools REQUIRED)
endif(RESINSIGHT_BUILD_WITH_QT5)
# Open GL # Open GL
find_package( OpenGL ) find_package( OpenGL )
@@ -347,13 +340,6 @@ set_property(TARGET
PROPERTY FOLDER "Thirdparty" PROPERTY FOLDER "Thirdparty"
) )
################################################################################
# App and Viz Framework Qt5 setting, propagate settings in RESINSIGHT_BUILD_WITH_QT5
################################################################################
set(CEE_USE_QT5 ${RESINSIGHT_BUILD_WITH_QT5} CACHE BOOL "Flag used to enable Qt5 in AppFwk and VizFwk" FORCE)
################################################################################ ################################################################################
# Vizualization Framework # Vizualization Framework
################################################################################ ################################################################################

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

@@ -18,15 +18,9 @@ set( MOC_HEADER_FILES
cafMessagePanel.h cafMessagePanel.h
) )
if (CEE_USE_QT5) find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
include(${QT_USE_FILE})
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CEE_USE_QT5)
add_library( ${PROJECT_NAME} add_library( ${PROJECT_NAME}
cafEffectCache.cpp cafEffectCache.cpp

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

@@ -15,15 +15,9 @@ set( MOC_HEADER_FILES
cafPopupMenuButton.h cafPopupMenuButton.h
) )
if (CEE_USE_QT5) find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
include(${QT_USE_FILE})
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CEE_USE_QT5)
# NOTE! Resources in this subfolder appends to the variable QRC_FILES in parent scope # 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 # CMakeList.txt in the application folder (parent scope) must use the following syntax

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

@@ -15,15 +15,9 @@ set (MOC_HEADER_FILES
) )
# Qt # Qt
if (CEE_USE_QT5) find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
include(${QT_USE_FILE})
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CEE_USE_QT5)
set( PROJECT_FILES set( PROJECT_FILES

12
Fwk/AppFwk/cafCommandFeatures/CMakeLists.txt
View File

@@ -14,15 +14,9 @@ set (MOC_HEADER_FILES
) )
# Qt # Qt
if (CEE_USE_QT5) find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
include(${QT_USE_FILE})
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CEE_USE_QT5)
set( PROJECT_FILES set( PROJECT_FILES

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

@@ -9,15 +9,9 @@ if (CAF_ENABLE_UNITY_BUILD)
endif() endif()
# Qt # Qt
if (CEE_USE_QT5) find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
include(${QT_USE_FILE})
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CEE_USE_QT5)
add_definitions(-DCVF_USING_CMAKE) add_definitions(-DCVF_USING_CMAKE)

22
Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/CMakeLists.txt
View File

@@ -2,17 +2,8 @@ cmake_minimum_required (VERSION 2.8.12)
project ( cafPdmScripting_UnitTests ) project ( cafPdmScripting_UnitTests )
if (NOT DEFINED(CEE_USE_QT5)) find_package(Qt5 COMPONENTS REQUIRED Core Xml Gui)
option(CEE_USE_QT5 "Use Qt5" OFF) set(QT_LIBRARIES Qt5::Core Qt5::Xml Qt5::Gui)
endif(NOT DEFINED(CEE_USE_QT5))
if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Xml Gui)
set(QT_LIBRARIES Qt5::Core Qt5::Xml Qt5::Gui)
else()
find_package(Qt4 COMPONENTS REQUIRED QtCore QtXml QtGui)
include(${QT_USE_FILE})
endif(CEE_USE_QT5)
if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)) if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
# VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1 # VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1
@@ -47,13 +38,4 @@ if (Qt5Core_FOUND)
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}> COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
) )
endforeach(qtlib) endforeach(qtlib)
else()
if (MSVC)
set (QTLIBLIST QtCore QtXml)
foreach (qtlib ${QTLIBLIST})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,${qtlib}d4.dll,${qtlib}4.dll> $<TARGET_FILE_DIR:${PROJECT_NAME}>
)
endforeach( qtlib )
endif(MSVC)
endif(Qt5Core_FOUND) endif(Qt5Core_FOUND)

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

@@ -9,13 +9,8 @@ if (CAF_ENABLE_UNITY_BUILD)
endif() endif()
# Qt # Qt
if (CEE_USE_QT5) find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
else()
find_package(Qt4 COMPONENTS REQUIRED QtCore QtGui)
include(${QT_USE_FILE})
endif(CEE_USE_QT5)
set( PROJECT_FILES set( PROJECT_FILES
cafFactory.h cafFactory.h

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

@@ -8,16 +8,8 @@ if (CAF_ENABLE_UNITY_BUILD)
set(CMAKE_UNITY_BUILD true) set(CMAKE_UNITY_BUILD true)
endif() endif()
# Qt find_package(Qt5 COMPONENTS REQUIRED Core)
option(CEE_USE_QT5 "Use Qt 5 instead of Qt 4" true) set(QT_LIBRARIES Qt5::Core)
if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core)
set(QT_LIBRARIES Qt5::Core)
else()
find_package(Qt4 COMPONENTS QtCore REQUIRED)
include(${QT_USE_FILE})
endif(CEE_USE_QT5)
set( PROJECT_FILES set( PROJECT_FILES

35
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt
View File

@@ -3,17 +3,8 @@ cmake_minimum_required (VERSION 2.8.12)
project ( cafPdmCore_UnitTests ) project ( cafPdmCore_UnitTests )
# Qt # Qt
if (NOT DEFINED(CEE_USE_QT5)) find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets)
option(CEE_USE_QT5 "Use Qt5" OFF) set(QT_LIBRARIES Qt5::Core Qt5::Widgets Qt5::Gui)
endif(NOT DEFINED(CEE_USE_QT5))
if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Widgets Qt5::Gui)
else()
find_package(Qt4 COMPONENTS REQUIRED QtCore QtGui)
include(${QT_USE_FILE})
endif(CEE_USE_QT5)
if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)) if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
# VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1 # VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1
@@ -62,20 +53,8 @@ target_link_libraries ( ${PROJECT_NAME}
) )
# Copy Qt Dlls # Copy Qt Dlls
if (CEE_USE_QT5) foreach (qtlib ${QT_LIBRARIES})
foreach (qtlib ${QT_LIBRARIES}) add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}> )
) endforeach(qtlib)
endforeach(qtlib)
# Copy Qt Dlls
else()
if (MSVC)
set (QTLIBLIST QtCore QtGui)
foreach (qtlib ${QTLIBLIST})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,${qtlib}d4.dll,${qtlib}4.dll> $<TARGET_FILE_DIR:${PROJECT_NAME}>
)
endforeach( qtlib )
endif(MSVC)
endif(CEE_USE_QT5)

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

@@ -17,15 +17,9 @@ set (MOC_HEADER_FILES
) )
# Qt # Qt
if (CEE_USE_QT5) find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
include(${QT_USE_FILE})
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CEE_USE_QT5)
include_directories ( include_directories (
.. ..

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

@@ -9,13 +9,8 @@ if (CAF_ENABLE_UNITY_BUILD)
endif() endif()
# Qt # Qt
if (CEE_USE_QT5) find_package(Qt5 COMPONENTS REQUIRED Core Xml)
find_package(Qt5 COMPONENTS REQUIRED Core Xml) set(QT_LIBRARIES Qt5::Core Qt5::Xml)
set(QT_LIBRARIES Qt5::Core Qt5::Xml)
else()
find_package(Qt4 COMPONENTS QtCore QtXml REQUIRED)
include(${QT_USE_FILE})
endif(CEE_USE_QT5)
include_directories ( include_directories (
.. ..

24
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt
View File

@@ -2,17 +2,8 @@ cmake_minimum_required (VERSION 2.8.12)
project ( cafPdmXml_UnitTests ) project ( cafPdmXml_UnitTests )
if (NOT DEFINED(CEE_USE_QT5)) find_package(Qt5 COMPONENTS REQUIRED Core Xml)
option(CEE_USE_QT5 "Use Qt5" OFF) set(QT_LIBRARIES Qt5::Core Qt5::Xml)
endif(NOT DEFINED(CEE_USE_QT5))
if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Xml)
set(QT_LIBRARIES Qt5::Core Qt5::Xml)
else()
find_package(Qt4 COMPONENTS REQUIRED QtCore QtXml)
include(${QT_USE_FILE})
endif(CEE_USE_QT5)
if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)) if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
# VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1 # VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1
@@ -54,13 +45,4 @@ if (Qt5Core_FOUND)
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}> COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
) )
endforeach(qtlib) endforeach(qtlib)
else() endif(Qt5Core_FOUND)
if (MSVC)
set (QTLIBLIST QtCore QtXml)
foreach (qtlib ${QTLIBLIST})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,${qtlib}d4.dll,${qtlib}4.dll> $<TARGET_FILE_DIR:${PROJECT_NAME}>
)
endforeach( qtlib )
endif(MSVC)
endif(Qt5Core_FOUND)

35
Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt
View File

@@ -3,18 +3,8 @@ cmake_minimum_required (VERSION 2.8.12)
project ( cafProjectDataModel_UnitTests ) project ( cafProjectDataModel_UnitTests )
# Qt # Qt
if (NOT DEFINED(CEE_USE_QT5)) find_package(Qt5 COMPONENTS REQUIRED Core Xml Gui)
option(CEE_USE_QT5 "Use Qt5" OFF) set(QT_LIBRARIES Qt5::Core Qt5::Xml Qt5::Gui)
endif(NOT DEFINED(CEE_USE_QT5))
if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Xml Gui)
set(QT_LIBRARIES Qt5::Core Qt5::Xml Qt5::Gui)
else()
find_package(Qt4 COMPONENTS REQUIRED QtCore QtXml QtGui)
include(${QT_USE_FILE})
endif(CEE_USE_QT5)
if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)) if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
# VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1 # VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1
@@ -49,19 +39,8 @@ target_link_libraries ( ${PROJECT_NAME}
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})
# Copy Qt Dlls # Copy Qt Dlls
if (CEE_USE_QT5) foreach (qtlib ${QT_LIBRARIES})
foreach (qtlib ${QT_LIBRARIES}) add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}> )
) endforeach(qtlib)
endforeach(qtlib)
else()
if (MSVC)
set (QTLIBLIST QtCore QtXml)
foreach (qtlib ${QTLIBLIST})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,${qtlib}d4.dll,${qtlib}4.dll> $<TARGET_FILE_DIR:${PROJECT_NAME}>
)
endforeach( qtlib )
endif(MSVC)
endif(CEE_USE_QT5)

41
Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt
View File

@@ -21,21 +21,10 @@ set( QRC_FILES
textedit.qrc textedit.qrc
) )
if (NOT DEFINED(CEE_USE_QT5)) find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL)
option(CEE_USE_QT5 "Use Qt5" OFF) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
endif(NOT DEFINED(CEE_USE_QT5)) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
qt5_add_resources( QRC_FILES_CPP ${QRC_FILES} )
if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
qt5_add_resources( QRC_FILES_CPP ${QRC_FILES} )
else()
find_package(Qt4 COMPONENTS REQUIRED QtCore QtGui QtMain QtOpenGl)
include(${QT_USE_FILE})
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
qt4_add_resources( QRC_FILES_CPP ${QRC_FILES} )
endif(CEE_USE_QT5)
option(USE_COMMAND_FRAMEWORK "Use Caf Command Framework" ON) option(USE_COMMAND_FRAMEWORK "Use Caf Command Framework" ON)
@@ -101,23 +90,11 @@ target_link_libraries ( ${PROJECT_NAME}
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})
if (CEE_USE_QT5) foreach (qtlib ${QT_LIBRARIES})
foreach (qtlib ${QT_LIBRARIES}) add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}> )
) endforeach(qtlib)
endforeach(qtlib)
else()
# Copy Qt Dlls
if (MSVC)
set (QTLIBLIST QtCore QtGui QtOpenGl QtXml)
foreach (qtlib ${QTLIBLIST})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,${qtlib}d4.dll,${qtlib}4.dll> $<TARGET_FILE_DIR:${PROJECT_NAME}>
)
endforeach( qtlib )
endif(MSVC)
endif(CEE_USE_QT5)
# cotire # cotire

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

@@ -55,15 +55,9 @@ set (MOC_HEADER_FILES
cafPdmUiLabelEditor.h cafPdmUiLabelEditor.h
) )
if (CEE_USE_QT5) find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
include(${QT_USE_FILE})
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CEE_USE_QT5)
set( PROJECT_FILES set( PROJECT_FILES

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

@@ -15,15 +15,9 @@ set( MOC_HEADER_FILES
cafViewer.h cafViewer.h
) )
if (CEE_USE_QT5) find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
include(${QT_USE_FILE})
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CEE_USE_QT5)
add_library( ${PROJECT_NAME} add_library( ${PROJECT_NAME}
cafCadNavigation.cpp cafCadNavigation.cpp

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

@@ -12,15 +12,9 @@ endif()
find_package( OpenGL ) find_package( OpenGL )
# Qt # Qt
if (CEE_USE_QT5) find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
include(${QT_USE_FILE})
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CEE_USE_QT5)
add_library( ${PROJECT_NAME} add_library( ${PROJECT_NAME}
cafDisplayCoordTransform.cpp cafDisplayCoordTransform.cpp

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

@@ -17,16 +17,8 @@ endif()
find_package(OpenGL) find_package(OpenGL)
# Qt find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL)
option(CEE_USE_QT5 "Use Qt 5 instead of Qt 4" true) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGl REQUIRED)
include(${QT_USE_FILE})
endif(CEE_USE_QT5)
set(CEE_HEADER_FILES set(CEE_HEADER_FILES
cvfqtBasicAboutDialog.h cvfqtBasicAboutDialog.h

15
OctavePlugin/CMakeLists.txt
View File

@@ -108,21 +108,6 @@ else()
SET(OCTAVE_QT_QTCORE_LIB Qt5Core) SET(OCTAVE_QT_QTCORE_LIB Qt5Core)
SET(OCTAVE_QT_QTNETWORK_LIB Qt5Network) SET(OCTAVE_QT_QTNETWORK_LIB Qt5Network)
else()
message(STATUS "Compiling Octave plugins using system Qt4 - include path located at ${QT_QMAKE_EXECUTABLE}")
SET(OCTAVE_QT_QTCORE_INCLUDE_DIR ${QT_QTCORE_INCLUDE_DIR})
SET(OCTAVE_QT_QTNETWORK_INCLUDE_DIR ${QT_QTNETWORK_INCLUDE_DIR})
SET(OCTAVE_QT_LIBRARY_DIR ${QT_LIBRARY_DIR})
if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
SET(OCTAVE_QT_QTCORE_LIB QtCore4)
SET(OCTAVE_QT_QTNETWORK_LIB QtNetwork4)
else()
SET(OCTAVE_QT_QTCORE_LIB QtCore)
SET(OCTAVE_QT_QTNETWORK_LIB QtNetwork)
endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
endif(Qt5Core_FOUND) endif(Qt5Core_FOUND)
endif(RESINSIGHT_OCTAVE_PLUGIN_QT) endif(RESINSIGHT_OCTAVE_PLUGIN_QT)

9
ThirdParty/expressionparser/CMakeLists.txt vendored
View File

@@ -8,13 +8,8 @@ if(MSVC)
endif() endif()
if (RESINSIGHT_BUILD_WITH_QT5) find_package(Qt5 COMPONENTS REQUIRED Core)
find_package(Qt5 COMPONENTS REQUIRED Core) set(QT_LIBRARIES Qt5::Core)
set(QT_LIBRARIES Qt5::Core)
else()
find_package(Qt4 COMPONENTS QtCore REQUIRED)
include(${QT_USE_FILE})
endif(RESINSIGHT_BUILD_WITH_QT5)
list (APPEND MAIN_SOURCE_FILES list (APPEND MAIN_SOURCE_FILES
ExpressionParser.h ExpressionParser.h

12
ThirdParty/nightcharts/CMakeLists.txt vendored
View File

@@ -2,15 +2,9 @@ cmake_minimum_required (VERSION 2.8.12)
project (nightcharts) project (nightcharts)
if (RESINSIGHT_BUILD_WITH_QT5) find_package(Qt5 COMPONENTS REQUIRED Core Widgets)
find_package(Qt5 COMPONENTS REQUIRED Core Widgets) set(QT_LIBRARIES Qt5::Core Qt5::Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Widgets) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
else()
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 list (APPEND MAIN_SOURCE_FILES
nightcharts.h nightcharts.h