svn commit: r499662 - in head: graphics/colmap math/ceres-solver

[Jan Beich]

Author: jbeich
Date: Mon Apr 22 17:38:04 2019
New Revision: 499662
URL: https://svnweb.freebsd.org/changeset/ports/499662

Log:
  math/ceres-solver: don't force GCC for OpenMP on -CURRENT
  
  Limited to amd64 and i386. LLVM openmp doesn't support other
  architectures on FreeBSD (unlike Linux) but it's only important where
  Clang is default e.g., aarch64, armv6, armv7.

Modified:
  head/graphics/colmap/Makefile   (contents, props changed)
  head/math/ceres-solver/Makefile   (contents, props changed)

Modified: head/graphics/colmap/Makefile
==============================================================================
--- head/graphics/colmap/Makefile	Mon Apr 22 17:37:56 2019	(r499661)
+++ head/graphics/colmap/Makefile	Mon Apr 22 17:38:04 2019	(r499662)
@@ -49,8 +49,10 @@ DOCS_PORTDOCS=		*
 
 OPENMP_USES=		compiler:openmp
 OPENMP_CMAKE_BOOL=	OPENMP_ENABLED
+.if !exists(/usr/include/omp.h)
 # XXX ports/199603 + ports/210337
 OPENMP_VARS=		OPENMP=gcc-
+.endif
 
 SIMD_CMAKE_BOOL=	SIMD_ENABLED
 

Modified: head/math/ceres-solver/Makefile
==============================================================================
--- head/math/ceres-solver/Makefile	Mon Apr 22 17:37:56 2019	(r499661)
+++ head/math/ceres-solver/Makefile	Mon Apr 22 17:38:04 2019	(r499662)
@@ -52,8 +52,10 @@ GFLAGS_CMAKE_BOOL=	GFLAGS
 
 OPENMP_USES=		compiler:openmp
 OPENMP_CMAKE_BOOL=	OPENMP
+.if !exists(/usr/include/omp.h)
 # XXX ports/199603 + ports/210337
 OPENMP_VARS=		OPENMP=gcc-
+.endif
 
 SCHUR_DESC=		Fixed-size schur specializations
 SCHUR_CMAKE_BOOL=	SCHUR_SPECIALIZATIONS