Commit 1410cbd0 authored by Martin Schultz's avatar Martin Schultz

Merge commit '0e1d8f67' into qopengl

merged master into qopengl to one of the commits close to the submodule
refactoring.

adapted commandline parser option for core profile.
adapted polyline objecttype for compilation (bad cast syntax)

todo:
* extract changes for QOpenGLWidgets from this branch
* build with experimental qt 5.9 to see if QPainter problem is resolved
parents b0b144b1 0e1d8f67
Pipeline #4957 failed with stage
in 53 minutes and 25 seconds

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

gcc-c++11-Qt5:
script: "CI/ci-linux.sh gcc C++11 QT5"
variables:
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5"
script: "OpenFlipper/CI/ci-linux.sh"
tags:
- Linux
clang-c++11-Qt5:
script: "CI/ci-linux.sh clang C++11 QT5"
variables:
COMPILER: "clang"
LANGUAGE: "C++11"
QTVERSION: "QT5"
script: "OpenFlipper/CI/ci-linux.sh"
tags:
- Linux
- MultiThreads
cppcheck:
script: "CI/ci-cppcheck.sh"
script: "OpenFlipper/CI/ci-cppcheck.sh"
tags:
- Linux
- MultiThreads
......@@ -19,7 +27,7 @@ cppcheck:
- cppcheck.log
VS2015-Qt-5.6.0-x64:
script: "CI\\VS2015-Qt-5.6.0-x64.bat"
script: "OpenFlipper\\CI\\VS2015-Qt-5.6.0-x64.bat"
tags:
- VS2015
- Qt56
......@@ -28,7 +36,7 @@ VS2015-Qt-5.6.0-x64:
- rel/*.exe
VS2015-Qt-5.6.0-x32:
script: "CI\\VS2015-Qt-5.6.0-x32.bat"
script: "OpenFlipper\\CI\\VS2015-Qt-5.6.0-x32.bat"
tags:
- VS2015
- Qt56
......@@ -38,7 +46,7 @@ VS2015-Qt-5.6.0-x32:
VS2013-Qt-5.5.1-x64:
script: "CI\\VS2013-Qt-5.5.1-x64.bat"
script: "OpenFlipper\\CI\\VS2013-Qt-5.5.1-x64.bat"
tags:
- VS2013
- Qt551
......@@ -47,12 +55,24 @@ VS2013-Qt-5.5.1-x64:
- rel/*.exe
Mac-Cpp11:
script: "CI/ci-mac.sh"
cache:
paths:
- build-release/
script: "OpenFlipper/CI/ci-mac.sh"
tags:
- Apple
artifacts:
paths:
- build-release/*.dmg
Doc-publish:
only:
- master
script: "OpenFlipper/CI/ci-doc.sh"
tags:
- Linux
artifacts:
paths:
- build-release/Doxygen-warning.log
- build-release/Doxygen-error.log
[submodule "libs_required/OpenMesh"]
path = libs_required/OpenMesh
path = OpenFlipper/libs_required/OpenMesh
url = https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh.git
branch = master
[submodule "libs_required/OpenVolumeMesh"]
path = libs_required/OpenVolumeMesh
path = Type-OpenVolumeMesh/libs/OpenVolumeMesh
url = https://www.graphics.rwth-aachen.de:9000/OpenVolumeMesh/OpenVolumeMesh.git
branch = master
include (ACGCommon)
acg_get_version ()
# Disable Library installation when not building ACG on its own but as part of another project!
if ( ${PROJECT_NAME} MATCHES "OpenFlipper")
set(ACG_NO_LIBRARY_INSTALL true)
endif()
acg_qt5 ()
if (NOT QT5_FOUND)
message(FATAL ERROR "Qt5 not found")
endif ()
acg_openmp ()
# check for OpenGL, GLEW and GLUT as our required dependencies
find_package (OpenGL)
if (NOT OPENGL_FOUND)
message (FATAL_ERROR "OpengGL not found!")
endif ()
find_package (GLEW)
if (NOT GLEW_FOUND)
message (FATAL_ERROR "GLEW not found!")
endif ()
find_package (GLUT)
if (NOT GLUT_FOUND)
message (FATAL_ERROR "GLUT not found!")
endif ()
find_package (OpenMesh)
if (NOT OPENMESH_FOUND)
message (FATAL_ERROR "OpenMesh not found!")
endif ()
set(INCLUDE_DIRS ${OPENMESH_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/ShaderUtils
${CMAKE_CURRENT_BINARY_DIR}
${OPENGL_INCLUDE_DIR}
${GLEW_INCLUDE_DIR}
${GLUT_INCLUDE_DIR} )
set(ADDITIONAL_LINK_LIBRARIES "" )
set(ADDITIONAL_BUILD_DIRS "" )
find_package (QJson)
if (QJSON_FOUND)
LIST(APPEND INCLUDE_DIRS ${QJSON_INCLUDE_DIR})
LIST(APPEND ADDITIONAL_LINK_LIBRARIES ${QJSON_LIBRARY})
endif ()
# use Qwt6 for QT5
if (QT5_FOUND)
find_package(Qwt6)
if (QWT6_FOUND)
set(INCLUDE_DIRS ${INCLUDE_DIRS} ${QWT6_INCLUDE_DIRS} )
set(ADDITIONAL_LINK_LIBRARIES ${ADDITIONAL_LINK_LIBRARIES} ${QWT6_LIBRARIES})
set(ADDITIONAL_BUILD_DIRS "QwtWidgets" )
endif()
endif()
include_directories (
..
${INCLUDE_DIRS}
)
link_directories (
${GLEW_LIBRARY_DIR}
${GLUT_LIBRARY_DIR}
)
#===================================================================
# ACG Library setup
#===================================================================
# source code directories
set (directories
.
Geometry
Config
Geometry/Types
Geometry/bsp
GL
Glut
IO
Math
QtWidgets
Scenegraph
QtScenegraph
ShaderUtils
Utils
${ADDITIONAL_BUILD_DIRS}
)
# generate dllexport macros on windows
if (WIN32)
add_definitions(-DACGDLL)
endif ()
# collect all header,source and ui files
acg_append_files (headers "*.hh" ${directories})
acg_append_files (sources "*.cc" ${directories})
acg_append_files (ui "*.ui" ${directories})
acg_append_files (qrc "*.qrc" ${directories} .)
# remove template cc files from source file list
acg_drop_templates (sources)
# genereate uic and moc targets
if (QT5_FOUND)
acg_qt5_autouic (uic_targets ${ui})
acg_qt5_automoc (moc_targets ${headers})
acg_qt5_autoqrc (qrc_targets ${qrc})
endif()
if (QT5_FOUND)
acg_add_library (ACG SHARED ${uic_targets} ${sources} ${headers} ${moc_targets} ${qrc_targets})
endif()
if ( NOT WIN32 )
set_target_properties (ACG PROPERTIES VERSION ${ACG_VERSION_MAJOR}.${ACG_VERSION_MINOR}
SOVERSION ${ACG_VERSION_MAJOR}.${ACG_VERSION_MINOR})
endif()
if (NOT ACG_PROJECT_MACOS_BUNDLE OR NOT APPLE)
install (TARGETS ACG DESTINATION ${ACG_PROJECT_LIBDIR})
endif ()
# display results
acg_print_configure_header (ACG "ACG")
RECURSE_GROUPS( ${CMAKE_CURRENT_SOURCE_DIR} )