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

#4448 Clean up CAF Qt5-enabling/detection

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-05-28 10:50:39 +02:00
parent 0544b19afe
commit 10afe4987b
16 changed files with 149 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Fwk/AppFwk/CMakeLists.txt
View File

@ -12,15 +12,12 @@ endif()
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)
find_package(Qt5 COMPONENTS 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)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
endif(CEE_USE_QT5)
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(CMAKE_CXX_FLAGS "-std=c++0x")

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

@ -2,37 +2,27 @@ cmake_minimum_required (VERSION 2.8.12)
project (CommonCode)
# 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)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
# Open GL
find_package( OpenGL )
# Qt
# These headers need to go through Qt's MOC compiler
set( MOC_HEADER_FILES
cafMessagePanel.h
)
if ( NOT CMAKE_AUTOMOC )
if (CEE_USE_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CEE_USE_QT5)
endif()
option(CEE_USE_QT5 "Use Qt5" OFF)
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} )
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}
cafEffectCache.cpp

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

@ -3,29 +3,21 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafAnimControl)
# 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 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
cafAnimationToolBar.h
cafPopupMenuButton.h
)
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
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)

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

@ -1,20 +1,5 @@
cmake_minimum_required (VERSION 2.8.12)
# 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 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)
project (cafCommand)
@ -24,9 +9,16 @@ set (MOC_HEADER_FILES
cafCmdFeatureManager.h
)
# Qt
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
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)

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

@ -6,16 +6,14 @@ project (cafPdmCvf)
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)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CEE_USE_QT5)
add_definitions(-DCVF_USING_CMAKE)

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

@ -6,17 +6,12 @@ project (cafProjectDataModel)
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)
find_package(Qt5 COMPONENTS 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 REQUIRED QtCore QtGui)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
endif(CEE_USE_QT5)
set( PROJECT_FILES
cafFactory.h

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

@ -1,21 +1,16 @@
cmake_minimum_required (VERSION 2.8.12)
project (cafPdmCore)
# 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)
find_package(Qt5 COMPONENTS REQUIRED Core)
set(QT_LIBRARIES Qt5::Core)
else()
find_package(Qt4 COMPONENTS QtCore REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
endif(CEE_USE_QT5)
set( PROJECT_FILES

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

@ -2,25 +2,6 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafPdmUiCore)
# 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 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 (
..
)
# These headers need to go through Qt's MOC compiler
set (MOC_HEADER_FILES
cafPdmUiEditorHandle.h
@ -29,14 +10,25 @@ set (MOC_HEADER_FILES
cafQShortenedLabel.h
)
# Run MOC on the headers
add_definitions(-DCVF_USING_CMAKE)
# Qt
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
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 (
..
)
add_definitions(-DCVF_USING_CMAKE)
set( PROJECT_FILES
cafInternalPdmFieldTypeSpecializations.h

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

@ -6,16 +6,12 @@ project (cafPdmXml)
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)
find_package(Qt5 COMPONENTS REQUIRED Core Xml)
set(QT_LIBRARIES Qt5::Core Qt5::Xml)
else()
find_package(Qt4 COMPONENTS QtCore QtXml REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
endif(CEE_USE_QT5)
include_directories (
..

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

@ -2,13 +2,17 @@ cmake_minimum_required (VERSION 2.8.12)
project ( cafProjectDataModel_UnitTests )
find_package(Qt5Core CONFIG QUIET)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Xml)
# Qt
option(CEE_USE_QT5 "Use Qt5" OFF)
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 QtCore QtXml REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
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))
# VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1
@ -34,10 +38,6 @@ add_executable (${PROJECT_NAME}
gtest/gtest-all.cpp
)
if (Qt5Core_FOUND)
set(QT_LIBRARIES Qt5::Core Qt5::Xml)
endif()
target_link_libraries ( ${PROJECT_NAME}
cafProjectDataModel
${QT_LIBRARIES}
@ -47,7 +47,7 @@ target_link_libraries ( ${PROJECT_NAME}
source_group("" FILES ${PROJECT_FILES})
# Copy Qt Dlls
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}>
@ -57,7 +57,7 @@ if (Qt5Core_FOUND)
else()
# Copy Qt Dlls
if (MSVC)
set (QTLIBLIST QtCore QtGui)
set (QTLIBLIST QtCore QtXml)
foreach (qtlib ${QTLIBLIST})
# Debug
@ -67,4 +67,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)

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

@ -6,18 +6,6 @@ project ( cafTestApplication )
find_package( OpenGL )
# Qt
find_package(Qt5Core CONFIG QUIET)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Widgets)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
option(USE_COMMAND_FRAMEWORK "Use Caf Command Framework" ON)
# Qt MOC
set (MOC_HEADER_FILES
@ -27,25 +15,26 @@ set (MOC_HEADER_FILES
MenuItemProducer.h
)
if ( NOT CMAKE_AUTOMOC )
if (Qt5Core_FOUND)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif()
endif()
# Resource file
set( QRC_FILES
textedit.qrc
)
# Runs RCC on specified files
if (Qt5Core_FOUND)
option(CEE_USE_QT5 "Use Qt5" OFF)
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()
endif(CEE_USE_QT5)
option(USE_COMMAND_FRAMEWORK "Use Caf Command Framework" ON)
if (USE_COMMAND_FRAMEWORK)
include_directories (
@ -100,28 +89,24 @@ target_link_libraries ( ${PROJECT_NAME}
source_group("" FILES ${PROJECT_FILES})
# Copy Qt Dlls
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}>
)
)
endforeach(qtlib)
# Copy Qt Dlls
else()
# Copy Qt Dlls
if (MSVC)
set (QTLIBLIST QtCore QtGui QtOpenGl )
set (QTLIBLIST QtCore QtGui QtOpenGl QtXml)
foreach (qtlib ${QTLIBLIST})
# Debug
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)
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(CEE_USE_QT5)
# cotire
if (COMMAND caf_apply_cotire)

