Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ParaView
IceT
Commits
7feb9460
Commit
7feb9460
authored
Mar 12, 2018
by
Kenneth Moreland
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'update-find-glfw' into 'master'
Update finding glfw See merge request
icet/icet!8
parents
77c708f9
b40ee3fb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
tests/CMakeLists.txt
tests/CMakeLists.txt
+6
-5
No files found.
tests/CMakeLists.txt
View file @
7feb9460
...
...
@@ -25,14 +25,15 @@ OpenGL contexts. Supported values are GLUT and GLFW."
MESSAGE
(
STATUS
"Cannot find GLUT library. OpenGL tests disabled."
)
ENDIF
(
GLUT_FOUND
)
ELSEIF
(
ICET_OPENGL_WINDOW_LIBRARY STREQUAL GLFW
)
FIND_PACKAGE
(
GLFW
)
IF
(
GLFW_FOUND
)
INCLUDE_DIRECTORIES
(
${
GLFW_INCLUDE_DIR
}
)
FIND_PACKAGE
(
glfw3
)
IF
(
glfw3_FOUND
)
#INCLUDE_DIRECTORIES(${GLFW_INCLUDE_DIR})
SET
(
GLFW_LIBRARY glfw
)
SET
(
ICET_TESTS_USE_OPENGL 1
)
SET
(
ICET_TESTS_USE_GLFW 1
)
ELSE
(
GLFW
_FOUND
)
ELSE
(
glfw3
_FOUND
)
MESSAGE
(
WARNING
"Cannot find GLFW library. OpenGL tests disabled."
)
ENDIF
(
GLFW
_FOUND
)
ENDIF
(
glfw3
_FOUND
)
ELSE
()
MESSAGE
(
SEND_ERROR
"Invalid value for ICET_OPENGL_WINDOW_LIBRARY:
${
ICET_OPENGL_WINDOW_LIBRARY
}
"
)
ENDIF
()
...
...
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