bk commit into 5.1 tree (antony:1.2605)

[antony]

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-02 14:25:48-07:00, antony@stripped +1 -0
  fix for 2.4.6 bug should be properly enclosed to not break other versions.

  sql/CMakeLists.txt@stripped, 2007-11-02 14:25:45-07:00, antony@stripped +2 -0
    fix for 2.4.6 bug should be properly enclosed to not break other versions.

diff -Nrup a/sql/CMakeLists.txt b/sql/CMakeLists.txt
--- a/sql/CMakeLists.txt	2007-09-04 02:06:56 -07:00
+++ b/sql/CMakeLists.txt	2007-11-02 14:25:45 -07:00
@@ -90,12 +90,14 @@ TARGET_LINK_LIBRARIES(mysqld
 
 SET_TARGET_PROPERTIES(mysqld PROPERTIES OUTPUT_NAME mysqld${MYSQLD_EXE_SUFFIX})
 
+IF(cmake_version EQUAL 20406)
 # Work around for 2.4.6 bug, OUTPUT_NAME will not set the right .PDB
 # file name. Note that COMPILE_FLAGS set some temporary pdb during build,
 # LINK_FLAGS sets the real one.
 SET_TARGET_PROPERTIES(mysqld PROPERTIES
                       COMPILE_FLAGS "/Fd${CMAKE_CFG_INTDIR}/mysqld${MYSQLD_EXE_SUFFIX}.pdb"
                       LINK_FLAGS  "/PDB:${CMAKE_CFG_INTDIR}/mysqld${MYSQLD_EXE_SUFFIX}.pdb")
+ENDIF(cmake_version EQUAL 20406)
 
 IF(EMBED_MANIFESTS)
   MYSQL_EMBED_MANIFEST("mysqld" "asInvoker")