Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
cdc925a2
Commit
cdc925a2
authored
May 11, 2018
by
schultz
Browse files
added debug library for freeglut to cmake finder, as it was not found at
all for VS2017.
parent
d43f00bd
Changes
1
Hide whitespace changes
Inline
Side-by-side
cmake/FindGLUT.cmake
View file @
cdc925a2
...
...
@@ -40,6 +40,10 @@ IF (WIN32)
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
()
...
...
@@ -49,7 +53,7 @@ IF (WIN32)
"
${
VS_SEARCH_PATH
}
/freeglut-3.0.0/include"
"
${
VS_SEARCH_PATH
}
/freeglut-2.8.1/include"
)
FIND_LIBRARY
(
GLUT_
glut
_LIBRARY NAMES glut32 glut freeglut
FIND_LIBRARY
(
GLUT_
release
_LIBRARY NAMES glut32 glut freeglut
PATHS
${
OPENGL_LIBRARY_DIR
}
${
GLUT_ROOT_PATH
}
/Release
...
...
@@ -57,8 +61,23 @@ IF (WIN32)
"
${
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
)
set
(
temp
${
GLUT_release_LIBRARY
}
)
MESSAGE
(
" setting temp to
${
temp
}
"
)
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
(
temp2
${
GLUT_debug_LIBRARY
}
)
MESSAGE
(
" setting temp2 to
${
temp2
}
"
)
GET_FILENAME_COMPONENT
(
GLUT_LIBRARY_DIR
${
GLUT_
glut
_LIBRARY
}
PATH
)
set
(
GLUT_glut_LIBRARY optimized
${
GLUT_release_LIBRARY
}
debug
${
GLUT_
debug
_LIBRARY
}
)
ELSE
(
WIN32
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment