Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 Dec 2016 04:18:27 +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: r428100 - head/graphics/colmap/files
Message-ID:  <201612080418.uB84IRdb044801@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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")



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