Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Better ptex glew find #808

Merged
merged 3 commits into from
Apr 25, 2019
Merged

Better ptex glew find #808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4175bad
Find GLEW library in GLEW_LOCATION/lib64
Mar 20, 2019
56db053
Find PTex in PTEX_LOCATION/include/Ptex. Useful to build against Maya…
Mar 20, 2019
732c913
Remove duplicated Ptex include paths
Apr 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmake/modules/FindGLEW.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ if (${CMAKE_HOST_UNIX})
GLEW glew
HINTS
"${GLEW_LOCATION}/lib"
"${GLEW_LOCATION}/lib64"
"$ENV{GLEW_LOCATION}/lib"
"$ENV{GLEW_LOCATION}/lib64"
PATHS
"${GLEW_LOCATION}/lib"
/usr/lib64
Expand Down
4 changes: 3 additions & 1 deletion cmake/modules/FindPTex.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,10 @@ else ()
Ptexture.h
HINTS
"${PTEX_LOCATION}/include"
"${PTEX_LOCATION}/include/Ptex"
"${PTEX_LOCATION}/include/wdas"
"$ENV{PTEX_LOCATION}/include"
"$ENV{PTEX_LOCATION}/include/"
"$ENV{PTEX_LOCATION}/include/Ptex"
"$ENV{PTEX_LOCATION}/include/wdas"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like "${PTEX_LOCATION}/include/wdas" and the ENV version are already included above on lines 67 and 69.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well spotted, thanks. Fixed in another commit.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's great, thanks so much, @charlesfleche

PATHS
/usr/include
Expand Down