Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt5 apps support

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1103 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Matthias Möller
2014-07-17 12:57:04 +00:00
parent 71fd144089
commit 3ff415a5c2
9 changed files with 248 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/OpenMesh/Apps/CMakeLists.txt
View File

@@ -41,8 +41,14 @@ if ( BUILD_APPS )
find_package (OpenGL)
find_package (GLUT)
# try to use QT5 if possible otherwise stick to QT4
set (FORCE_QT4 OFF CACHE BOOL "Use Qt4 even if Qt5 was found")
# For the apps, we need qt and opengl to build them
if (NOT QT4_FOUND)
if (NOT QT5_FOUND AND NOT FORCE_QT4)
acg_qt5 ()
endif()
if (NOT QT5_FOUND AND NOT QT4_FOUND)
find_package (Qt4 COMPONENTS QtCore QtGui )
set (QT_USE_QTOPENGL 1)
@@ -55,7 +61,8 @@ if ( BUILD_APPS )
endif()
# check for OpenGL and GLUT as our required dependencies
if (QT4_FOUND AND OPENGL_FOUND AND GLUT_FOUND AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
if ((QT5_FOUND OR QT4_FOUND) AND OPENGL_FOUND AND GLUT_FOUND AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
add_subdirectory (Decimating/DecimaterGui)
add_subdirectory (QtViewer)
add_subdirectory (Subdivider/SubdividerGui)