List:Commits« Previous MessageNext Message »
From:Vladislav Vaintroub Date:August 17 2010 4:05pm
Subject:RE: [Resend] bzr commit into mysql-5.5 branch (df:3078) Bug#51925
View as plain text  
Danny,
you still have to INSTALL generated ${HEADERS_GEN_CONFIGURE}
They are not necessarily in current source directory, in out-of-source builds they are
somewhere else.


> -----Original Message-----
> From: Daniel Fischer [mailto:df@stripped]
> Sent: Tuesday, August 17, 2010 2:20 PM
> To: commits@stripped
> Subject: [Resend] bzr commit into mysql-5.5 branch (df:3078) Bug#51925
> 
> [This commit e-mail is a repeat.]
> 
> #At file:///Users/df/bzr2/mysql-5.5-bug51925/ based on
> revid:alik@ibmvm-20100804081425-u3d3gh1urrrxcd5k
> 
>  3078 Daniel Fischer	2010-08-17
>       Bug#51925: Install all .h files in include/ in the exact same place as they are
> in bzr. This is an incompatible change from
5.1 and
> previous 5.5 releases that may affect the build process of software that uses MySQL
> libraries.
> 
>     modified:
>       include/CMakeLists.txt
> === modified file 'include/CMakeLists.txt'
> --- a/include/CMakeLists.txt	2010-02-10 19:23:24 +0000
> +++ b/include/CMakeLists.txt	2010-08-17 12:18:29 +0000
> @@ -13,51 +13,5 @@
>  # along with this program; if not, write to the Free Software
>  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
> 
> -SET(HEADERS_GEN_CONFIGURE
> -${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h
> -${CMAKE_CURRENT_BINARY_DIR}/my_config.h
> -${CMAKE_CURRENT_BINARY_DIR}/mysqld_ername.h
> -${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
> -${CMAKE_CURRENT_BINARY_DIR}/sql_state.h
> -)
> -SET(HEADERS_ABI
> -  mysql.h
> -  mysql_com.h
> -  mysql_time.h
> -  my_list.h
> -  my_alloc.h
> -  typelib.h
> -  mysql/plugin.h
> -  mysql/plugin_audit.h
> -  mysql/plugin_ftparser.h
> -)
> -
> -SET(HEADERS
> -  ${HEADERS_ABI}
> -  my_dbug.h
> -  m_string.h
> -  my_sys.h
> -  my_xml.h
> -  mysql_embed.h
> -  my_pthread.h
> -  my_no_pthread.h
> -  decimal.h
> -  errmsg.h
> -  my_global.h
> -  my_net.h
> -  my_getopt.h
> -  sslopt-longopts.h
> -  my_dir.h
> -  sslopt-vars.h
> -  sslopt-case.h
> -  sql_common.h
> -  keycache.h
> -  m_ctype.h
> -  my_attribute.h
> -  ${HEADERS_GEN_CONFIGURE}
> -)
> -
> -INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
> -INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}  COMPONENT Development
> FILES_MATCHING PATTERN "*.h" )
> -
> +INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}  COMPONENT Development
> FILES_MATCHING PATTERN "*.h" )
> 


Thread
[Resend] bzr commit into mysql-5.5 branch (df:3078) Bug#51925Daniel Fischer17 Aug
RE: [Resend] bzr commit into mysql-5.5 branch (df:3078) Bug#51925Vladislav Vaintroub17 Aug