List:Commits« Previous MessageNext Message »
From:Vladislav Vaintroub Date:August 9 2010 7:47pm
Subject:bzr commit into mysql-5.5-bugfixing branch (vvaintroub:3171) Bug#55842
View as plain text  
#At file:///H:/bzr-new/mysql-5.5-bugfixing/ based on revid:alik@stripped

 3171 Vladislav Vaintroub	2010-08-09
      Bug #55842 CMake: bad dependencies on sql/lex_hash.h 
      
      Fix by adding "DEPENDS gen_lex_hash" to ADD_CUSTOM_COMMAND(),
      so it regenerates lex_hash.h whenever gen_lex_lash changes.
      
      Also, make sql dependent on GenServerSource to avoid concurrent 
      generation of lex_hash.h (once for sql , and in parallel for embedded)

    modified:
      sql/CMakeLists.txt
=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2010-08-05 16:38:24 +0000
+++ b/sql/CMakeLists.txt	2010-08-09 19:47:26 +0000
@@ -82,6 +82,7 @@ MYSQL_ADD_PLUGIN(partition ha_partition.
 RECOMPILE_FOR_EMBEDDED)
 
 ADD_LIBRARY(sql STATIC ${SQL_SOURCE})
+ADD_DEPENDENCIES(sql GenServerSource)
 DTRACE_INSTRUMENT(sql)
 TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATIC_PLUGIN_LIBS} 
   mysys dbug strings vio regex   
@@ -188,6 +189,7 @@ ADD_EXECUTABLE(gen_lex_hash gen_lex_hash
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h
   COMMAND gen_lex_hash > lex_hash.h
+  DEPENDS gen_lex_hash
 )
 
 MYSQL_ADD_EXECUTABLE(mysql_tzinfo_to_sql tztime.cc)


Attachment: [text/bzr-bundle] bzr/vvaintroub@mysql.com-20100809194726-gmb5v712fcu5rx0y.bundle
Thread
bzr commit into mysql-5.5-bugfixing branch (vvaintroub:3171) Bug#55842Vladislav Vaintroub9 Aug