bzr commit into mysql-5.1 branch (df:2712)

[Daniel Fischer]

#At file:///shared/home/df/mysql/bazaar/mysql-5.1-winbuild-merge/

 2712 Daniel Fischer	2008-10-21
      fixes
modified:
  libmysql/CMakeLists.txt
  libmysqld/CMakeLists.txt
  win/install_macros.cmake

=== modified file 'libmysql/CMakeLists.txt'
--- a/libmysql/CMakeLists.txt	2008-10-21 11:27:15 +0000
+++ b/libmysql/CMakeLists.txt	2008-10-21 12:32:40 +0000
@@ -125,11 +125,11 @@ ADD_LIBRARY(libmysql          SHARED ${C
 INSTALL_REL_LIB(mysqlclient lib/opt)
 INSTALL_DBG_LIB(mysqlclient lib/debug)
 
-INSTALL_REL_LIB(libmysql lib/opt)
-INSTALL_DBG_LIB(libmysql lib/debug)
+INSTALL_REL_DLL(libmysql lib/opt)
+INSTALL_DBG_DLL(libmysql lib/debug)
 
 # For legacy reason we want a copy of "libmysql.ddl" in "bin"
-INSTALL_REL_LIB(libmysql bin)
+INSTALL_REL_DLL(libmysql bin)
 
 IF(WIN32)
   SET_TARGET_PROPERTIES(libmysql mysqlclient PROPERTIES COMPILE_FLAGS "-DUSE_TLS")

=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt	2008-10-21 11:27:15 +0000
+++ b/libmysqld/CMakeLists.txt	2008-10-21 12:32:40 +0000
@@ -226,7 +226,7 @@ TARGET_LINK_LIBRARIES(libmysqld mysqlser
 # CMake 2.4-patch 7 has a bug, if MODULE only the DLL gets installed,
 # and if SHARED the "libmysqld.exp" gets left out. So here we *need*
 # to use INSTALL(FILES...) instead of INSTALL(TARGETS...)
-INSTALL_REL_LIB(libmysqld Embedded/DLL/release)
-INSTALL_DBG_LIB(libmysqld Embedded/DLL/debug)
+INSTALL_REL_DLL(libmysqld Embedded/DLL/release)
+INSTALL_DBG_DLL(libmysqld Embedded/DLL/debug)
 INSTALL_REL_LIB(mysqlserver Embedded/static/release)
 INSTALL_DBG_LIB(mysqlserver Embedded/static/debug)

=== modified file 'win/install_macros.cmake'
--- a/win/install_macros.cmake	2008-10-21 11:27:15 +0000
+++ b/win/install_macros.cmake	2008-10-21 12:32:40 +0000
@@ -50,29 +50,49 @@ MACRO(INSTALL_DBG_EXE_WITH_MAP_IF_EXISTS
 ENDMACRO(INSTALL_DBG_EXE_WITH_MAP_IF_EXISTS)
 
 MACRO(INSTALL_REL_LIB FILE DEST)
-  INSTALL(FILES RelWithDebInfo/${FILE}.dll DESTINATION ${DEST})
   INSTALL(FILES RelWithDebInfo/${FILE}.lib DESTINATION ${DEST})
   INSTALL(FILES RelWithDebInfo/${FILE}.pdb DESTINATION ${DEST})
-  INSTALL(FILES RelWithDebInfo/${FILE}.exp DESTINATION ${DEST})
 ENDMACRO(INSTALL_REL_LIB)
 
+MACRO(INSTALL_REL_LIB_IF_EXISTS FILE DEST)
+  INSTALL(FILES RelWithDebInfo/${FILE}.lib DESTINATION ${DEST} OPTIONAL)
+  INSTALL(FILES RelWithDebInfo/${FILE}.pdb DESTINATION ${DEST} OPTIONAL)
+ENDMACRO(INSTALL_REL_LIB_IF_EXISTS)
+
+MACRO(INSTALL_DBG_LIB FILE DEST)
+  INSTALL(FILES debug/${FILE}.lib DESTINATION ${DEST})
+  INSTALL(FILES debug/${FILE}.pdb DESTINATION ${DEST})
+ENDMACRO(INSTALL_DBG_LIB)
+
 MACRO(INSTALL_DBG_LIB_IF_EXISTS FILE DEST)
-  INSTALL(FILES debug/${FILE}.dll DESTINATION ${DEST} OPTIONAL)
   INSTALL(FILES debug/${FILE}.lib DESTINATION ${DEST} OPTIONAL)
   INSTALL(FILES debug/${FILE}.pdb DESTINATION ${DEST} OPTIONAL)
-  INSTALL(FILES debug/${FILE}.exp DESTINATION ${DEST} OPTIONAL)
 ENDMACRO(INSTALL_DBG_LIB_IF_EXISTS)
 
-MACRO(INSTALL_DBG_LIB FILE DEST)
+MACRO(INSTALL_REL_DLL FILE DEST)
+  INSTALL(FILES RelWithDebInfo/${FILE}.dll DESTINATION ${DEST})
+  INSTALL(FILES RelWithDebInfo/${FILE}.lib DESTINATION ${DEST})
+  INSTALL(FILES RelWithDebInfo/${FILE}.pdb DESTINATION ${DEST})
+  INSTALL(FILES RelWithDebInfo/${FILE}.exp DESTINATION ${DEST})
+ENDMACRO(INSTALL_REL_DLL)
+
+MACRO(INSTALL_REL_DLL_IF_EXISTS FILE DEST)
+  INSTALL(FILES RelWithDebInfo/${FILE}.dll DESTINATION ${DEST} OPTIONAL)
+  INSTALL(FILES RelWithDebInfo/${FILE}.lib DESTINATION ${DEST} OPTIONAL)
+  INSTALL(FILES RelWithDebInfo/${FILE}.pdb DESTINATION ${DEST} OPTIONAL)
+  INSTALL(FILES RelWithDebInfo/${FILE}.exp DESTINATION ${DEST} OPTIONAL)
+ENDMACRO(INSTALL_REL_DLL_IF_EXISTS)
+
+MACRO(INSTALL_DBG_DLL FILE DEST)
   INSTALL(FILES debug/${FILE}.dll DESTINATION ${DEST})
   INSTALL(FILES debug/${FILE}.lib DESTINATION ${DEST})
   INSTALL(FILES debug/${FILE}.pdb DESTINATION ${DEST})
   INSTALL(FILES debug/${FILE}.exp DESTINATION ${DEST})
-ENDMACRO(INSTALL_DBG_LIB)
+ENDMACRO(INSTALL_DBG_DLL)
 
-MACRO(INSTALL_DBG_LIB_IF_EXISTS FILE DEST)
+MACRO(INSTALL_DBG_DLL_IF_EXISTS FILE DEST)
   INSTALL(FILES debug/${FILE}.dll DESTINATION ${DEST} OPTIONAL)
   INSTALL(FILES debug/${FILE}.lib DESTINATION ${DEST} OPTIONAL)
   INSTALL(FILES debug/${FILE}.pdb DESTINATION ${DEST} OPTIONAL)
   INSTALL(FILES debug/${FILE}.exp DESTINATION ${DEST} OPTIONAL)
-ENDMACRO(INSTALL_DBG_LIB_IF_EXISTS)
+ENDMACRO(INSTALL_DBG_DLL_IF_EXISTS)