Commit 46463e29 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'cmake-library'

parents df5066d7 c635b0e7
Pipeline #16419 passed with stages
in 52 minutes and 6 seconds
......@@ -62,7 +62,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
endif()
# add our macro directory to cmake search path
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/OpenFlipper/cmake)
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/OpenFlipper/cmake ${CMAKE_SOURCE_DIR}/OpenFlipper/cmake-library/finders ${CMAKE_SOURCE_DIR}/OpenFlipper/cmake-library/VCI )
# Enable automoc, autouic and auto rcc
set(CMAKE_AUTOMOC ON)
......@@ -106,9 +106,28 @@ endif()
# ========================================================================
# Qt setup
include(ACGQt)
include(VCIQt)
set(QT5_REQUIRED_PACKAGES
Qt5Core
Qt5Widgets
Qt5Gui
Qt5OpenGL
Qt5Network
Qt5Sql
Qt5Script
Qt5ScriptTools
Qt5Xml
Qt5XmlPatterns
Qt5Help
Qt5UiTools
Qt5Svg
Qt5PrintSupport
Qt5Concurrent
Qt5Quick
)
acg_qt5 ()
vci_qt5 ()
if (NOT QT5_FOUND)
message(FATAL_ERROR "Could not find any QT Version. Please specify QT5_INSTALL_PATH (path to bin and include dir) to build with QT5. Note that this error is also shown if not all required qt modules were found, e.g. Qt5Script.")
......@@ -143,10 +162,10 @@ endif()
# ========================================================================
# include our cmake files
include (ACGCommon)
include (VCICommon)
include (MSVCMacros)
acg_get_version (OpenFlipper)
vci_get_version (OpenFlipper)
# ========================================================================
# Branding
......@@ -203,9 +222,9 @@ add_definitions(-DPRODUCT_NAME=${OPENFLIPPER_PRODUCT_NAME})
# ========================================================================
include (package)
include (ACGOutput)
include (VCIOutput)
acg_openmp ()
vci_openmp ()
# check for OpenGL, GLEW as our required dependencies
find_package (OpenGL)
......@@ -376,16 +395,16 @@ foreach (DATATYPE_DIR ${_data_types})
endforeach()
# info header for Available data types
acg_color_message ("\n${_escape}[40;37m************************************************************${_escape}[0m")
acg_color_message ("${_escape}[40;37m* Available OpenFlipper Types: *${_escape}[0m")
acg_color_message ("${_escape}[40;37m************************************************************${_escape}[0m")
acg_color_message (" ")
vci_color_message ("\n${_escape}[40;37m************************************************************${_escape}[0m")
vci_color_message ("${_escape}[40;37m* Available OpenFlipper Types: *${_escape}[0m")
vci_color_message ("${_escape}[40;37m************************************************************${_escape}[0m")
vci_color_message (" ")
foreach (DATATYPE ${TYPE_LIST})
acg_color_message ("${DATATYPE}")
vci_color_message ("${DATATYPE}")
endforeach()
acg_color_message (" ")
vci_color_message (" ")
# ========================================================================
# Tests
......@@ -397,8 +416,8 @@ add_subdirectory (OpenFlipper/tests)
# ========================================================================
# Create dirs to make doxygen happy
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_DATADIR}/Doc )
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_DATADIR}/Help )
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${VCI_PROJECT_DATADIR}/Doc )
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${VCI_PROJECT_DATADIR}/Help )
# Add the documentation targets
add_subdirectory (OpenFlipper/Documentation/DeveloperTarget)
......@@ -439,10 +458,10 @@ endif()
# ========================================================================
# start with an empty plugin list
acg_set (OPENFLIPPER_PLUGINS "")
acg_set (OPENFLIPPER_STATIC_PLUGINS "")
acg_set (OPENFLIPPER_STATIC_PLUGIN_FILES "")
acg_set (OPENFLIPPER_STATIC_PLUGIN_NAMES "")
vci_set (OPENFLIPPER_PLUGINS "")
vci_set (OPENFLIPPER_STATIC_PLUGINS "")
vci_set (OPENFLIPPER_STATIC_PLUGIN_FILES "")
vci_set (OPENFLIPPER_STATIC_PLUGIN_NAMES "")
foreach (package ${PREFOUND_PACKAGES})
find_package(${package})
......@@ -551,6 +570,6 @@ endif()
# ========================================================================
# display results
acg_print_configure_header (OPENFLIPPER "OpenFlipper")
vci_print_configure_header (OPENFLIPPER "OpenFlipper")
of_print_plugin_stats ()
acg_print_configure_footer ()
vci_print_configure_footer ()
Subproject commit d7b9a70e85f3fd028168ee15d4c98c97e1140f45
Subproject commit fd337d0ff88b1cfc4f533c62de6dcff23089a7b1
Subproject commit 273b2c55522f730c4de9fb7753e5afbae4f94c62
Subproject commit 45bfecace33f960038d71fc9d3f050f85eaec16f
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment