reavertm 15/06/06 03:28:39 Modified: openscenegraph-3.2.1-cmake.patch Log: Properly handle USE=qt4, fixes bug 550206. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key B1E955DB)
Revision Changes Path 1.2 dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch?r1=1.1&r2=1.2 Index: openscenegraph-3.2.1-cmake.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openscenegraph-3.2.1-cmake.patch 10 Oct 2014 20:17:06 -0000 1.1 +++ openscenegraph-3.2.1-cmake.patch 6 Jun 2015 03:28:39 -0000 1.2 @@ -70,48 +70,6 @@ ENDIF() # Include macro utilities here -@@ -560,16 +561,16 @@ - - IF (DESIRED_QT_VERSION) - IF (DESIRED_QT_VERSION MATCHES 5) -- FIND_PACKAGE(Qt5Widgets) -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt5Widgets) - ELSEIF (DESIRED_QT_VERSION MATCHES 4) -- FIND_PACKAGE(Qt4) -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt4) - ELSE() -- FIND_PACKAGE(Qt3) -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt3) - ENDIF() - - ELSE() - -- FIND_PACKAGE(Qt5Widgets QUIET) -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt5Widgets QUIET) - - IF ( Qt5Widgets_FOUND ) - # CMake 2.8.8 or greater required -@@ -585,17 +586,17 @@ - ENDIF( ) - - IF ( NOT Qt5Widgets_FOUND ) -- FIND_PACKAGE(Qt4) -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt4) - - IF (NOT QT4_FOUND) -- FIND_PACKAGE(Qt3) -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt3) - ENDIF() - ENDIF() - ENDIF() - - #If we have found Qt5, let's try to top off by getting the webkit as well - IF ( Qt5Widgets_FOUND ) -- FIND_PACKAGE(Qt5WebKitWidgets QUIET) -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt5WebKitWidgets QUIET) - ENDIF() - - ENDIF() @@ -604,12 +605,12 @@ IF (BUILD_OSG_EXAMPLES AND NOT ANDROID)