69
Fwk/AppFwk/cafTests/cafTestCvfApplication/CMakeLists.txt
View File

@ -1,46 +1,38 @@
cmake_minimum_required (VERSION 2.8)
# Qt
find_package(Qt5 CONFIG COMPONENTS Core)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui OpenGl Widgets)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
project ( cafTestCvfApplication )
option(USE_COMMAND_FRAMEWORK "Use Caf Command Framework" ON)
# Qt MOC
set ( MOC_HEADER_FILES
MainWindow.h
WidgetLayoutTest.h
)
if (Qt5Core_FOUND)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif()
# Resource file
set( QRC_FILES
textedit.qrc
)
# Runs RCC on specified files
if (Qt5Core_FOUND)
qt5_add_resources( QRC_FILES_CPP
${QRC_FILES}
)
# Qt
option(CEE_USE_QT5 "Use Qt5" OFF)
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()
qt4_add_resources( QRC_FILES_CPP
${QRC_FILES}
)
endif()
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)
include_directories (
${LibCore_SOURCE_DIR}
@ -86,11 +78,6 @@ add_executable ( ${PROJECT_NAME}
${QRC_FILES_CPP}
)
if (Qt5Core_FOUND)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGl Qt5::Widgets)
endif()
set (TAP_LINK_LIBRARIES
cafUserInterface
cafPdmXml
@ -112,25 +99,21 @@ target_link_libraries ( ${PROJECT_NAME}
source_group("" FILES ${PROJECT_FILES})
# Copy Qt Dlls
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}>
)
)
endforeach(qtlib)
# Copy Qt Dlls
else()
# Copy Qt Dlls
if (MSVC)
set (QTLIBLIST QtCore QtGui QtOpenGl )
set (QTLIBLIST QtCore QtGui QtOpenGl)
foreach (qtlib ${QTLIBLIST})
# Debug
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)
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(CEE_USE_QT5)

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

@ -1,27 +1,12 @@
cmake_minimum_required (VERSION 2.8.12)
project (cafUserInterface)
if (MSVC)
# Define this one to tell windows.h to not define min() and max() as macros
add_definitions(-DNOMINMAX)
endif (MSVC)
project (cafUserInterface)
# 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 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)
# These headers need to go through Qt's MOC compiler
set (MOC_HEADER_FILES
cafPdmUiCheckBoxDelegate.h
@ -61,14 +46,17 @@ set (MOC_HEADER_FILES
cafPdmUiPickableLineEditor.h
)
if ( NOT CMAKE_AUTOMOC )
if (CEE_USE_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CEE_USE_QT5)
endif()
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
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

24
Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt
View File

@ -1,20 +1,22 @@
cmake_minimum_required (VERSION 2.8.12)
find_package(Qt5 CONFIG COMPONENTS Core)
if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
project ( cafUserInterface_UnitTests )
# Qt
option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS 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(CEE_USE_QT5)
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
set( PROJECT_FILES
cafUserInterface_UnitTests.cpp
@ -32,10 +34,6 @@ add_executable (${PROJECT_NAME}
source_group("" FILES ${PROJECT_FILES})
if (Qt5Core_FOUND)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
endif()
target_link_libraries ( ${PROJECT_NAME}
cafUserInterface
${QT_LIBRARIES}

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

@ -3,33 +3,23 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafViewer)
# 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 Widgets OpenGL)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
# These headers need to go through Qt's MOC compiler
set( MOC_HEADER_FILES
cafViewer.h
)
if ( NOT CMAKE_AUTOMOC )
if (CEE_USE_QT5)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
else()
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CEE_USE_QT5)
endif()
option(CEE_USE_QT5 "Use Qt5" OFF)
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} )
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}
cafCadNavigation.cpp

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

@ -9,16 +9,14 @@ find_package( OpenGL )
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)
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} )
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND)
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
endif(CEE_USE_QT5)
add_library( ${PROJECT_NAME}
cafDisplayCoordTransform.cpp