Skip to content
Permalink
Browse files

openvdb: Disable broken glfw dependency detection

  • Loading branch information
cjones051073 committed May 16, 2020
1 parent a351d7e commit 66bc9b0d48a6adda063c3ec3557046beb47639e9
Showing with 20 additions and 0 deletions.
  1. +7 −0 graphics/openvdb/Portfile
  2. +13 −0 graphics/openvdb/files/patch-find-glfw-deps.diff
@@ -31,6 +31,13 @@ compiler.blacklist-append *gcc* {clang < 920} {macports-clang-3.[0-9]} {macports
# Find correct Python version
patchfiles-append patch-python_version.diff

# OpenVDB does not currently correctly detect GLFW dependencies and falls
# back to (incorrectly) requesting X11 dependencies. :-
# CMake Warning at cmake/OpenVDBGLFW3Setup.cmake:128 (message):
# GLFW does not have the INTERFACE_LINK_LIBRARIES property set, so
# hard-coding to expect a dependency on X11.
patchfiles-append patch-find-glfw-deps.diff

configure.env-append BLOSC_ROOT=${prefix} \
TBB_ROOT=${prefix} \
GLFW3_ROOT=${prefix} \
@@ -0,0 +1,13 @@
diff --git a/cmake/OpenVDBGLFW3Setup.cmake b/cmake/OpenVDBGLFW3Setup.cmake
index 84e54d9..669c600 100644
--- cmake/OpenVDBGLFW3Setup.cmake.orig
+++ cmake/OpenVDBGLFW3Setup.cmake
@@ -118,7 +118,7 @@ unset(glfw3_FIND_VERSION)
# GLFW 3.1 does not export INTERFACE_LINK_LIBRARIES so detect this
# and set the property ourselves
# @todo investigate how this might apply for Mac OSX
-if(UNIX)
+if(UNIX AND NOT APPLE)
get_property(glfw3_HAS_INTERFACE_LINK_LIBRARIES
TARGET glfw
PROPERTY INTERFACE_LINK_LIBRARIES

0 comments on commit 66bc9b0

Please sign in to comment.
You can’t perform that action at this time.