Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 May 2018 20:42:12 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r470052 - head/math/ceres-solver/files
Message-ID:  <201805152042.w4FKgCKO085453@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue May 15 20:42:11 2018
New Revision: 470052
URL: https://svnweb.freebsd.org/changeset/ports/470052

Log:
  math/ceres-solver: unbreak TBB=on
  
  Determining if the include file pthread.h exists failed with the following output:
  Change Dir: /wrkdirs/usr/ports/math/ceres-solver/work/.build/CMakeFiles/CMakeTmp
  
  Run Build Command:"/usr/bin/make" "cmTC_b9506/fast"
  /usr/bin/make -f CMakeFiles/cmTC_b9506.dir/build.make CMakeFiles/cmTC_b9506.dir/build
  Building C object CMakeFiles/cmTC_b9506.dir/CheckIncludeFile.c.o
  /usr/bin/cc   -O2 -pipe  -fstack-protector -isystem /usr/local/include -fno-strict-aliasing -O2 -pipe -fstack-protector -isystem /usr/local/include -fno-strict-aliasing  -isystem /usr/local/include -std=c++11 -o CMakeFiles/cmTC_b9506.dir/CheckIncludeFile.c.o   -c /wrkdirs/usr/ports/math/ceres-solver/work/.build/CMakeFiles/CMakeTmp/CheckIncludeFile.c
  error: invalid argument '-std=c++11' not allowed with 'C/ObjC'
  *** Error code 1

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

Added: head/math/ceres-solver/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/ceres-solver/files/patch-CMakeLists.txt	Tue May 15 20:42:11 2018	(r470052)
@@ -0,0 +1,13 @@
+https://github.com/ceres-solver/ceres-solver/issues/355
+
+--- CMakeLists.txt.orig	2018-03-22 04:00:14 UTC
++++ CMakeLists.txt
+@@ -435,7 +435,7 @@ if (CXX11 AND COMPILER_HAS_CXX11_FLAG)
+   # Update CMAKE_REQUIRED_FLAGS used by CheckCXXSourceCompiles to include
+   # -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)
+ endif (CXX11 AND COMPILER_HAS_CXX11_FLAG)
+ 
+ # Set the Ceres compile definitions for the unordered_map configuration.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805152042.w4FKgCKO085453>