svn commit: r470056 - head/math/ceres-solver/files

[Jan Beich]

Author: jbeich
Date: Tue May 15 20:54:02 2018
New Revision: 470056
URL: https://svnweb.freebsd.org/changeset/ports/470056

Log:
  math/ceres-solver: unbreak TBB=on (r470052 didn't help)
  
  In file included from internal/ceres/block_random_access_dense_matrix.cc:31:
  In file included from internal/ceres/block_random_access_dense_matrix.h:34:
  In file included from internal/ceres/block_random_access_matrix.h:36:
  In file included from internal/ceres/mutex.h:98:
  include/ceres/internal/port.h:56:4: error: One of CERES_USE_OPENMP, CERES_USE_TBB,CERES_USE_CXX11_THREADS or CERES_NO_THREADS must be defined.
   #  error One of CERES_USE_OPENMP, CERES_USE_TBB,CERES_USE_CXX11_THREADS or CERES_NO_THREADS must be defined.
      ^
  
  Pointy hat to:	jbeich

Modified:
  head/math/ceres-solver/files/patch-CMakeLists.txt   (contents, props changed)

Modified: head/math/ceres-solver/files/patch-CMakeLists.txt
==============================================================================
--- head/math/ceres-solver/files/patch-CMakeLists.txt	Tue May 15 20:43:10 2018	(r470055)
+++ head/math/ceres-solver/files/patch-CMakeLists.txt	Tue May 15 20:54:02 2018	(r470056)
@@ -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.