diff --git a/cmake/FindGLUT.cmake b/cmake/FindGLUT.cmake deleted file mode 100644 index 5546069c..00000000 --- a/cmake/FindGLUT.cmake +++ /dev/null @@ -1,138 +0,0 @@ -# - try to find glut library and include files -# GLUT_INCLUDE_DIR, where to find GL/glut.h, etc. -# GLUT_LIBRARIES, the libraries to link against -# GLUT_FOUND, If false, do not try to use GLUT. -# Also defined, but not for general use are: -# GLUT_glut_LIBRARY = the full path to the glut library. -# GLUT_Xmu_LIBRARY = the full path to the Xmu library. -# GLUT_Xi_LIBRARY = the full path to the Xi Library. - -#============================================================================= -# Copyright 2001-2009 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distributed this file outside of CMake, substitute the full -# License text for the above reference.) - -IF (WIN32) - - # Check if the base path is set - if ( NOT CMAKE_WINDOWS_LIBS_DIR ) - # This is the base directory for windows library search used in the finders we shipp. - set(CMAKE_WINDOWS_LIBS_DIR "c:\libs" CACHE STRING "Default Library search dir on windows." ) - endif() - - if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) - SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") - elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" ) - SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x32/") - elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" ) - SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x64/") - elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" ) - SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x32/") - elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*Win64" ) - SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x64/") - elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" ) - SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x32/") - elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*Win64" ) - SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2017/x64/") - elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*" ) - SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2017/x32/") - endif() - - - FIND_PATH( GLUT_INCLUDE_DIR NAMES GL/glut.h - PATHS ${GLUT_ROOT_PATH}/include - "${CMAKE_WINDOWS_LIBS_DIR}/glut-3.7/include" - "${VS_SEARCH_PATH}/freeglut-3.0.0/include" - "${VS_SEARCH_PATH}/freeglut-2.8.1/include" ) - - FIND_LIBRARY( GLUT_release_LIBRARY NAMES glut32 glut freeglut - PATHS - ${OPENGL_LIBRARY_DIR} - ${GLUT_ROOT_PATH}/Release - "${CMAKE_WINDOWS_LIBS_DIR}/glut-3.7/lib" - "${VS_SEARCH_PATH}/freeglut-3.0.0/lib" - "${VS_SEARCH_PATH}/freeglut-2.8.1/lib" - ) - GET_FILENAME_COMPONENT( GLUT_LIBRARY_DIR ${GLUT_release_LIBRARY} PATH ) - - FIND_LIBRARY( GLUT_debug_LIBRARY NAMES glut32d glutd freeglutd - PATHS - ${OPENGL_LIBRARY_DIR} - ${GLUT_ROOT_PATH}/Release - "${CMAKE_WINDOWS_LIBS_DIR}/glut-3.7/lib" - "${VS_SEARCH_PATH}/freeglut-3.0.0/lib" - "${VS_SEARCH_PATH}/freeglut-2.8.1/lib" - ) - - set(GLUT_glut_LIBRARY optimized ${GLUT_release_LIBRARY} debug ${GLUT_debug_LIBRARY} CACHE STRING "Path to the glut libraries") - -ELSE (WIN32) - - IF (APPLE) - # These values for Apple could probably do with improvement. - FIND_PATH( GLUT_INCLUDE_DIR glut.h - /System/Library/Frameworks/GLUT.framework/Versions/A/Headers - ${OPENGL_LIBRARY_DIR} - ) - SET(GLUT_glut_LIBRARY "-framework GLUT" CACHE STRING "GLUT library for OSX") - SET(GLUT_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX") - ELSE (APPLE) - - FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h - /usr/include/GL - /usr/openwin/share/include - /usr/openwin/include - /opt/graphics/OpenGL/include - /opt/graphics/OpenGL/contrib/libglut - ) - - FIND_LIBRARY( GLUT_glut_LIBRARY glut - /usr/openwin/lib - ) - - FIND_LIBRARY( GLUT_Xi_LIBRARY Xi - /usr/openwin/lib - ) - - FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu - /usr/openwin/lib - ) - - ENDIF (APPLE) - -ENDIF (WIN32) - -SET( GLUT_FOUND "NO" ) -IF(GLUT_INCLUDE_DIR) - IF(GLUT_glut_LIBRARY) - # Is -lXi and -lXmu required on all platforms that have it? - # If not, we need some way to figure out what platform we are on. - SET( GLUT_LIBRARIES - ${GLUT_glut_LIBRARY} - ${GLUT_Xmu_LIBRARY} - ${GLUT_Xi_LIBRARY} - ${GLUT_cocoa_LIBRARY} - ) - SET( GLUT_FOUND "YES" ) - - #The following deprecated settings are for backwards compatibility with CMake1.4 - SET (GLUT_LIBRARY ${GLUT_LIBRARIES}) - SET (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR}) - - ENDIF(GLUT_glut_LIBRARY) -ENDIF(GLUT_INCLUDE_DIR) - -MARK_AS_ADVANCED( - GLUT_INCLUDE_DIR - GLUT_glut_LIBRARY - GLUT_Xmu_LIBRARY - GLUT_Xi_LIBRARY - ) diff --git a/src/OpenMesh/Apps/CMakeLists.txt b/src/OpenMesh/Apps/CMakeLists.txt index 0b52af08..8c775051 100644 --- a/src/OpenMesh/Apps/CMakeLists.txt +++ b/src/OpenMesh/Apps/CMakeLists.txt @@ -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 diff --git a/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt b/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt index fa9f6f14..9c978e32 100644 --- a/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt +++ b/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt @@ -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} ) diff --git a/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt b/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt index e0cc7053..d3e4abb9 100644 --- a/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt +++ b/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt @@ -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} ) diff --git a/src/OpenMesh/Apps/QtViewer/CMakeLists.txt b/src/OpenMesh/Apps/QtViewer/CMakeLists.txt index 0409d308..65fd94eb 100644 --- a/src/OpenMesh/Apps/QtViewer/CMakeLists.txt +++ b/src/OpenMesh/Apps/QtViewer/CMakeLists.txt @@ -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} ) diff --git a/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt b/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt index 62d61541..32fdbf44 100644 --- a/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt +++ b/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt @@ -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} ) diff --git a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt index 22b1ceec..d5b02d7f 100644 --- a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt +++ b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt @@ -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} )