svn commit: r470058 - in branches/2018Q2/math/ceres-solver: . files

[Jan Beich]

Author: jbeich
Date: Tue May 15 21:01:24 2018
New Revision: 470058
URL: https://svnweb.freebsd.org/changeset/ports/470058

Log:
  MFH: r470051 r470052 r470053 r470054 r470055 r470056
  
  math/ceres-solver: fix LAPACK options after r465552/r465553
  
  - NETLIB used wrong library
  - OPENBLAS was nop
  - ATLAS didn't build
  
  Approved by:	ports-secteam blanket

Added:
  branches/2018Q2/math/ceres-solver/files/
     - copied from r470052, head/math/ceres-solver/files/
Modified:
  branches/2018Q2/math/ceres-solver/Makefile
  branches/2018Q2/math/ceres-solver/files/patch-CMakeLists.txt
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/math/ceres-solver/Makefile
==============================================================================
--- branches/2018Q2/math/ceres-solver/Makefile	Tue May 15 21:00:46 2018	(r470057)
+++ branches/2018Q2/math/ceres-solver/Makefile	Tue May 15 21:01:24 2018	(r470058)
@@ -2,6 +2,7 @@
 
 PORTNAME=	ceres-solver
 DISTVERSION=	1.14.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	jbeich at FreeBSD.org
@@ -69,19 +70,24 @@ TEST_IMPLIES=		GFLAGS
 LAPACK_DESC=		Linear Algebra PACKage
 LAPACK_USES=		fortran # LDFLAGS
 LAPACK_CMAKE_BOOL=	LAPACK
+LAPACK_CMAKE_ON=	-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW # USES=fortran
+# Avoid conflict with Ceres threading by using single-threaded BLAS library.
+# BLASLIB from USES=blaslapack cannot be used as it's multi-threaded.
+# https://github.com/xianyi/OpenBLAS/wiki/faq#multi-threaded
 ATLAS_USES=		blaslapack:atlas
-ATLAS_MAKE_ENV=		BLA_VENDOR=ATLAS
-ATLAS_CMAKE_ON=		-DLAPACK_LIBRARIES:STRING=alapack
+ATLAS_CMAKE_ON=		-DBLA_VENDOR:STRING="ATLAS" \
+			-DBLAS_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libcblas.so" \
+			-DLAPACK_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libalapack.so"
 ATLAS_IMPLIES=		LAPACK
 GOTOBLAS_DESC=		Goto blas implementation
 GOTOBLAS_USES=		blaslapack:gotoblas
-GOTOBLAS_MAKE_ENV=	BLA_VENDOR=Goto
+GOTOBLAS_CMAKE_ON=	-DBLA_VENDOR:STRING="Goto"
 GOTOBLAS_IMPLIES=	LAPACK
 NETLIB_USES=		blaslapack:netlib
-NETLIB_MAKE_ENV=	BLA_VENDOR=Generic
+NETLIB_CMAKE_ON=	-DBLA_VENDOR:STRING="Generic"
 NETLIB_IMPLIES=		LAPACK
 OPENBLAS_USES=		blaslapack:openblas
-OPENBLAS_MAKE_ENV=	BLA_VENDOR=OpenBLAS
+OPENBLAS_CMAKE_ON=	-DBLA_VENDOR:STRING="OpenBLAS"
 OPENBLAS_IMPLIES=	LAPACK
 
 SPARSE_DESC=		Sparse linear algebra library

Modified: branches/2018Q2/math/ceres-solver/files/patch-CMakeLists.txt
==============================================================================
--- head/math/ceres-solver/files/patch-CMakeLists.txt	Tue May 15 20:42:11 2018	(r470052)
+++ branches/2018Q2/math/ceres-solver/files/patch-CMakeLists.txt	Tue May 15 21:01:24 2018	(r470058)
@@ -7,7 +7,7 @@ https://github.com/ceres-solver/ceres-solver/issues/35
    # -std=c++11 s/t we will detect the C++11 versions of unordered_map &
    # shared_ptr if they exist.
 -  set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++11")
-+  set(CMAKE_CXX_STANDARD 11)
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
  endif (CXX11 AND COMPILER_HAS_CXX11_FLAG)
  
  # Set the Ceres compile definitions for the unordered_map configuration.