Bug #12586211 ENABLE GCOV BUILDS WITH CMAKE, INCLUDING PLUGINS

Added --with-gcov option to configure.pl and use that from SETUP.sh

2 files changed, 7 insertions, 2 deletions

diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index c7f434d1bb3..00bd4965f87 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -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 -DMYSQL_SERVER_SUFFIX=-gcov -DHAVE_gcov"
 
 gcov_link_flags="-fprofile-arcs -ftest-coverage"
 
-gcov_configs="--disable-shared"
+gcov_configs="--with-gcov"
 
 # gprof
 
diff --git a/cmake/configure.pl b/cmake/configure.pl
index b24afa034c7..bf872264953 100644
--- a/cmake/configure.pl
+++ b/cmake/configure.pl
@@ -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;