bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4410)

[magnus.blaudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4410 magnus.blaudd@stripped	2011-05-24 [merge]
      Merge

    modified:
      CMakeLists.txt
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2011-05-24 08:33:20 +0000
+++ b/CMakeLists.txt	2011-05-24 11:41:58 +0000
@@ -128,6 +128,14 @@ IF(MSVC)
     # generate map files, set stack size (see bug#20815)
     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")
     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1048576")
+    IF(NOT MCP_BUG11765145)
+      # Fails to link with error message about missing .map file, turn
+      # off incremental linking to workaround problem 
+      IF(CMAKE_GENERATOR MATCHES "Visual Studio 10")
+        MESSAGE(STATUS "Turning off incremental linking for VS 2010")
+        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL:NO")
+      ENDIF()
+    ENDIF()
 
     # remove support for Exception handling
     STRING(REPLACE "/GX"   "" CMAKE_CXX_FLAGS            ${CMAKE_CXX_FLAGS})

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).