Removed glut from OpenMesh.

This commit is contained in:
Jan Möbius
2019-02-06 10:19:08 +01:00
parent fa92a28749
commit 365c4d2874
7 changed files with 2 additions and 155 deletions

View File

@@ -39,7 +39,6 @@ if ( BUILD_APPS )
# find needed packages for gui applications
find_package (OpenGL)
find_package (GLUT)
# For the apps, we need qt and opengl to build them
if (NOT QT5_FOUND)
@@ -50,8 +49,8 @@ if ( BUILD_APPS )
message(WARNING "GUI Apps are not build with mingw. (TODO)")
endif()
# check for OpenGL and GLUT as our required dependencies
if (( QT5_FOUND ) AND OPENGL_FOUND AND GLUT_FOUND AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
# check for OpenGL as our required dependencies
if (( QT5_FOUND ) AND OPENGL_FOUND AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
add_subdirectory (Decimating/DecimaterGui)
add_subdirectory (QtViewer)
@@ -97,10 +96,6 @@ if ( BUILD_APPS )
message ("OpengGL not found! Skipping some apps.")
endif ()
if (NOT GLUT_FOUND)
message ("GLUT not found! Skipping some apps.")
endif ()
endif ()
endif() # Project is OpenMesh standalone

View File

@@ -3,7 +3,6 @@ include (ACGCommon)
include_directories (
../../../..
${CMAKE_CURRENT_SOURCE_DIR}
${GLUT_INCLUDE_DIR}
)
# source code directories
@@ -36,6 +35,5 @@ target_link_libraries (DecimaterGui
OpenMeshTools
Qt5::OpenGL
${OPENGL_LIBRARIES}
${GLUT_LIBRARIES}
)

View File

@@ -3,7 +3,6 @@ include (ACGCommon)
include_directories (
../../..
${CMAKE_CURRENT_SOURCE_DIR}
${GLUT_INCLUDE_DIR}
)
@@ -31,6 +30,5 @@ target_link_libraries ( ProgViewer
OpenMeshTools
Qt5::OpenGL
${OPENGL_LIBRARIES}
${GLUT_LIBRARIES}
)

View File

@@ -3,7 +3,6 @@ include (ACGCommon)
include_directories (
../../..
${CMAKE_CURRENT_SOURCE_DIR}
${GLUT_INCLUDE_DIR}
)
# source code directories
@@ -29,6 +28,5 @@ target_link_libraries (QtViewer
OpenMeshTools
Qt5::OpenGL
${OPENGL_LIBRARIES}
${GLUT_LIBRARIES}
)

View File

@@ -3,7 +3,6 @@ include (ACGCommon)
include_directories (
../../../..
${CMAKE_CURRENT_SOURCE_DIR}
${GLUT_INCLUDE_DIR}
)
# source code directories
@@ -36,6 +35,5 @@ target_link_libraries (SubdividerGui
OpenMeshTools
Qt5::OpenGL
${OPENGL_LIBRARIES}
${GLUT_LIBRARIES}
)

View File

@@ -3,7 +3,6 @@ include (ACGCommon)
include_directories (
../../../..
${CMAKE_CURRENT_SOURCE_DIR}
${GLUT_INCLUDE_DIR}
)
# collect all header and source files
@@ -30,5 +29,4 @@ target_link_libraries (Synthesizer
OpenMeshTools
Qt5::OpenGL
${OPENGL_LIBRARIES}
${GLUT_LIBRARIES}
)