From: Bjorn Munch
Date: May 13 2011 11:58am
Subject: bzr commit into mysql-trunk branch (bjorn.munch:3082)
List-Archive: http://lists.mysql.com/commits/137313
Message-Id: <201105131158.p4DBwnDT020364@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/bm136801/my/main-tr/ based on revid:tor.didriksen@stripped

 3082 Bjorn Munch	2011-05-13 [merge]
      upmerge w/12549572

    modified:
      CMakeLists.txt
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2011-03-22 11:14:23 +0000
+++ b/CMakeLists.txt	2011-05-13 11:58:02 +0000
@@ -172,6 +172,13 @@ IF(ENABLE_DEBUG_SYNC)
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC") 
 ENDIF() 
  
+OPTION(ENABLE_GCOV "Enable gcov (debug, Linux builds only)" OFF)
+IF (ENABLE_GCOV AND NOT WIN32 AND NOT APPLE)
+  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage")
+  SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -lgcov")
+ENDIF()
+
 OPTION(ENABLED_LOCAL_INFILE
  "If we should should enable LOAD DATA LOCAL by default" ${IF_WIN})
 MARK_AS_ADVANCED(ENABLED_LOCAL_INFILE)

No bundle (reason: revision is a merge).