Commit 1b459316 authored by Jan Möbius's avatar Jan Möbius

Removed glut dependency

closes #155
parent 677db2d8
Pipeline #8752 failed with stages
in 7 minutes and 29 seconds
...@@ -67,20 +67,6 @@ set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\%QT_VERSION%\%QT_REV%\%QT_COMPILERPR ...@@ -67,20 +67,6 @@ set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\%QT_VERSION%\%QT_REV%\%QT_COMPILERPR
set LIBPATH_BASE=E:\libs\%COMPILER% set LIBPATH_BASE=E:\libs\%COMPILER%
set CMAKE_WINDOWS_LIBS_DIR=E:\libs set CMAKE_WINDOWS_LIBS_DIR=E:\libs
:: freeglut assume we use freeglut 3.0.0 if not try 2.8.1 if not sanitize the libs folder
if exist %LIBPATH_BASE%\%ARCHITECTURE%\freeglut-3.0.0\include (
set GLUT_INCLUDE_DIR=%LIBPATH_BASE%\%ARCHITECTURE%\freeglut-3.0.0\include
set GLUT_GLUT_LIBRARY=%LIBPATH_BASE%\%ARCHITECTURE%\freeglut-3.0.0\lib\freeglut.lib
) else (
if exist %LIBPATH_BASE%\%ARCHITECTURE%\freeglut-2.8.1\include (
set GLUT_INCLUDE_DIR=%LIBPATH_BASE%\%ARCHITECTURE%\freeglut-2.8.1\include
set GLUT_GLUT_LIBRARY=%LIBPATH_BASE%\%ARCHITECTURE%\freeglut-2.8.1\lib\freeglut.lib
) else (
echo "Error: No suitable version of freeglut found!"
exit
)
)
:: check for gtest version 1.6 or 1.7 use the highest found version :: check for gtest version 1.6 or 1.7 use the highest found version
for /l %%x in (6, 1, 7) do ( for /l %%x in (6, 1, 7) do (
if exist %LIBPATH_BASE%\%ARCHITECTURE%\gtest-1.%%x.0 ( if exist %LIBPATH_BASE%\%ARCHITECTURE%\gtest-1.%%x.0 (
...@@ -118,4 +104,4 @@ for /l %%x in (0, 1, 3) do ( ...@@ -118,4 +104,4 @@ for /l %%x in (0, 1, 3) do (
) )
set CMAKE_CONFIGURATION=%QT_BASE_CONFIG% -DGLUT_INCLUDE_DIR="%GLUT_INCLUDE_DIR%" -DGLUT_glut_LIBRARY="%GLUT_GLUT_LIBRARY%" -DGLEW_INCLUDE_DIR="%GLEW_INCLUDE_DIR%" -DGLEW_LIBRARY="%GLEW_LIBRARY_DIR%" -DQWT6_INCLUDE_DIR=%QWT6_INCLUDE_DIR% -DQWT6_LIBRARY=%QWT6_LIBRARY% -DQWT6_LIBRARY_DIR=%QWT6_LIBRARY_DIR% -DCMAKE_WINDOWS_LIBS_DIR=%CMAKE_WINDOWS_LIBS_DIR% set CMAKE_CONFIGURATION=%QT_BASE_CONFIG% -DGLEW_INCLUDE_DIR="%GLEW_INCLUDE_DIR%" -DGLEW_LIBRARY="%GLEW_LIBRARY_DIR%" -DQWT6_INCLUDE_DIR=%QWT6_INCLUDE_DIR% -DQWT6_LIBRARY=%QWT6_LIBRARY% -DQWT6_LIBRARY_DIR=%QWT6_LIBRARY_DIR% -DCMAKE_WINDOWS_LIBS_DIR=%CMAKE_WINDOWS_LIBS_DIR%
...@@ -202,7 +202,7 @@ include (ACGOutput) ...@@ -202,7 +202,7 @@ include (ACGOutput)
acg_openmp () acg_openmp ()
# check for OpenGL, GLEW and GLUT as our required dependencies # check for OpenGL, GLEW as our required dependencies
find_package (OpenGL) find_package (OpenGL)
if (NOT OPENGL_FOUND) if (NOT OPENGL_FOUND)
message (FATAL_ERROR "OpengGL not found!") message (FATAL_ERROR "OpengGL not found!")
...@@ -213,11 +213,6 @@ if (NOT GLEW_FOUND) ...@@ -213,11 +213,6 @@ if (NOT GLEW_FOUND)
message (FATAL_ERROR "GLEW not found!") message (FATAL_ERROR "GLEW not found!")
endif () endif ()
find_package (GLUT)
if (NOT GLUT_FOUND)
message (FATAL_ERROR "GLUT not found!")
endif ()
# using the internal openmesh delivered by the svn repo (default) or use some external installation # using the internal openmesh delivered by the svn repo (default) or use some external installation
set (USE_INTERNAL_OPENMESH ON CACHE BOOL "Use and build internal version of OpenMesh found in libs_required") set (USE_INTERNAL_OPENMESH ON CACHE BOOL "Use and build internal version of OpenMesh found in libs_required")
......
Subproject commit 7d59191621aca5da35c3415b16d17b51e01c7f7c Subproject commit 0ebf86d33e143afe381acdf38452eb68e7ae4935
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment