aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2018-03-21 22:26:52 +0800
committerDmitry Marakasov <amdmi3@FreeBSD.org>2018-03-21 22:26:52 +0800
commitdc76c285d56e595295b7050621ba3c93f37e2f91 (patch)
tree554d741cbd7f67b07260c62eda452758fc098a0b
parent9bab6d32064ea79bcdf5bcc0c1659d8acdd4f197 (diff)
downloadfreebsd-ports-dc76c285d56e595295b7050621ba3c93f37e2f91.tar.gz
freebsd-ports-dc76c285d56e595295b7050621ba3c93f37e2f91.tar.zst
freebsd-ports-dc76c285d56e595295b7050621ba3c93f37e2f91.zip
- Fix build in presence of older version of osg
PR: 226681 Reported by: pkubaj@anongoth.pl
Notes
Notes: svn path=/head/; revision=465180
-rw-r--r--graphics/osg/files/patch-CMakeLists.txt18
1 files changed, 14 insertions, 4 deletions
diff --git a/graphics/osg/files/patch-CMakeLists.txt b/graphics/osg/files/patch-CMakeLists.txt
index f1df43923067..d495019fab71 100644
--- a/graphics/osg/files/patch-CMakeLists.txt
+++ b/graphics/osg/files/patch-CMakeLists.txt
@@ -1,6 +1,16 @@
---- CMakeLists.txt.orig 2011-07-31 11:50:34.000000000 +0400
-+++ CMakeLists.txt 2012-03-05 05:54:52.485029323 +0400
-@@ -588,7 +588,7 @@
+--- CMakeLists.txt.orig 2017-08-28 16:50:49 UTC
++++ CMakeLists.txt
+@@ -252,6 +252,9 @@ ENDIF()
+
+ INCLUDE_DIRECTORIES(
+ ${OpenSceneGraph_SOURCE_DIR}/include
++)
++
++INCLUDE_DIRECTORIES(SYSTEM
+ ${OPENGL_INCLUDE_DIR}
+ )
+
+@@ -846,7 +849,7 @@ ENDIF()
IF(UNIX AND NOT WIN32 AND NOT APPLE)
IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
@@ -9,7 +19,7 @@
MARK_AS_ADVANCED(LIB_POSTFIX)
ENDIF()
ENDIF()
-@@ -972,7 +972,7 @@
+@@ -1275,7 +1278,7 @@ FOREACH(PKGCONFIG_FILE ${PKGCONFIG_FILES
${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc
@ONLY
)