View | Details | Raw Unified | Return to bug 239575
Collapse All | Expand All

(-)Makefile (-3 / +6 lines)
Lines 14-20 Link Here
14
14
15
BROKEN_aarch64=		fails to compile: mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
15
BROKEN_aarch64=		fails to compile: mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
16
16
17
USES=		cmake localbase:ldflags qt:5
17
USES=		cmake compiler:c++11-lang localbase:ldflags qt:5
18
USE_GITHUB=	yes
18
USE_GITHUB=	yes
19
GH_ACCOUNT=	CloudCompare
19
GH_ACCOUNT=	CloudCompare
20
GH_PROJECT=	${GH_ACCOUNT}
20
GH_PROJECT=	${GH_ACCOUNT}
Lines 48-54 Link Here
48
SHAPELIB_CMAKE_BOOL=	OPTION_USE_SHAPE_LIB
48
SHAPELIB_CMAKE_BOOL=	OPTION_USE_SHAPE_LIB
49
SHAPELIB_LIB_DEPENDS=	libshp.so:devel/shapelib
49
SHAPELIB_LIB_DEPENDS=	libshp.so:devel/shapelib
50
50
51
PLUGINS_USES=		eigen:3 jpeg python:2.7
51
PLUGINS_USES=		eigen:3 gl jpeg python:2.7
52
PLUGINS_CMAKE_BOOL=	INSTALL_QANIMATION_PLUGIN INSTALL_QBLUR_PLUGIN INSTALL_QBROOM_PLUGIN INSTALL_QCOMPASS_PLUGIN \
52
PLUGINS_CMAKE_BOOL=	INSTALL_QANIMATION_PLUGIN INSTALL_QBLUR_PLUGIN INSTALL_QBROOM_PLUGIN INSTALL_QCOMPASS_PLUGIN \
53
			INSTALL_QCSF_PLUGIN INSTALL_QCSV_MATRIX_IO_PLUGIN INSTALL_QDUMMY_PLUGIN INSTALL_QEDL_PLUGIN INSTALL_QFACETS_PLUGIN \
53
			INSTALL_QCSF_PLUGIN INSTALL_QCSV_MATRIX_IO_PLUGIN INSTALL_QDUMMY_PLUGIN INSTALL_QEDL_PLUGIN INSTALL_QFACETS_PLUGIN \
54
			INSTALL_QHPR_PLUGIN INSTALL_QM3C2_PLUGIN \
54
			INSTALL_QHPR_PLUGIN INSTALL_QM3C2_PLUGIN \
Lines 55-61 Link Here
55
			INSTALL_QPCV_PLUGIN INSTALL_QPHOTOSCAN_IO_PLUGIN INSTALL_QRANSAC_SD_PLUGIN \
55
			INSTALL_QPCV_PLUGIN INSTALL_QPHOTOSCAN_IO_PLUGIN INSTALL_QRANSAC_SD_PLUGIN \
56
			INSTALL_QSRA_PLUGIN INSTALL_QSSAO_PLUGIN # plugins requiring rare external libs are left out, TODO maybe add some of them?
56
			INSTALL_QSRA_PLUGIN INSTALL_QSSAO_PLUGIN # plugins requiring rare external libs are left out, TODO maybe add some of them?
57
PLUGINS_CMAKE_ON=	-DEIGEN_ROOT_DIR:BOOL=${LOCALBASE}/include/eigen3
57
PLUGINS_CMAKE_ON=	-DEIGEN_ROOT_DIR:BOOL=${LOCALBASE}/include/eigen3
58
PLUGINS_CXXFLAGS=	-Wno-narrowing
58
PLUGINS_CXXFLAGS=	${PLUGINS_CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
59
PLUGINS_CXXFLAGS_clang=	-Wno-narrowing
59
PLUGINS_CXXFLAGS+=	-DEIGEN_DONT_PARALLELIZE # OpenMP is broken in cmake: see bug#223678
60
PLUGINS_CXXFLAGS+=	-DEIGEN_DONT_PARALLELIZE # OpenMP is broken in cmake: see bug#223678
60
PLUGINS_USE=		XORG=ice,sm,x11,xext,xt GL=gl,glu
61
PLUGINS_USE=		XORG=ice,sm,x11,xext,xt GL=gl,glu
61
PLUGINS_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
62
PLUGINS_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
Lines 67-72 Link Here
67
			libvtkDomainsChemistry-6.2.so:math/vtk6
68
			libvtkDomainsChemistry-6.2.so:math/vtk6
68
PLUGINS_IMPLIES=	SHAPELIB
69
PLUGINS_IMPLIES=	SHAPELIB
69
70
71
CXXFLAGS_powerpc64=	-DNO_WARN_X86_INTRINSICS -mvsx
72
70
post-patch:
73
post-patch:
71
	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},1' ${WRKSRC}/snap/gui/ccViewer.desktop ${WRKSRC}/snap/gui/cloudcompare.desktop
74
	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},1' ${WRKSRC}/snap/gui/ccViewer.desktop ${WRKSRC}/snap/gui/cloudcompare.desktop
72
75

Return to bug 239575