List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:May 24 2011 1:31pm
Subject:bzr commit into mysql-5.5-mtr branch (bjorn.munch:3218) Bug#12586211
View as plain text  
#At file:///home/bm136801/my/gccm-55/ based on revid:bjorn.munch@stripped

 3218 Bjorn Munch	2011-05-24
      Bug #12586211 ENABLE GCOV BUILDS WITH CMAKE, INCLUDING PLUGINS
      Added --with-gcov option to configure.pl and use that from SETUP.sh

    modified:
      BUILD/SETUP.sh
      cmake/configure.pl
=== modified file 'BUILD/SETUP.sh'
--- a/BUILD/SETUP.sh	2011-05-06 09:20:01 +0000
+++ b/BUILD/SETUP.sh	2011-05-24 13:30:33 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2000, 2007 MySQL AB
+# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -250,7 +250,7 @@ gcov_compile_flags="$gcov_compile_flags
 
 gcov_link_flags="-fprofile-arcs -ftest-coverage"
 
-gcov_configs="--disable-shared"
+gcov_configs="--with-gcov"
 
 # gprof
 

=== modified file 'cmake/configure.pl'
--- a/cmake/configure.pl	2010-11-12 01:33:19 +0000
+++ b/cmake/configure.pl	2011-05-24 13:30:33 +0000
@@ -190,6 +190,11 @@ foreach my $option (@ARGV)
     $cmakeargs = $cmakeargs." \"-DWITH_COMMENT=".substr($option,13)."\""; 
     next;
   }
+  if ($option =~ /with-gcov/)
+  {
+      $cmakeargs = $cmakeargs." -DENABLE_GCOV=ON"; 
+      next;
+  }
 
   $option = uc($option);
   $option =~ s/-/_/g;


Attachment: [text/bzr-bundle] bzr/bjorn.munch@oracle.com-20110524133033-kgt3x5j0w1lcj3u0.bundle
Thread
bzr commit into mysql-5.5-mtr branch (bjorn.munch:3218) Bug#12586211Bjorn Munch24 May