MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:georg Date:August 28 2006 4:08pm
Subject:bk commit into 5.0 tree (georg:1.2247)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of georg. When georg 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, 2006-08-28 18:08:18+02:00, georg@stripped +1 -0
  Latest fix for csv was wrong (cmake used cached configuration).

  sql/CMakeLists.txt@stripped, 2006-08-28 18:08:15+02:00, georg@stripped +7 -6
    Latest fix for csv was wrong (cmake used cached configuration).

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	georg
# Host:	lmy002.wdf.sap.corp
# Root:	/home/georg/work/mysql/prod/mysql-5.0-cmake

--- 1.4/sql/CMakeLists.txt	2006-08-28 18:08:26 +02:00
+++ 1.5/sql/CMakeLists.txt	2006-08-28 18:08:26 +02:00
@@ -62,24 +62,25 @@
 			   ${PROJECT_SOURCE_DIR}/include/mysql_version.h 
 			   ${PROJECT_SOURCE_DIR}/sql/lex_hash.h)
 
+TARGET_LINK_LIBRARIES(mysqld heap myisam myisammrg mysys yassl zlib dbug yassl 
+                      taocrypt strings vio regex wsock32)
+
 IF(WITH_CSV_STORAGE_ENGINE)
-  SET(ADD_LIBS "${ADD_LIBS} csv")
+  TARGET_LINK_LIBRARIES(mysqld csv)
 ENDIF(WITH_CSV_STORAGE_ENGINE)
 
 IF(WITH_EXAMPLE_STORAGE_ENGINE)
-  SET(ADD_LIBS "${ADD_LIBS} example")
+  TARGET_LINK_LIBRARIES(mysqld example)
 ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)
 
 IF(WITH_INNOBASE_STORAGE_ENGINE)
-  SET(ADD_LIBS "${ADD_LIBS} innobase")
+  TARGET_LINK_LIBRARIES(mysqld innobase)
 ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
 
 IF(WITH_BERKELEY_STORAGE_ENGINE)
-  SET(ADD_LIBS "${ADD_LIBS} bdb")
+  TARGET_LINK_LIBRARIES(mysqld bdb)
 ENDIF(WITH_BERKELEY_STORAGE_ENGINE)
 
-TARGET_LINK_LIBRARIES(mysqld heap myisam myisammrg mysys yassl zlib dbug yassl 
-                      taocrypt strings vio regex wsock32 ${ADD_LIBS})
 
 ADD_DEPENDENCIES(mysqld GenError)
 
Thread
bk commit into 5.0 tree (georg:1.2247)georg28 Aug