Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Mar 2018 14:26:52 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r465180 - head/graphics/osg/files
Message-ID:  <201803211426.w2LEQqxu081600@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Mar 21 14:26:52 2018
New Revision: 465180
URL: https://svnweb.freebsd.org/changeset/ports/465180

Log:
  - Fix build in presence of older version of osg
  
  PR:		226681
  Reported by:	pkubaj@anongoth.pl

Modified:
  head/graphics/osg/files/patch-CMakeLists.txt

Modified: head/graphics/osg/files/patch-CMakeLists.txt
==============================================================================
--- head/graphics/osg/files/patch-CMakeLists.txt	Wed Mar 21 14:11:31 2018	(r465179)
+++ head/graphics/osg/files/patch-CMakeLists.txt	Wed Mar 21 14:26:52 2018	(r465180)
@@ -1,7 +1,17 @@
---- 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")
 -      SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
@@ -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
      )



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803211426.w2LEQqxu081600>