[106608] trunk/dports/graphics/OpenSceneGraph

[devans at macports.org]

Revision: 106608
          https://trac.macports.org/changeset/106608
Author:   devans at macports.org
Date:     2013-05-31 17:29:16 -0700 (Fri, 31 May 2013)
Log Message:
-----------
OpenSceneGraph: conditionally disable LibVNCServer support to avoid opportunitistic linking, ITK is only necessary for CMake < 2.8.

Modified Paths:
--------------
    trunk/dports/graphics/OpenSceneGraph/Portfile
    trunk/dports/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff

Modified: trunk/dports/graphics/OpenSceneGraph/Portfile
===================================================================
--- trunk/dports/graphics/OpenSceneGraph/Portfile	2013-05-31 23:01:36 UTC (rev 106607)
+++ trunk/dports/graphics/OpenSceneGraph/Portfile	2013-06-01 00:29:16 UTC (rev 106608)
@@ -6,7 +6,7 @@
 name                    OpenSceneGraph
 conflicts               OpenSceneGraph-devel
 version                 3.0.1
-revision                3
+revision                4
 maintainers             nomaintainer
 license                 wxWidgets-3
 platforms               darwin

Modified: trunk/dports/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff	2013-05-31 23:01:36 UTC (rev 106607)
+++ trunk/dports/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff	2013-06-01 00:29:16 UTC (rev 106608)
@@ -1,6 +1,6 @@
 --- CMakeLists.txt.orig	2011-07-31 00:50:34.000000000 -0700
-+++ CMakeLists.txt	2013-05-28 15:18:15.000000000 -0700
-@@ -451,27 +451,68 @@
++++ CMakeLists.txt	2013-05-31 16:31:45.000000000 -0700
+@@ -451,31 +451,77 @@
  ELSE()
  # Common to all platforms except android:
      FIND_PACKAGE(FreeType)
@@ -46,11 +46,13 @@
      FIND_PACKAGE(GDAL)
      FIND_PACKAGE(CURL)
 -    FIND_PACKAGE(ITK)
-+    OPTION(OSG_ENABLE_ITK "Enable ITK support" OFF)
-+    IF(OSG_ENABLE_ITK)
-+    	FIND_PACKAGE(ITK)
+-    FIND_PACKAGE(LibVNCServer)
++    OPTION(OSG_ENABLE_LIBVNCSERVER "Enable LibVNCServer support" OFF)
++    IF(OSG_ENABLE_LIBVNCSERVER)
++        FIND_PACKAGE(LibVNCServer)
++    ELSE()
++        SET(LIBVNCSERVER_FOUND NO)
 +    ENDIF()
-     FIND_PACKAGE(LibVNCServer)
      FIND_PACKAGE(OurDCMTK)
      FIND_PACKAGE(OpenAL)
 -    FIND_PACKAGE(FFmpeg)
@@ -78,7 +80,15 @@
      FIND_PACKAGE(DirectInput)
      FIND_PACKAGE(NVTT)
  ENDIF()
-@@ -794,40 +835,6 @@
+ 
++IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
++    FIND_PACKAGE(ITK)
++ENDIF()
++
+ # Include macro utilities here
+ INCLUDE(OsgMacroUtils)
+ 
+@@ -794,40 +840,6 @@
          #I think this or similar will be required for IPhone apps
          OPTION(OSG_BUILD_APPLICATION_BUNDLES "Enable the building of applications and examples as OSX Bundles" ON)
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130531/93de89f2/attachment.html>