Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Maik Froechtenicht
glew
Commits
a9e50908
Commit
a9e50908
authored
Apr 23, 2017
by
Nigel Stewart
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
For cmake build, skip X11 check for Windows and Apple OSX
parent
d7747940
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
build/cmake/CMakeLists.txt
build/cmake/CMakeLists.txt
+8
-5
No files found.
build/cmake/CMakeLists.txt
View file @
a9e50908
...
...
@@ -37,6 +37,14 @@ set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set
(
CMAKE_LIBRARY_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
/lib
)
set
(
CMAKE_RUNTIME_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
/bin
)
find_package
(
OpenGL REQUIRED
)
# X11 required when builing visualinfo and glewinfo,
# but not for Windows or Apple OSX platforms
if
(
BUILD_UTILS AND NOT WIN32 AND NOT APPLE
)
find_package
(
X11
)
endif
()
if
(
WIN32
)
set
(
GLEW_LIB_NAME glew32
)
else
()
...
...
@@ -44,11 +52,6 @@ else ()
set
(
DLL_PREFIX lib
)
endif
()
find_package
(
OpenGL REQUIRED
)
#X11 is only required when builing utils/
if
(
BUILD_UTILS
)
find_package
(
X11
)
endif
()
set
(
GLEW_LIBRARIES
${
OPENGL_LIBRARIES
}
)
add_definitions
(
-DGLEW_NO_GLU
)
...
...
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