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

Caf build fixes for CEE_USE_QT5

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-05-31 10:22:30 +02:00
parent db97951a80
commit 5365f4dd7d
17 changed files with 50 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Fwk/AppFwk/CMakeLists.txt
View File

@ -9,7 +9,9 @@ if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
endif() endif()
# Qt # Qt
option(CEE_USE_QT5 "Use Qt5" OFF) if (NOT DEFINED(CEE_USE_QT5))
option(CEE_USE_QT5 "Use Qt5" OFF)
endif(NOT DEFINED(CEE_USE_QT5))
if (CEE_USE_QT5) if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Gui OpenGL Widgets) find_package(Qt5 COMPONENTS REQUIRED Core Gui OpenGL Widgets)

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

@ -12,8 +12,6 @@ set( MOC_HEADER_FILES
cafMessagePanel.h cafMessagePanel.h
) )
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5) 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)

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

@ -9,8 +9,6 @@ set( MOC_HEADER_FILES
cafPopupMenuButton.h cafPopupMenuButton.h
) )
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5) 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)

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

@ -10,8 +10,6 @@ set (MOC_HEADER_FILES
) )
# Qt # Qt
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5) 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)

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

@ -3,8 +3,6 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafPdmCvf) project (cafPdmCvf)
# Qt # Qt
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5) 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)

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

@ -3,8 +3,6 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafProjectDataModel) project (cafProjectDataModel)
# Qt # Qt
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5) 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)

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

@ -2,8 +2,6 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafPdmCore) project (cafPdmCore)
# Qt # Qt
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5) if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core) find_package(Qt5 COMPONENTS REQUIRED Core)
set(QT_LIBRARIES Qt5::Core) set(QT_LIBRARIES Qt5::Core)

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

@ -2,13 +2,18 @@ cmake_minimum_required (VERSION 2.8.12)
project ( cafPdmCore_UnitTests ) project ( cafPdmCore_UnitTests )
find_package(Qt5Core CONFIG QUIET) # Qt
if (Qt5Core_FOUND) if (NOT DEFINED(CEE_USE_QT5))
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets) option(CEE_USE_QT5 "Use Qt5" OFF)
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() else()
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED) find_package(Qt4 COMPONENTS REQUIRED QtCore QtGui)
include(${QT_USE_FILE}) include(${QT_USE_FILE})
endif(Qt5Core_FOUND) 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
@ -57,7 +62,7 @@ target_link_libraries ( ${PROJECT_NAME}
) )
# Copy Qt Dlls # Copy Qt Dlls
if (Qt5Core_FOUND) 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}>
@ -65,16 +70,12 @@ if (Qt5Core_FOUND)
endforeach(qtlib) endforeach(qtlib)
# Copy Qt Dlls # Copy Qt Dlls
else() else()
# Copy Qt Dlls
if (MSVC) if (MSVC)
set (QTLIBLIST QtCore QtGui ) set (QTLIBLIST QtCore QtGui)
foreach (qtlib ${QTLIBLIST}) foreach (qtlib ${QTLIBLIST})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
# Debug COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,${qtlib}d4.dll,${qtlib}4.dll> $<TARGET_FILE_DIR:${PROJECT_NAME}>
execute_process(COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}d4.dll ${CMAKE_BINARY_DIR}/Debug/${qtlib}d4.dll) )
# Release
execute_process(COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}4.dll ${CMAKE_BINARY_DIR}/Release/${qtlib}4.dll)
endforeach( qtlib ) endforeach( qtlib )
endif(MSVC) endif(MSVC)
endif(Qt5Core_FOUND) endif(CEE_USE_QT5)

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

@ -11,8 +11,6 @@ set (MOC_HEADER_FILES
) )
# Qt # Qt
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5) 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)

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

@ -3,8 +3,6 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafPdmXml) project (cafPdmXml)
# Qt # Qt
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5) 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)

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

@ -2,13 +2,17 @@ cmake_minimum_required (VERSION 2.8.12)
project ( cafPdmXml_UnitTests ) project ( cafPdmXml_UnitTests )
find_package(Qt5Core CONFIG QUIET) if (NOT DEFINED(CEE_USE_QT5))
if (Qt5Core_FOUND) option(CEE_USE_QT5 "Use Qt5" OFF)
find_package(Qt5 CONFIG REQUIRED Core 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() else()
find_package(Qt4 COMPONENTS QtCore QtXml REQUIRED) find_package(Qt4 COMPONENTS REQUIRED QtCore QtXml)
include(${QT_USE_FILE}) include(${QT_USE_FILE})
endif(Qt5Core_FOUND) 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,18 +53,13 @@ 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)
# Copy Qt Dlls
else() else()
# Copy Qt Dlls
if (MSVC) if (MSVC)
set (QTLIBLIST QtCore) set (QTLIBLIST QtCore QtXml)
foreach (qtlib ${QTLIBLIST}) foreach (qtlib ${QTLIBLIST})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
# Debug COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,${qtlib}d4.dll,${qtlib}4.dll> $<TARGET_FILE_DIR:${PROJECT_NAME}>
execute_process(COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}d4.dll ${CMAKE_BINARY_DIR}/Debug/${qtlib}d4.dll) )
# Release
execute_process(COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}4.dll ${CMAKE_BINARY_DIR}/Release/${qtlib}4.dll)
endforeach( qtlib ) endforeach( qtlib )
endif(MSVC) endif(MSVC)
endif(Qt5Core_FOUND) endif(Qt5Core_FOUND)

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

@ -3,7 +3,9 @@ cmake_minimum_required (VERSION 2.8.12)
project ( cafProjectDataModel_UnitTests ) project ( cafProjectDataModel_UnitTests )
# Qt # Qt
option(CEE_USE_QT5 "Use Qt5" OFF) if (NOT DEFINED(CEE_USE_QT5))
option(CEE_USE_QT5 "Use Qt5" OFF)
endif(NOT DEFINED(CEE_USE_QT5))
if (CEE_USE_QT5) if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Xml Gui) find_package(Qt5 COMPONENTS REQUIRED Core Xml Gui)
@ -53,18 +55,13 @@ if (CEE_USE_QT5)
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() else()
# Copy Qt Dlls
if (MSVC) if (MSVC)
set (QTLIBLIST QtCore QtXml) set (QTLIBLIST QtCore QtXml)
foreach (qtlib ${QTLIBLIST}) foreach (qtlib ${QTLIBLIST})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
# Debug COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,${qtlib}d4.dll,${qtlib}4.dll> $<TARGET_FILE_DIR:${PROJECT_NAME}>
execute_process(COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}d4.dll ${CMAKE_BINARY_DIR}/Debug/${qtlib}d4.dll) )
# Release
execute_process(COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}4.dll ${CMAKE_BINARY_DIR}/Release/${qtlib}4.dll)
endforeach( qtlib ) endforeach( qtlib )
endif(MSVC) endif(MSVC)
endif(CEE_USE_QT5) endif(CEE_USE_QT5)

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

@ -20,7 +20,9 @@ set( QRC_FILES
textedit.qrc textedit.qrc
) )
option(CEE_USE_QT5 "Use Qt5" OFF) if (NOT DEFINED(CEE_USE_QT5))
option(CEE_USE_QT5 "Use Qt5" OFF)
endif(NOT DEFINED(CEE_USE_QT5))
if (CEE_USE_QT5) if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL) find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL)
@ -66,10 +68,6 @@ add_executable ( ${PROJECT_NAME}
${QRC_FILES_CPP} ${QRC_FILES_CPP}
) )
if (Qt5Core_FOUND)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets)
endif()
set (TAP_LINK_LIBRARIES set (TAP_LINK_LIBRARIES
cafUserInterface cafUserInterface
) )

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

@ -46,8 +46,6 @@ set (MOC_HEADER_FILES
cafPdmUiPickableLineEditor.h cafPdmUiPickableLineEditor.h
) )
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5) 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)

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

@ -9,8 +9,6 @@ set( MOC_HEADER_FILES
cafViewer.h cafViewer.h
) )
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5) 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)

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

@ -6,8 +6,6 @@ project (cafVizExtensions)
find_package( OpenGL ) find_package( OpenGL )
# Qt # Qt
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5) 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)

12
Fwk/CMakeLists.txt
View File

@ -2,13 +2,15 @@ cmake_minimum_required (VERSION 2.8.12)
project (TestCafAndVizFwk) project (TestCafAndVizFwk)
find_package(Qt5 CONFIG COMPONENTS Core) option(CEE_USE_QT5 "Use Qt5" OFF)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Widgets) if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Gui OpenGL Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets)
else() else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGL REQUIRED) find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
include(${QT_USE_FILE}) include(${QT_USE_FILE})
endif(Qt5Core_FOUND) endif(CEE_USE_QT5)
# Libraries # Libraries
add_subdirectory(AppFwk/cafProjectDataModel/cafPdmCore) add_subdirectory(AppFwk/cafProjectDataModel/cafPdmCore)