diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-02-24 15:24:56 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-02-24 15:24:56 +0000 |
| commit | d3acadf7d63e178a39ededaa0bdea75eab92f3cd (patch) | |
| tree | b2b96b9ecce07e0281ce25341558088e09abedbe | |
| parent | 86302fe1d616cf706b818f87c33143099d58a0ed (diff) | |
| download | pkgsrc-d3acadf7d63e178a39ededaa0bdea75eab92f3cd.tar.gz | |
Remove overrides for OPENAL_INCLUDE_DIR and OPENGL_INCLUDE_DIR. These
conflict with pkgsrc versions of those packages, and do not interact well
with the wrappers anyway as cmake will perform simple file-based tests for
headers but the compiler will be unable to find them.
| -rw-r--r-- | mk/configure/cmake.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mk/configure/cmake.mk b/mk/configure/cmake.mk index 34adaa2ca12..e668bb3a3b6 100644 --- a/mk/configure/cmake.mk +++ b/mk/configure/cmake.mk @@ -1,4 +1,4 @@ -# $NetBSD: cmake.mk,v 1.12 2014/09/06 01:50:38 obache Exp $ +# $NetBSD: cmake.mk,v 1.13 2016/02/24 15:24:56 jperkin Exp $ # # This file handles packages that use CMake as their primary build # system. For more information about CMake, see http://www.cmake.org/. @@ -39,8 +39,6 @@ CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=TRUE .else CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=FALSE CMAKE_ARGS+= -DCMAKE_INSTALL_NAME_DIR:PATH=${PREFIX}/lib -CMAKE_ARGS+= -DOPENAL_INCLUDE_DIR:PATH=/System/Library/Frameworks/OpenAL.framework/Headers -CMAKE_ARGS+= -DOPENGL_INCLUDE_DIR:PATH=/System/Library/Frameworks/OpenGL.framework/Headers .endif .if defined(CMAKE_USE_GNU_INSTALL_DIRS) && empty(CMAKE_USE_GNU_INSTALL_DIRS:M[nN][oO]) CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR:PATH=lib |