From owner-svn-ports-head@freebsd.org  Thu Dec  8 04:18:28 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 28711C6CD40;
 Thu,  8 Dec 2016 04:18:28 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EC041152B;
 Thu,  8 Dec 2016 04:18:27 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB84IRop044802;
 Thu, 8 Dec 2016 04:18:27 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB84IRdb044801;
 Thu, 8 Dec 2016 04:18:27 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201612080418.uB84IRdb044801@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 8 Dec 2016 04:18:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r428100 - head/graphics/colmap/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Dec 2016 04:18:28 -0000

Author: jbeich
Date: Thu Dec  8 04:18:26 2016
New Revision: 428100
URL: https://svnweb.freebsd.org/changeset/ports/428100

Log:
  graphics/colmap: don't append -O1 for debug builds

Modified:
  head/graphics/colmap/files/patch-src_util_CMakeLists.txt   (contents, props changed)

Modified: head/graphics/colmap/files/patch-src_util_CMakeLists.txt
==============================================================================
--- head/graphics/colmap/files/patch-src_util_CMakeLists.txt	Thu Dec  8 03:35:53 2016	(r428099)
+++ head/graphics/colmap/files/patch-src_util_CMakeLists.txt	Thu Dec  8 04:18:26 2016	(r428100)
@@ -1,11 +1,12 @@
 --- src/util/CMakeLists.txt.orig	2016-08-09 10:34:35 UTC
 +++ src/util/CMakeLists.txt
-@@ -23,3 +23,9 @@ COLMAP_ADD_TEST(random_test random_test.
+@@ -23,3 +23,10 @@ COLMAP_ADD_TEST(random_test random_test.
  COLMAP_ADD_TEST(string_test string_test.cc)
  COLMAP_ADD_TEST(threading_test threading_test.cc)
  COLMAP_ADD_TEST(timer_test timer_test.cc)
 +
-+if(IS_CLANG AND CMAKE_SIZEOF_VOID_P EQUAL 4)
++if(IS_CLANG AND CMAKE_SIZEOF_VOID_P EQUAL 4
++            AND CMAKE_CXX_FLAGS MATCHES "-O([2-9s]|fast)")
 +  # -O2 exceeds max memory on i386
 +  set_source_files_properties(camera_specs.cc
 +    PROPERTIES COMPILE_FLAGS "-O1")