Commit 5570ba65 authored by Sankhesh Jhaveri's avatar Sankhesh Jhaveri 💬 Committed by Kitware Robot
Browse files

Merge topic 'glut_test_compile_failure'

0a5f68fc Fix test compile error due to wrong function signature
615f9c49

 Fix GLUT test compile failure
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1244
parents d684842a 0a5f68fc
Pipeline #7871 failed with stage
FIND_PACKAGE(GLUT REQUIRED)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${GLUT_INCLUDE_DIR}
)
FIND_PACKAGE(GLUT REQUIRED)
VTK_ADD_TEST_CXX(${vtk-module}CxxTests tests
TestGLUTRenderWindow.cxx
......@@ -12,4 +14,4 @@ VTK_TEST_CXX_EXECUTABLE(${vtk-module}CxxTests tests)
TARGET_LINK_LIBRARIES(${vtk-module}CxxTests LINK_PRIVATE
vtkRenderingExternal ${OPENGL_LIBRARIES} ${GLUT_LIBRARY})
include(vtkOpenGL)
vtk_opengl_link(${vtk-module}CxxTests)
vtk_opengl_link(${vtk-module}CxxTests)
\ No newline at end of file
......@@ -60,10 +60,10 @@ static int windowId = -1;
static int windowH = 301;
static int windowW = 300;
static void MakeCurrentCallback(vtkObject* caller,
long unsigned int eventId,
void * clientData,
void * callData)
static void MakeCurrentCallback(vtkObject* vtkNotUsed(caller),
long unsigned int vtkNotUsed(eventId),
void * vtkNotUsed(clientData),
void * vtkNotUsed(callData))
{
if (initialized)
{
......@@ -168,7 +168,7 @@ void onexit(void)
} // end anon namespace
/* Main function: GLUT runs as a console application starting at main() */
int TestGLUTRenderWindow(int argc, char** argv)
int TestGLUTRenderWindow(int argc, char* argv[])
{
NumArgs = argc;
ArgV = argv;
......
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