List:Commits« Previous MessageNext Message »
From:Ignacio Galarza Date:October 24 2007 6:07pm
Subject:bk commit into 5.1 tree (iggy:1.2595) BUG#31217
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of iggy. When iggy 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-10-24 14:07:13-04:00, iggy@amd64.(none) +1 -0
  Bug#31217 C1033 compilation error on Windows
  - When a forward slash is used immediately following a VS option ie
  $(OutDir)/... cmake adds this compiler option "$"(OutDir)/... to the 
  VS solution.
  - When a back slash is used as a path seperator instead the option 
  is properly quoted $(OutDir)\...

  sql/CMakeLists.txt@stripped, 2007-10-24 14:07:10-04:00, iggy@amd64.(none) +2 -2
    Bug#31217 C1033 compilation error on Windows
    - Use Windows path seperator to make sure cmake properly quotes 
    the compiler option.

diff -Nrup a/sql/CMakeLists.txt b/sql/CMakeLists.txt
--- a/sql/CMakeLists.txt	2007-09-04 05:06:56 -04:00
+++ b/sql/CMakeLists.txt	2007-10-24 14:07:10 -04:00
@@ -94,8 +94,8 @@ SET_TARGET_PROPERTIES(mysqld PROPERTIES 
 # 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")
+                      COMPILE_FLAGS "/Fd${CMAKE_CFG_INTDIR}\\mysqld${MYSQLD_EXE_SUFFIX}.pdb"
+                      LINK_FLAGS  "/PDB:${CMAKE_CFG_INTDIR}\\mysqld${MYSQLD_EXE_SUFFIX}.pdb")
 
 IF(EMBED_MANIFESTS)
   MYSQL_EMBED_MANIFEST("mysqld" "asInvoker")
Thread
bk commit into 5.1 tree (iggy:1.2595) BUG#31217Ignacio Galarza24 Oct