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

Removed old Qt4 stuff from CMake files

Browse Source
This commit is contained in:
Jan Möbius
2018-12-14 09:40:56 +01:00
parent ede0b5a487
commit 70b43922bc
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,27 +41,17 @@ if ( BUILD_APPS )
find_package (OpenGL) find_package (OpenGL)
find_package (GLUT) 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 # For the apps, we need qt and opengl to build them
if (NOT QT5_FOUND AND NOT FORCE_QT4) if (NOT QT5_FOUND)
acg_qt5 () acg_qt5 ()
endif() endif()
if (NOT QT5_FOUND AND NOT QT4_FOUND)
find_package (Qt4 COMPONENTS QtCore QtGui )
set (QT_USE_QTOPENGL 1)
include (${QT_USE_FILE})
endif ()
if ("${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles") if ("${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles")
message(WARNING "GUI Apps are not build with mingw. (TODO)") message(WARNING "GUI Apps are not build with mingw. (TODO)")
endif() endif()
# check for OpenGL and GLUT as our required dependencies # check for OpenGL and GLUT as our required dependencies
if ((QT5_FOUND OR QT4_FOUND) AND OPENGL_FOUND AND GLUT_FOUND AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) if (( QT5_FOUND ) AND OPENGL_FOUND AND GLUT_FOUND AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
add_subdirectory (Decimating/DecimaterGui) add_subdirectory (Decimating/DecimaterGui)
add_subdirectory (QtViewer) add_subdirectory (QtViewer)
@@ -99,8 +89,8 @@ if ( BUILD_APPS )
else () # QT ,Opengl or glut not found else () # QT ,Opengl or glut not found
if (NOT QT4_FOUND AND NOT QT5_FOUND) if (NOT QT5_FOUND)
message ("QT 4 and 5 not found! Skipping some apps.") message ("QT5 not found! Skipping some apps.")
endif () endif ()
if (NOT OPENGL_FOUND) if (NOT OPENGL_FOUND)