Index: Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/tulip/Makefile,v retrieving revision 1.52 diff -u -r1.52 Makefile --- Makefile 4 Dec 2010 07:32:11 -0000 1.52 +++ Makefile 12 Apr 2011 10:45:33 -0000 @@ -7,27 +7,34 @@ # PORTNAME= tulip -PORTVERSION= 3.4.1 +PORTVERSION= 3.5.0 CATEGORIES= graphics MASTER_SITES= SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} MAINTAINER= gahr@FreeBSD.org COMMENT= A system dedicated to the visualization of huge graphs -LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ + gzstream.0:${PORTSDIR}/devel/gzstream \ + ftgl.2:${PORTSDIR}/graphics/ftgl \ + qscintilla2:${PORTSDIR}/devel/qscintilla2 -USE_BZIP2= yes USE_QT_VER= 4 QT_COMPONENTS= corelib moc_build uic_build rcc_build gui opengl xml network \ designer assistant assistantclient USE_GL= glew glut USE_GMAKE= yes USE_GNOME= libxml2 -USE_AUTOTOOLS= libtool - +USE_PYTHON= yes +USE_CMAKE= yes +CMAKE_OUTSOURCE=yes +CMAKE_ARGS+= -DLOCALBASE:PATH=${LOCALBASE} \ + -DPYTHON_INCLUDEDIR:PATH=${PYTHON_INCLUDEDIR} USE_LDCONFIG= yes +WRKSRC= ${WRKDIR}/${DISTNAME}-src + PLIST_SUB+= TULIP_VERSION=${PORTVERSION} \ TULIP_VERS=${PORTVERSION:R} @@ -41,18 +48,10 @@ # @${FIND} ${WRKSRC} -name "moc_*" -delete post-patch: - @${GREP} -lr '/usr/X11R6/include' ${WRKSRC} | ${XARGS} \ - ${REINPLACE_CMD} -e 's|/usr/X11R6/include|${LOCALBASE}/include|g' @${REINPLACE_CMD} -e 's|||' \ ${WRKSRC}/software/tulip/src/Application.cpp @${REINPLACE_CMD} -e 's|||;s|||' \ ${WRKSRC}/software/tulip/src/main.cpp - @${REINPLACE_CMD} -e 's|doxygen||g' \ - ${WRKSRC}/docs/Makefile.am ${WRKSRC}/docs/Makefile.in - @${REINPLACE_CMD} -e '534,535d' ${WRKSRC}/docs/doxygen/Makefile.in - @${REINPLACE_CMD} -e '132,133d' ${WRKSRC}/docs/doxygen/Makefile.am - -# @${REINPLACE_CMD} -e 's|docs||g' ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in .if !defined(NOPORTDOCS) DISTFILES+= ${PORTNAME}-${PORTVERSION}-html.tar.bz2 Index: distinfo =================================================================== RCS file: /home/pcvs/ports/graphics/tulip/distinfo,v retrieving revision 1.16 diff -u -r1.16 distinfo --- distinfo 3 Oct 2010 19:56:01 -0000 1.16 +++ distinfo 11 Apr 2011 11:38:03 -0000 @@ -1,6 +1,4 @@ -MD5 (tulip-3.4.1.tar.bz2) = 994597b4dc0a01be11ee5ea6341610d0 -SHA256 (tulip-3.4.1.tar.bz2) = 28bb95f20f8658a37ce960d8495a65c27c7b8bb70736221c7c22a67898667d79 -SIZE (tulip-3.4.1.tar.bz2) = 16472556 -MD5 (tulip-3.4.1-html.tar.bz2) = 60e492913609c17df612353d0f617a2f -SHA256 (tulip-3.4.1-html.tar.bz2) = 7b629fa76e7b015a0213d4c44627fdd9edb1113aae3e1f4dea6705e401fdf32e -SIZE (tulip-3.4.1-html.tar.bz2) = 10246742 +SHA256 (tulip-3.5.0-src.tar.gz) = 968e2bec5ed1006dee39e21507d03e8ae442dbc8bd1d7b83f1eaba4825e68072 +SIZE (tulip-3.5.0-src.tar.gz) = 23127788 +SHA256 (tulip-3.5.0-html.tar.bz2) = 238fe05685c91bca70c642ae74718ced80d3b58b75dca89dd8b310c5e301de61 +SIZE (tulip-3.5.0-html.tar.bz2) = 45704313 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/graphics/tulip/pkg-plist,v retrieving revision 1.12 diff -u -r1.12 pkg-plist --- pkg-plist 1 Jul 2010 13:32:19 -0000 1.12 +++ pkg-plist 12 Apr 2011 10:45:01 -0000 @@ -1,11 +1,7 @@ bin/tulip bin/tulip-config bin/tulip_app -bin/tulip_check_pl bin/tulip_need_restart -include/SpreadConfigurationWidgetData.h -include/SpreadInsertColumnDialogData.h -include/SpreadMainWidgetData.h include/tulip/AbstractGlCurve.h include/tulip/AbstractProperty.h include/tulip/AbstractView.h @@ -22,8 +18,18 @@ include/tulip/BooleanProperty.h include/tulip/BoundingBox.h include/tulip/CSVContentHandler.h +include/tulip/CSVGraphImport.h +include/tulip/CSVGraphMappingConfigurationWidget.h +include/tulip/CSVGraphMappingConfigurationWidgetData.h +include/tulip/CSVImportConfigurationWidget.h +include/tulip/CSVImportConfigurationWidgetData.h +include/tulip/CSVImportWizard.h +include/tulip/CSVImportWizardData.h include/tulip/CSVParser.h +include/tulip/CSVParserConfigurationWidget.h +include/tulip/CSVParserConfigurationWidgetData.h include/tulip/Camera.h +include/tulip/CameraObserver.h include/tulip/ChooseFileNameDialogData.h include/tulip/Circle.h include/tulip/Color.h @@ -32,6 +38,7 @@ include/tulip/ColorScale.h include/tulip/ColorScaleConfigDialog.h include/tulip/ColorScaleConfigDialogData.h +include/tulip/ColorScaleWidget.h include/tulip/ConcatIterator.h include/tulip/ConnectedTest.h include/tulip/Context.h @@ -115,6 +122,7 @@ include/tulip/GlMetaNodeTrueRenderer.h include/tulip/GlNode.h include/tulip/GlNominativeAxis.h +include/tulip/GlOffscreenRenderer.h include/tulip/GlOpenUniformCubicBSpline.h include/tulip/GlPentagon.h include/tulip/GlPolyQuad.h @@ -138,6 +146,8 @@ include/tulip/GlTextureManager.h include/tulip/GlTools.h include/tulip/GlTriangle.h +include/tulip/GlVertexArrayManager.h +include/tulip/GlVertexArrayVisitor.h include/tulip/GlXMLTools.h include/tulip/Glyph.h include/tulip/GlyphManager.h @@ -151,10 +161,6 @@ include/tulip/GraphicsWidgetBase.h include/tulip/GridOptionsData.h include/tulip/GridOptionsWidget.h -include/tulip/ImportCSVDataConfigurationWidget.h -include/tulip/ImportCSVDataConfigurationWidgetData.h -include/tulip/ImportCSVDataDialog.h -include/tulip/ImportCSVDataWidget.h include/tulip/ImportModule.h include/tulip/IntegerAlgorithm.h include/tulip/IntegerProperty.h @@ -168,7 +174,6 @@ include/tulip/LayerManagerWidgetData.h include/tulip/LayoutAlgorithm.h include/tulip/LayoutProperty.h -include/tulip/ListPropertyWidget.h include/tulip/ListPropertyWidgetData.h include/tulip/MainController.h include/tulip/MapIterator.h @@ -205,38 +210,43 @@ include/tulip/PluginLoader.h include/tulip/PluginLoaderTxt.h include/tulip/PluginProgress.h +include/tulip/PluginProgressWidget.h +include/tulip/PluginProgressWidgetData.h include/tulip/PreferenceManager.h include/tulip/PropertyAlgorithm.h include/tulip/PropertyDialog.h include/tulip/PropertyDialogData.h include/tulip/PropertyInterface.h +include/tulip/PropertyTypes.h include/tulip/PropertyWidget.h include/tulip/PropertyWidgetPlugin.h +include/tulip/QGlBufferManager.h include/tulip/QGlPixelBufferManager.h include/tulip/QtGlSceneZoomAndPanAnimator.h -include/tulip/QtMetaNodeRenderer.h include/tulip/QtOpenGlErrorViewer.h include/tulip/QtOpenGlErrorViewerWithAskAgainDialogData.h include/tulip/QtProgress.h -include/tulip/QtProgressData.h include/tulip/QuadTree.h include/tulip/Rectangle.h include/tulip/Reflect.h include/tulip/RenderingParametersDialog.h include/tulip/RenderingParametersDialogData.h -include/tulip/ReturnType.h include/tulip/SGHierarchyWidget.h include/tulip/SGHierarchyWidgetPlugin.h +include/tulip/SimplePluginProgress.h include/tulip/SimpleStringsListSelectionWidget.h include/tulip/SimpleStringsListSelectionWidgetData.h include/tulip/SimpleTest.h include/tulip/Size.h include/tulip/SizeAlgorithm.h include/tulip/SizeProperty.h +include/tulip/SmallMultiplesNavigatorComponent.h +include/tulip/SmallMultiplesView.h include/tulip/SortIterator.h include/tulip/StableIterator.h include/tulip/StlFunctions.h include/tulip/StlIterator.h +include/tulip/StoredType.h include/tulip/StringAlgorithm.h include/tulip/StringCollection.h include/tulip/StringProperty.h @@ -246,6 +256,8 @@ include/tulip/TabWidgetData.h include/tulip/TabWidgetHidableMenuGraphicsProxy.h include/tulip/TemplateFactory.h +include/tulip/TextEditDialog.h +include/tulip/TextEditDialogData.h include/tulip/TextRenderer.h include/tulip/TlpQtTools.h include/tulip/TlpTools.h @@ -254,7 +266,6 @@ include/tulip/TulipPlugin.h include/tulip/TulipRelease.h include/tulip/TulipTableWidget.h -include/tulip/Types.h include/tulip/Vector.h include/tulip/VectorCast.h include/tulip/View.h @@ -269,330 +280,147 @@ include/tulip/cxx/Reflect.cxx include/tulip/cxx/TemplateFactory.cxx include/tulip/cxx/Vector.cxx +include/tulip/memorypool.h include/tulip/tulipconf.h include/tulip/tuliphash.h -lib/libtulip-%%TULIP_VERS%%.so -lib/libtulip-ogl-%%TULIP_VERS%%.so -lib/libtulip-ogl.a -lib/libtulip-ogl.la -lib/libtulip-ogl.so lib/libtulip-pluginsmanager-%%TULIP_VERS%%.so -lib/libtulip-pluginsmanager.a -lib/libtulip-pluginsmanager.la -lib/libtulip-pluginsmanager.so +lib/libtulip-ogl-%%TULIP_VERS%%.so lib/libtulip-qt4-%%TULIP_VERS%%.so -lib/libtulip-qt4.a -lib/libtulip-qt4.la -lib/libtulip-qt4.so -lib/libtulip.a -lib/libtulip.la -lib/libtulip.so +lib/libtulip-%%TULIP_VERS%%.so lib/tlp/bitmaps/arrowSprite.png lib/tlp/bitmaps/candiSprite.png +lib/tlp/bitmaps/colorscales/BiologicalHeatMap.png +lib/tlp/bitmaps/colorscales/BlackPink.png +lib/tlp/bitmaps/colorscales/BlackRedYellowWhite.png +lib/tlp/bitmaps/colorscales/Blue.png +lib/tlp/bitmaps/colorscales/BlueGreenYellow.png +lib/tlp/bitmaps/colorscales/Brown.png +lib/tlp/bitmaps/colorscales/BrownCyan.png +lib/tlp/bitmaps/colorscales/CMYK.png +lib/tlp/bitmaps/colorscales/GreenRed.png +lib/tlp/bitmaps/colorscales/MentheGrenadine.png +lib/tlp/bitmaps/colorscales/OrangeBlue.png +lib/tlp/bitmaps/colorscales/Pink.png +lib/tlp/bitmaps/colorscales/Rainbow.png +lib/tlp/bitmaps/colorscales/Red.png +lib/tlp/bitmaps/colorscales/RedBlue.png +lib/tlp/bitmaps/colorscales/RedYellow.png +lib/tlp/bitmaps/colorscales/Temperature.png lib/tlp/bitmaps/cylinderTexture.png lib/tlp/bitmaps/edgeBlomSprite.png lib/tlp/bitmaps/edgeSpring.png lib/tlp/bitmaps/font.ttf lib/tlp/bitmaps/fontb.ttf +lib/tlp/bitmaps/halfCylinderTexture.png lib/tlp/bitmaps/headerlogo.bmp lib/tlp/bitmaps/logo.bmp lib/tlp/bitmaps/logo32x32.bmp lib/tlp/bitmaps/logo32x32.ico lib/tlp/bitmaps/logolabri.jpg lib/tlp/bitmaps/logotulip.jpg +lib/tlp/bitmaps/roundTexture.png lib/tlp/bitmaps/startup.gif lib/tlp/bitmaps/tex_back.png +lib/tlp/bitmaps/titlebarGradient.png lib/tlp/bitmaps/welcomelogo.bmp -lib/tlp/designer/libElementPropertiesWidgetPlugin-%%TULIP_VERS%%.so -lib/tlp/designer/libElementPropertiesWidgetPlugin.a -lib/tlp/designer/libElementPropertiesWidgetPlugin.la -lib/tlp/designer/libElementPropertiesWidgetPlugin.so -lib/tlp/designer/libGWOverviewWidgetPlugin-%%TULIP_VERS%%.so -lib/tlp/designer/libGWOverviewWidgetPlugin.a -lib/tlp/designer/libGWOverviewWidgetPlugin.la -lib/tlp/designer/libGWOverviewWidgetPlugin.so -lib/tlp/designer/libGlMainWidgetPlugin-%%TULIP_VERS%%.so -lib/tlp/designer/libGlMainWidgetPlugin.a -lib/tlp/designer/libGlMainWidgetPlugin.la -lib/tlp/designer/libGlMainWidgetPlugin.so -lib/tlp/designer/libPropertyWidgetPlugin-%%TULIP_VERS%%.so -lib/tlp/designer/libPropertyWidgetPlugin.a -lib/tlp/designer/libPropertyWidgetPlugin.la -lib/tlp/designer/libPropertyWidgetPlugin.so -lib/tlp/designer/libSGHierarchyWidgetPlugin-%%TULIP_VERS%%.so -lib/tlp/designer/libSGHierarchyWidgetPlugin.a -lib/tlp/designer/libSGHierarchyWidgetPlugin.la -lib/tlp/designer/libSGHierarchyWidgetPlugin.so -lib/tlp/glyphs/libBillboard-%%TULIP_VERSION%%.a -lib/tlp/glyphs/libBillboard-%%TULIP_VERSION%%.la lib/tlp/glyphs/libBillboard-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libChristmasTree-%%TULIP_VERSION%%.a -lib/tlp/glyphs/libChristmasTree-%%TULIP_VERSION%%.la lib/tlp/glyphs/libChristmasTree-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libCircle-%%TULIP_VERSION%%.a -lib/tlp/glyphs/libCircle-%%TULIP_VERSION%%.la lib/tlp/glyphs/libCircle-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libCone-%%TULIP_VERSION%%.a -lib/tlp/glyphs/libCone-%%TULIP_VERSION%%.la lib/tlp/glyphs/libCone-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libCube-%%TULIP_VERSION%%.a -lib/tlp/glyphs/libCube-%%TULIP_VERSION%%.la lib/tlp/glyphs/libCube-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libCubeOutlinedTransparent-%%TULIP_VERSION%%.a -lib/tlp/glyphs/libCubeOutlinedTransparent-%%TULIP_VERSION%%.la lib/tlp/glyphs/libCubeOutlinedTransparent-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libCylinder-%%TULIP_VERSION%%.a -lib/tlp/glyphs/libCylinder-%%TULIP_VERSION%%.la lib/tlp/glyphs/libCylinder-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libHalfCylinder-%%TULIP_VERSION%%.a -lib/tlp/glyphs/libHalfCylinder-%%TULIP_VERSION%%.la lib/tlp/glyphs/libHalfCylinder-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libHexagone-%%TULIP_VERSION%%.a -lib/tlp/glyphs/libHexagone-%%TULIP_VERSION%%.la lib/tlp/glyphs/libHexagone-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libPentagone-%%TULIP_VERSION%%.a -lib/tlp/glyphs/libPentagone-%%TULIP_VERSION%%.la lib/tlp/glyphs/libPentagone-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libRing-%%TULIP_VERSION%%.a -lib/tlp/glyphs/libRing-%%TULIP_VERSION%%.la lib/tlp/glyphs/libRing-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libSphere-%%TULIP_VERSION%%.a -lib/tlp/glyphs/libSphere-%%TULIP_VERSION%%.la +lib/tlp/glyphs/libRoundedBox-%%TULIP_VERSION%%.so lib/tlp/glyphs/libSphere-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libSquare-%%TULIP_VERSION%%.a -lib/tlp/glyphs/libSquare-%%TULIP_VERSION%%.la lib/tlp/glyphs/libSquare-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libTriangle-%%TULIP_VERSION%%.a -lib/tlp/glyphs/libTriangle-%%TULIP_VERSION%%.la lib/tlp/glyphs/libTriangle-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorAddEdge-%%TULIP_VERSION%%.a -lib/tlp/interactors/libInteractorAddEdge-%%TULIP_VERSION%%.la +lib/tlp/glyphs/libWindow-%%TULIP_VERSION%%.so lib/tlp/interactors/libInteractorAddEdge-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorAddNode-%%TULIP_VERSION%%.a -lib/tlp/interactors/libInteractorAddNode-%%TULIP_VERSION%%.la lib/tlp/interactors/libInteractorAddNode-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorDeleteElement-%%TULIP_VERSION%%.a -lib/tlp/interactors/libInteractorDeleteElement-%%TULIP_VERSION%%.la lib/tlp/interactors/libInteractorDeleteElement-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorEditEdgeBends-%%TULIP_VERSION%%.a -lib/tlp/interactors/libInteractorEditEdgeBends-%%TULIP_VERSION%%.la lib/tlp/interactors/libInteractorEditEdgeBends-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorGetInformation-%%TULIP_VERSION%%.a -lib/tlp/interactors/libInteractorGetInformation-%%TULIP_VERSION%%.la lib/tlp/interactors/libInteractorGetInformation-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorMagicSelection-%%TULIP_VERSION%%.a -lib/tlp/interactors/libInteractorMagicSelection-%%TULIP_VERSION%%.la lib/tlp/interactors/libInteractorMagicSelection-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorNavigation-%%TULIP_VERSION%%.a -lib/tlp/interactors/libInteractorNavigation-%%TULIP_VERSION%%.la lib/tlp/interactors/libInteractorNavigation-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorRectangleZoom-%%TULIP_VERSION%%.a -lib/tlp/interactors/libInteractorRectangleZoom-%%TULIP_VERSION%%.la lib/tlp/interactors/libInteractorRectangleZoom-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorSelection-%%TULIP_VERSION%%.a -lib/tlp/interactors/libInteractorSelection-%%TULIP_VERSION%%.la lib/tlp/interactors/libInteractorSelection-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorSelectionModifier-%%TULIP_VERSION%%.a -lib/tlp/interactors/libInteractorSelectionModifier-%%TULIP_VERSION%%.la lib/tlp/interactors/libInteractorSelectionModifier-%%TULIP_VERSION%%.so -lib/tlp/libAdjacencyMatrixImport-%%TULIP_VERSION%%.a -lib/tlp/libAdjacencyMatrixImport-%%TULIP_VERSION%%.la lib/tlp/libAdjacencyMatrixImport-%%TULIP_VERSION%%.so -lib/tlp/libArityMetric-%%TULIP_VERSION%%.a -lib/tlp/libArityMetric-%%TULIP_VERSION%%.la -lib/tlp/libArityMetric-%%TULIP_VERSION%%.so -lib/tlp/libAutoSize-%%TULIP_VERSION%%.a -lib/tlp/libAutoSize-%%TULIP_VERSION%%.la lib/tlp/libAutoSize-%%TULIP_VERSION%%.so -lib/tlp/libBetweennessCentrality-%%TULIP_VERSION%%.a -lib/tlp/libBetweennessCentrality-%%TULIP_VERSION%%.la lib/tlp/libBetweennessCentrality-%%TULIP_VERSION%%.so -lib/tlp/libBiconnectedComponent-%%TULIP_VERSION%%.a -lib/tlp/libBiconnectedComponent-%%TULIP_VERSION%%.la lib/tlp/libBiconnectedComponent-%%TULIP_VERSION%%.so -lib/tlp/libBubbleTree-%%TULIP_VERSION%%.a -lib/tlp/libBubbleTree-%%TULIP_VERSION%%.la lib/tlp/libBubbleTree-%%TULIP_VERSION%%.so -lib/tlp/libCircular-%%TULIP_VERSION%%.a -lib/tlp/libCircular-%%TULIP_VERSION%%.la lib/tlp/libCircular-%%TULIP_VERSION%%.so -lib/tlp/libClusterMetric-%%TULIP_VERSION%%.a -lib/tlp/libClusterMetric-%%TULIP_VERSION%%.la lib/tlp/libClusterMetric-%%TULIP_VERSION%%.so -lib/tlp/libCompleteGraph-%%TULIP_VERSION%%.a -lib/tlp/libCompleteGraph-%%TULIP_VERSION%%.la +lib/tlp/libColorMapping-%%TULIP_VERSION%%.so lib/tlp/libCompleteGraph-%%TULIP_VERSION%%.so -lib/tlp/libCompleteTree-%%TULIP_VERSION%%.a -lib/tlp/libCompleteTree-%%TULIP_VERSION%%.la lib/tlp/libCompleteTree-%%TULIP_VERSION%%.so -lib/tlp/libConeTreeExtended-%%TULIP_VERSION%%.a -lib/tlp/libConeTreeExtended-%%TULIP_VERSION%%.la lib/tlp/libConeTreeExtended-%%TULIP_VERSION%%.so -lib/tlp/libConnectedComponent-%%TULIP_VERSION%%.a -lib/tlp/libConnectedComponent-%%TULIP_VERSION%%.la lib/tlp/libConnectedComponent-%%TULIP_VERSION%%.so -lib/tlp/libConnectedComponentPacking-%%TULIP_VERSION%%.a -lib/tlp/libConnectedComponentPacking-%%TULIP_VERSION%%.la lib/tlp/libConnectedComponentPacking-%%TULIP_VERSION%%.so -lib/tlp/libConvolutionClustering-%%TULIP_VERSION%%.a -lib/tlp/libConvolutionClustering-%%TULIP_VERSION%%.la lib/tlp/libConvolutionClustering-%%TULIP_VERSION%%.so -lib/tlp/libDagLevelMetric-%%TULIP_VERSION%%.a -lib/tlp/libDagLevelMetric-%%TULIP_VERSION%%.la lib/tlp/libDagLevelMetric-%%TULIP_VERSION%%.so -lib/tlp/libDendrogram-%%TULIP_VERSION%%.a -lib/tlp/libDendrogram-%%TULIP_VERSION%%.la +lib/tlp/libDegreeMetric-%%TULIP_VERSION%%.so lib/tlp/libDendrogram-%%TULIP_VERSION%%.so -lib/tlp/libDepthMetric-%%TULIP_VERSION%%.a -lib/tlp/libDepthMetric-%%TULIP_VERSION%%.la lib/tlp/libDepthMetric-%%TULIP_VERSION%%.so -lib/tlp/libDotImport-%%TULIP_VERSION%%.a -lib/tlp/libDotImport-%%TULIP_VERSION%%.la lib/tlp/libDotImport-%%TULIP_VERSION%%.so -lib/tlp/libEccentricity-%%TULIP_VERSION%%.a -lib/tlp/libEccentricity-%%TULIP_VERSION%%.la lib/tlp/libEccentricity-%%TULIP_VERSION%%.so -lib/tlp/libEnumColorValuesMapping-%%TULIP_VERSION%%.a -lib/tlp/libEnumColorValuesMapping-%%TULIP_VERSION%%.la -lib/tlp/libEnumColorValuesMapping-%%TULIP_VERSION%%.so -lib/tlp/libEqualValueClustering-%%TULIP_VERSION%%.a -lib/tlp/libEqualValueClustering-%%TULIP_VERSION%%.la lib/tlp/libEqualValueClustering-%%TULIP_VERSION%%.so -lib/tlp/libFileSystem-%%TULIP_VERSION%%.a -lib/tlp/libFileSystem-%%TULIP_VERSION%%.la lib/tlp/libFileSystem-%%TULIP_VERSION%%.so -lib/tlp/libFitToLabels-%%TULIP_VERSION%%.a -lib/tlp/libFitToLabels-%%TULIP_VERSION%%.la lib/tlp/libFitToLabels-%%TULIP_VERSION%%.so -lib/tlp/libGMLExport-%%TULIP_VERSION%%.a -lib/tlp/libGMLExport-%%TULIP_VERSION%%.la lib/tlp/libGMLExport-%%TULIP_VERSION%%.so -lib/tlp/libGMLImport-%%TULIP_VERSION%%.a -lib/tlp/libGMLImport-%%TULIP_VERSION%%.la lib/tlp/libGMLImport-%%TULIP_VERSION%%.so -lib/tlp/libGemLayout-%%TULIP_VERSION%%.a -lib/tlp/libGemLayout-%%TULIP_VERSION%%.la lib/tlp/libGemLayout-%%TULIP_VERSION%%.so -lib/tlp/libGrid-%%TULIP_VERSION%%.a -lib/tlp/libGrid-%%TULIP_VERSION%%.la lib/tlp/libGrid-%%TULIP_VERSION%%.so -lib/tlp/libHierarchicalClustering-%%TULIP_VERSION%%.a -lib/tlp/libHierarchicalClustering-%%TULIP_VERSION%%.la lib/tlp/libHierarchicalClustering-%%TULIP_VERSION%%.so -lib/tlp/libHierarchicalGraph-%%TULIP_VERSION%%.a -lib/tlp/libHierarchicalGraph-%%TULIP_VERSION%%.la lib/tlp/libHierarchicalGraph-%%TULIP_VERSION%%.so -lib/tlp/libIdMetric-%%TULIP_VERSION%%.a -lib/tlp/libIdMetric-%%TULIP_VERSION%%.la lib/tlp/libIdMetric-%%TULIP_VERSION%%.so -lib/tlp/libImprovedWalker-%%TULIP_VERSION%%.a -lib/tlp/libImprovedWalker-%%TULIP_VERSION%%.la lib/tlp/libImprovedWalker-%%TULIP_VERSION%%.so -lib/tlp/libInducedSubGraphSelection-%%TULIP_VERSION%%.a -lib/tlp/libInducedSubGraphSelection-%%TULIP_VERSION%%.la lib/tlp/libInducedSubGraphSelection-%%TULIP_VERSION%%.so -lib/tlp/libKruskal-%%TULIP_VERSION%%.a -lib/tlp/libKruskal-%%TULIP_VERSION%%.la lib/tlp/libKruskal-%%TULIP_VERSION%%.so -lib/tlp/libLeafMetric-%%TULIP_VERSION%%.a -lib/tlp/libLeafMetric-%%TULIP_VERSION%%.la lib/tlp/libLeafMetric-%%TULIP_VERSION%%.so -lib/tlp/libLoopSelection-%%TULIP_VERSION%%.a -lib/tlp/libLoopSelection-%%TULIP_VERSION%%.la lib/tlp/libLoopSelection-%%TULIP_VERSION%%.so -lib/tlp/libMetricColorMapping-%%TULIP_VERSION%%.a -lib/tlp/libMetricColorMapping-%%TULIP_VERSION%%.la -lib/tlp/libMetricColorMapping-%%TULIP_VERSION%%.so -lib/tlp/libMetricSizeMapping-%%TULIP_VERSION%%.a -lib/tlp/libMetricSizeMapping-%%TULIP_VERSION%%.la lib/tlp/libMetricSizeMapping-%%TULIP_VERSION%%.so -lib/tlp/libMixedModel-%%TULIP_VERSION%%.a -lib/tlp/libMixedModel-%%TULIP_VERSION%%.la lib/tlp/libMixedModel-%%TULIP_VERSION%%.so -lib/tlp/libMultipleSelection-%%TULIP_VERSION%%.a -lib/tlp/libMultipleSelection-%%TULIP_VERSION%%.la lib/tlp/libMultipleSelection-%%TULIP_VERSION%%.so -lib/tlp/libNodeMetric-%%TULIP_VERSION%%.a -lib/tlp/libNodeMetric-%%TULIP_VERSION%%.la lib/tlp/libNodeMetric-%%TULIP_VERSION%%.so -lib/tlp/libPathLengthMetric-%%TULIP_VERSION%%.a -lib/tlp/libPathLengthMetric-%%TULIP_VERSION%%.la lib/tlp/libPathLengthMetric-%%TULIP_VERSION%%.so -lib/tlp/libPlanarGraph-%%TULIP_VERSION%%.a -lib/tlp/libPlanarGraph-%%TULIP_VERSION%%.la lib/tlp/libPlanarGraph-%%TULIP_VERSION%%.so -lib/tlp/libQuotientClustering-%%TULIP_VERSION%%.a -lib/tlp/libQuotientClustering-%%TULIP_VERSION%%.la lib/tlp/libQuotientClustering-%%TULIP_VERSION%%.so -lib/tlp/libRandom-%%TULIP_VERSION%%.a -lib/tlp/libRandom-%%TULIP_VERSION%%.la lib/tlp/libRandom-%%TULIP_VERSION%%.so -lib/tlp/libRandomGraph-%%TULIP_VERSION%%.a -lib/tlp/libRandomGraph-%%TULIP_VERSION%%.la lib/tlp/libRandomGraph-%%TULIP_VERSION%%.so -lib/tlp/libRandomMetric-%%TULIP_VERSION%%.a -lib/tlp/libRandomMetric-%%TULIP_VERSION%%.la lib/tlp/libRandomMetric-%%TULIP_VERSION%%.so -lib/tlp/libRandomSimpleGraph-%%TULIP_VERSION%%.a -lib/tlp/libRandomSimpleGraph-%%TULIP_VERSION%%.la lib/tlp/libRandomSimpleGraph-%%TULIP_VERSION%%.so -lib/tlp/libRandomTree-%%TULIP_VERSION%%.a -lib/tlp/libRandomTree-%%TULIP_VERSION%%.la lib/tlp/libRandomTree-%%TULIP_VERSION%%.so -lib/tlp/libRandomTreeGeneral-%%TULIP_VERSION%%.a -lib/tlp/libRandomTreeGeneral-%%TULIP_VERSION%%.la lib/tlp/libRandomTreeGeneral-%%TULIP_VERSION%%.so -lib/tlp/libReachableSubGraphSelection-%%TULIP_VERSION%%.a -lib/tlp/libReachableSubGraphSelection-%%TULIP_VERSION%%.la lib/tlp/libReachableSubGraphSelection-%%TULIP_VERSION%%.so -lib/tlp/libSmallWorldGraph-%%TULIP_VERSION%%.a -lib/tlp/libSmallWorldGraph-%%TULIP_VERSION%%.la lib/tlp/libSmallWorldGraph-%%TULIP_VERSION%%.so -lib/tlp/libSpanningDagSelection-%%TULIP_VERSION%%.a -lib/tlp/libSpanningDagSelection-%%TULIP_VERSION%%.la lib/tlp/libSpanningDagSelection-%%TULIP_VERSION%%.so -lib/tlp/libSpanningTreeSelection-%%TULIP_VERSION%%.a -lib/tlp/libSpanningTreeSelection-%%TULIP_VERSION%%.la lib/tlp/libSpanningTreeSelection-%%TULIP_VERSION%%.so -lib/tlp/libSquarifiedTreeMap-%%TULIP_VERSION%%.a -lib/tlp/libSquarifiedTreeMap-%%TULIP_VERSION%%.la lib/tlp/libSquarifiedTreeMap-%%TULIP_VERSION%%.so -lib/tlp/libStrahlerMetric-%%TULIP_VERSION%%.a -lib/tlp/libStrahlerMetric-%%TULIP_VERSION%%.la lib/tlp/libStrahlerMetric-%%TULIP_VERSION%%.so -lib/tlp/libStrengthClustering-%%TULIP_VERSION%%.a -lib/tlp/libStrengthClustering-%%TULIP_VERSION%%.la lib/tlp/libStrengthClustering-%%TULIP_VERSION%%.so -lib/tlp/libStrengthMetric-%%TULIP_VERSION%%.a -lib/tlp/libStrengthMetric-%%TULIP_VERSION%%.la lib/tlp/libStrengthMetric-%%TULIP_VERSION%%.so -lib/tlp/libStrongComponent-%%TULIP_VERSION%%.a -lib/tlp/libStrongComponent-%%TULIP_VERSION%%.la lib/tlp/libStrongComponent-%%TULIP_VERSION%%.so -lib/tlp/libTreeLeaf-%%TULIP_VERSION%%.a -lib/tlp/libTreeLeaf-%%TULIP_VERSION%%.la lib/tlp/libTreeLeaf-%%TULIP_VERSION%%.so -lib/tlp/libTreeRadial-%%TULIP_VERSION%%.a -lib/tlp/libTreeRadial-%%TULIP_VERSION%%.la lib/tlp/libTreeRadial-%%TULIP_VERSION%%.so -lib/tlp/libTreeReingoldAndTilforExtended-%%TULIP_VERSION%%.a -lib/tlp/libTreeReingoldAndTilforExtended-%%TULIP_VERSION%%.la lib/tlp/libTreeReingoldAndTilforExtended-%%TULIP_VERSION%%.so -lib/tlp/libTutte-%%TULIP_VERSION%%.a -lib/tlp/libTutte-%%TULIP_VERSION%%.la lib/tlp/libTutte-%%TULIP_VERSION%%.so -lib/tlp/libWebImport-%%TULIP_VERSION%%.a -lib/tlp/libWebImport-%%TULIP_VERSION%%.la lib/tlp/libWebImport-%%TULIP_VERSION%%.so -lib/tlp/view/libSpreadSheet-%%TULIP_VERSION%%.a -lib/tlp/view/libSpreadSheet-%%TULIP_VERSION%%.la lib/tlp/view/libSpreadSheet-%%TULIP_VERSION%%.so -share/aclocal/tulip.m4 +%%DATADIR%%/tulip.qhc +%%DATADIR%%/tulip.qch +%%DATADIR%%/FindTULIP3.cmake @dirrm include/tulip/cxx @dirrm include/tulip @dirrm lib/tlp/view @dirrm lib/tlp/interactors @dirrm lib/tlp/glyphs -@dirrm lib/tlp/designer +@dirrm lib/tlp/bitmaps/colorscales @dirrm lib/tlp/bitmaps @dirrm lib/tlp +@dirrm %%DATADIR%% Index: files/patch-CMakeLists.txt =================================================================== RCS file: files/patch-CMakeLists.txt diff -N files/patch-CMakeLists.txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-CMakeLists.txt 12 Apr 2011 10:07:48 -0000 @@ -0,0 +1,70 @@ +--- CMakeLists.txt.orig 2011-04-04 15:17:26.000000000 +0200 ++++ CMakeLists.txt 2011-04-12 12:07:39.000000000 +0200 +@@ -163,30 +163,24 @@ + FIND_PACKAGE(PythonLibs) + IF(PYTHONLIBS_FOUND) + SET(SIP_LIB siplib) +- TRY_COMPILE(SIP_OK ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/sip-4.11.2/sipgen ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/sip-4.11.2/sipgen sip CMAKE_FLAGS -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}) +- IF(SIP_OK) +- IF(WIN32 AND EXISTS "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/sip-4.11.2/sipgen/Debug/sipgen.exe") +- SET(SIP_EXE ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/sip-4.11.2/sipgen/Debug/sipgen.exe) +- ELSE() +- SET(SIP_EXE ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/sip-4.11.2/sipgen/sipgen) +- ENDIF() +- SET(SIP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/sip-4.11.2/siplib/) +- ENDIF(SIP_OK) ++ SET(SIP_EXE ${LOCALBASE}/bin/sip) ++ SET(SIP_INCLUDE_DIR ${PYTHON_INCLUDEDIR}) + ENDIF(PYTHONLIBS_FOUND) + + + ## ----------------------------------------------------------------------------------------------- + ## Include file paths + ## ----------------------------------------------------------------------------------------------- +-SET(GZStreamInclude ${PROJECT_SOURCE_DIR}/thirdparty/gzstream/) +-SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) +-SET(qscintilla2Include ${PROJECT_SOURCE_DIR}/thirdparty/QScintilla-gpl-2.4.6/Qt4/) ++SET(GZStreamInclude ) ++SET(FTGLInclude ${LOCALBASE}/include) ++SET(qscintilla2Include ${LOCALBASE}/include/qt4) + SET(TulipInclude ${PROJECT_SOURCE_DIR}/library/tulip/include/) + SET(TulipBuildInclude ${PROJECT_BINARY_DIR}/library/tulip/include/) + SET(TulipOGLInclude ${PROJECT_SOURCE_DIR}/library/tulip-ogl/include/) + SET(TulipQtInclude ${PROJECT_SOURCE_DIR}/library/tulip-qt/include/) + SET(TulipQtBuildInclude ${PROJECT_BINARY_DIR}/library/tulip-qt/include/) + SET(TulipPluginsManagerInclude ${PROJECT_SOURCE_DIR}/software/plugins-manager/include/) ++LINK_DIRECTORIES(${LOCALBASE}/lib) + + ## ----------------------------------------------------------------------------------------------- + ## Install paths +@@ -205,7 +199,7 @@ + SET(TulipPluginsInstallDir ${TulipLibInstallDir}/tlp/) + SET(TulipBinInstallDir bin/) + SET(TulipIncludeInstallDir include/) +-SET(TulipShareInstallDir share/) ++SET(TulipShareInstallDir share) + SET(TulipBitmapInstallDir lib/tlp/bitmaps/) + ENDIF() + +@@ -327,7 +321,7 @@ + ## ----------------------------------------------------------------------------------------------- + ## Sub dir (no comment) + ## ----------------------------------------------------------------------------------------------- +-ADD_SUBDIRECTORY(thirdparty) ++#ADD_SUBDIRECTORY(thirdparty) + ADD_SUBDIRECTORY(library) + ADD_SUBDIRECTORY(software) + ADD_SUBDIRECTORY(plugins) +@@ -377,11 +371,7 @@ + INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/tulip-config + DESTINATION ${TulipBinInstallDir}) + INSTALL(FILES FindTULIP3.cmake +- DESTINATION ${TulipShareInstallDir}) +-INSTALL(FILES FindGLEW.cmake +- DESTINATION ${TulipShareInstallDir}) +-INSTALL(FILES FindXML2.cmake +- DESTINATION ${TulipShareInstallDir}) ++ DESTINATION ${TulipShareInstallDir}/tulip) + ## ----------------------------------------------------------------------------------------------- + ## Script for linux Tulip bundle building + IF(LINUX) Index: files/patch-library-tulip-qt-src_Makefile.am =================================================================== RCS file: files/patch-library-tulip-qt-src_Makefile.am diff -N files/patch-library-tulip-qt-src_Makefile.am --- files/patch-library-tulip-qt-src_Makefile.am 3 Apr 2010 15:43:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ ---- library/tulip-qt/src/Makefile.am.orig 2010-03-24 13:57:22.000000000 +0100 -+++ library/tulip-qt/src/Makefile.am 2010-03-24 13:57:38.000000000 +0100 -@@ -11,8 +11,8 @@ - lib_LTLIBRARIES = libtulip-qt4.la - qtplugin_LTLIBRARIES = libPropertyWidgetPlugin.la libElementPropertiesWidgetPlugin.la libGlMainWidgetPlugin.la libSGHierarchyWidgetPlugin.la libGWOverviewWidgetPlugin.la - --INCLUDES = ${DLL_TULIP_QT} @GL_INCLUDES@ @TULIP_QT_INCLUDE@ -D_REENTRANT -DQT_THREAD_SUPPORT -DQT_PLUGIN -DQT_SHARED \ -- @QT_INCLUDES@ @TULIP_INCLUDE@ @TULIP_OGL_INCLUDE@ -+INCLUDES = ${DLL_TULIP_QT} @TULIP_QT_INCLUDE@ -D_REENTRANT -DQT_THREAD_SUPPORT -DQT_PLUGIN -DQT_SHARED \ -+ @QT_INCLUDES@ @TULIP_INCLUDE@ @TULIP_OGL_INCLUDE@ @GL_INCLUDES@ - PLUGINS_LDFLAGS = ${DLL_FLAGS} @GL_LDFLAGS@ @LIB_GL@ @QT_LDFLAGS@ @LIB_QT@ @TULIP_LDFLAGS@ @TULIP_OGL_LDFLAGS@ @TULIP_QT_LDFLAGS@ -avoid-version - AM_LDFLAGS = ${DLL_FLAGS} @GL_LDFLAGS@ @LIB_GL@ @QT_LDFLAGS@ @LIB_QT@ @TULIP_LDFLAGS@ @TULIP_OGL_LDFLAGS@ -release @MAJOR_VERSION@.@MINOR_VERSION@ - Index: files/patch-library-tulip-qt-src_Makefile.in =================================================================== RCS file: files/patch-library-tulip-qt-src_Makefile.in diff -N files/patch-library-tulip-qt-src_Makefile.in --- files/patch-library-tulip-qt-src_Makefile.in 3 Apr 2010 15:43:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ ---- library/tulip-qt/src/Makefile.in.orig 2010-03-24 13:56:37.000000000 +0100 -+++ library/tulip-qt/src/Makefile.in 2010-03-24 13:56:49.000000000 +0100 -@@ -411,8 +411,8 @@ - @WIN32_TRUE@DLL_TULIP_QT2 = -DDLL_TULIP_QT2 - lib_LTLIBRARIES = libtulip-qt4.la - qtplugin_LTLIBRARIES = libPropertyWidgetPlugin.la libElementPropertiesWidgetPlugin.la libGlMainWidgetPlugin.la libSGHierarchyWidgetPlugin.la libGWOverviewWidgetPlugin.la --INCLUDES = ${DLL_TULIP_QT} @GL_INCLUDES@ @TULIP_QT_INCLUDE@ -D_REENTRANT -DQT_THREAD_SUPPORT -DQT_PLUGIN -DQT_SHARED \ -- @QT_INCLUDES@ @TULIP_INCLUDE@ @TULIP_OGL_INCLUDE@ -+INCLUDES = ${DLL_TULIP_QT} @TULIP_QT_INCLUDE@ -D_REENTRANT -DQT_THREAD_SUPPORT -DQT_PLUGIN -DQT_SHARED \ -+ @QT_INCLUDES@ @TULIP_INCLUDE@ @TULIP_OGL_INCLUDE@ @GL_INCLUDES@ - - PLUGINS_LDFLAGS = ${DLL_FLAGS} @GL_LDFLAGS@ @LIB_GL@ @QT_LDFLAGS@ @LIB_QT@ @TULIP_LDFLAGS@ @TULIP_OGL_LDFLAGS@ @TULIP_QT_LDFLAGS@ -avoid-version - AM_LDFLAGS = ${DLL_FLAGS} @GL_LDFLAGS@ @LIB_GL@ @QT_LDFLAGS@ @LIB_QT@ @TULIP_LDFLAGS@ @TULIP_OGL_LDFLAGS@ -release @MAJOR_VERSION@.@MINOR_VERSION@ Index: files/patch-opengl =================================================================== RCS file: files/patch-opengl diff -N files/patch-opengl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-opengl 11 Apr 2011 14:44:23 -0000 @@ -0,0 +1,50 @@ +--- library/tulip-ogl/src/CMakeLists.txt.orig 2011-04-11 15:38:08.000000000 +0200 ++++ library/tulip-ogl/src/CMakeLists.txt 2011-04-11 15:38:28.000000000 +0200 +@@ -1,6 +1,6 @@ + FILE(GLOB tulip-ogl_LIB_SRCS "*.cpp") + +-INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ../include/ ${PROJECT_SOURCE_DIR} ${FTGLInclude} ${LIBXML2_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}) ++INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ../include/ ${PROJECT_SOURCE_DIR} ${FTGLInclude} ${LIBXML2_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR}) + INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ${JPEG_INCLUDE_DIR}) + + IF(ENABLE_RENDERING_TIME_DISPLAY) +--- library/tulip-python/tulip-ogl/CMakeLists.txt.orig 2011-04-11 16:04:13.000000000 +0200 ++++ library/tulip-python/tulip-ogl/CMakeLists.txt 2011-04-11 16:04:33.000000000 +0200 +@@ -34,7 +34,7 @@ + # instead of those installed in the system + INCLUDE_DIRECTORIES(BEFORE ${SIP_INCLUDE_DIR}) + +-INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} ${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude}) ++INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} ${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${OPENGL_INCLUDE_DIR}) + + ADD_LIBRARY(${LibTulipOglPythonName} STATIC ${TULIPOGL_PYTHON_BINDINGS_SRC}) + +--- library/tulip-qt/src/CMakeLists.txt.orig 2011-04-11 14:48:18.000000000 +0200 ++++ library/tulip-qt/src/CMakeLists.txt 2011-04-11 14:48:57.000000000 +0200 +@@ -173,7 +173,7 @@ + ADD_DEFINITIONS(-DQT_DLL) + ADD_DEFINITIONS(-DQT_THREAD_SUPPORT) + +-INCLUDE_DIRECTORIES(../include/ ../include/tulip ${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtBuildInclude} ${PROJECT_BINARY_DIR}/library/tulip-qt/include/tulip/) ++INCLUDE_DIRECTORIES(../include/ ../include/tulip ${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtBuildInclude} ${PROJECT_BINARY_DIR}/library/tulip-qt/include/tulip/ ${OPENGL_INCLUDE_DIR}) + ADD_LIBRARY(${LibTulipQtName} SHARED ${tulip-qt_UI_SRCS} ${tulip-qt_MOC_SRCS} ${tulip-qt_RCC_SRCS} ${tulip-qt_LIB_SRCS}) + TARGET_LINK_LIBRARIES(${LibTulipQtName} ${QT_QTCORE_LIBRARY}) + TARGET_LINK_LIBRARIES(${LibTulipQtName} ${QT_QTGUI_LIBRARY}) +--- software/tulip/src/CMakeLists.txt.orig 2011-04-11 16:09:11.000000000 +0200 ++++ software/tulip/src/CMakeLists.txt 2011-04-11 16:09:29.000000000 +0200 +@@ -34,7 +34,7 @@ + TULIP_QT4_WRAP_CPP(tulip_MOC_SRCS ${tulip_MOC} OPTIONS "-DQT_MINOR_REL=${QT_VERSION_MINOR}") + QT4_ADD_RESOURCES(tulip_RCC_SRCS ${tulip_RCC}) + +-INCLUDE_DIRECTORIES(../include/ ${TulipBuildInclude} ${TulipQtBuildInclude} ${PROJECT_BINARY_DIR}/library/tulip-qt/include/tulip ${PROJECT_BINARY_DIR}/software/tulip/include ${TulipInclude} ${TulipQtInclude} ${TulipOGLInclude} ${TulipPluginsManagerInclude}) ++INCLUDE_DIRECTORIES(../include/ ${TulipBuildInclude} ${TulipQtBuildInclude} ${PROJECT_BINARY_DIR}/library/tulip-qt/include/tulip ${PROJECT_BINARY_DIR}/software/tulip/include ${TulipInclude} ${TulipQtInclude} ${TulipOGLInclude} ${TulipPluginsManagerInclude} ${OPENGL_INCLUDE_DIR}) + + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_MINOR_REL=${QT_VERSION_MINOR}") + +--- plugins/CMakeLists.txt.orig 2011-04-11 16:43:41.000000000 +0200 ++++ plugins/CMakeLists.txt 2011-04-11 16:20:26.000000000 +0200 +@@ -1,3 +1,4 @@ ++INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) + ADD_SUBDIRECTORY(clustering) + ADD_SUBDIRECTORY(colors) + ADD_SUBDIRECTORY(import)