bzr commit into mysql-trunk-merge branch (Georgi.Kodinov:3201)

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/work/merge-trunk-merge/ based on revid:georgi.kodinov@stripped

 3201 Georgi Kodinov	2010-09-29 [merge]
      merge

    modified:
      cmake/cmake_parse_arguments.cmake
      cmake/install_macros.cmake
      cmake/libutils.cmake
      cmake/mysql_add_executable.cmake
      cmake/plugin.cmake
=== modified file 'cmake/cmake_parse_arguments.cmake'
--- a/cmake/cmake_parse_arguments.cmake	2009-12-12 01:03:05 +0000
+++ b/cmake/cmake_parse_arguments.cmake	2010-09-29 09:42:35 +0000
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 # Handy macro to parse macro arguments
-MACRO(CMAKE_PARSE_ARGUMENTS prefix arg_names option_names)
+MACRO(MYSQL_PARSE_ARGUMENTS prefix arg_names option_names)
   SET(DEFAULT_ARGS)
   FOREACH(arg_name ${arg_names})    
     SET(${prefix}_${arg_name})

=== modified file 'cmake/install_macros.cmake'
--- a/cmake/install_macros.cmake	2010-06-30 21:08:12 +0000
+++ b/cmake/install_macros.cmake	2010-09-29 15:46:12 +0000
@@ -83,7 +83,7 @@ FUNCTION(INSTALL_MANPAGE file)
 ENDFUNCTION()
 
 FUNCTION(INSTALL_SCRIPT)
- CMAKE_PARSE_ARGUMENTS(ARG
+ MYSQL_PARSE_ARGUMENTS(ARG
   "DESTINATION;COMPONENT"
   ""
   ${ARGN}
@@ -205,7 +205,7 @@ ENDMACRO()
 #
 
 FUNCTION(MYSQL_INSTALL_TARGETS)
-  CMAKE_PARSE_ARGUMENTS(ARG
+  MYSQL_PARSE_ARGUMENTS(ARG
     "DESTINATION;COMPONENT"
   ""
   ${ARGN}
@@ -247,7 +247,7 @@ SET(DEBUGBUILDDIR "${BINARY_PARENTDIR}/d
 
 
 FUNCTION(INSTALL_DEBUG_TARGET target)
- CMAKE_PARSE_ARGUMENTS(ARG
+ MYSQL_PARSE_ARGUMENTS(ARG
   "DESTINATION;RENAME;PDB_DESTINATION;COMPONENT"
   ""
   ${ARGN}

=== modified file 'cmake/libutils.cmake'
--- a/cmake/libutils.cmake	2010-06-21 13:20:18 +0000
+++ b/cmake/libutils.cmake	2010-09-29 15:46:12 +0000
@@ -213,7 +213,7 @@ ENDMACRO()
 #  [OUTPUT_NAME output_name]
 #)
 MACRO(MERGE_LIBRARIES)
-  CMAKE_PARSE_ARGUMENTS(ARG
+  MYSQL_PARSE_ARGUMENTS(ARG
     "EXPORTS;OUTPUT_NAME;COMPONENT"
     "STATIC;SHARED;MODULE;NOINSTALL"
     ${ARGN}

=== modified file 'cmake/mysql_add_executable.cmake'
--- a/cmake/mysql_add_executable.cmake	2010-06-21 13:20:18 +0000
+++ b/cmake/mysql_add_executable.cmake	2010-09-29 15:46:12 +0000
@@ -28,7 +28,7 @@ INCLUDE(cmake_parse_arguments)
 
 FUNCTION (MYSQL_ADD_EXECUTABLE)
   # Pass-through arguments for ADD_EXECUTABLE
-  CMAKE_PARSE_ARGUMENTS(ARG
+  MYSQL_PARSE_ARGUMENTS(ARG
    "WIN32;MACOSX_BUNDLE;EXCLUDE_FROM_ALL;DESTINATION;COMPONENT"
    ""
    ${ARGN}

=== modified file 'cmake/plugin.cmake'
--- a/cmake/plugin.cmake	2010-08-05 16:45:21 +0000
+++ b/cmake/plugin.cmake	2010-09-29 15:46:12 +0000
@@ -28,7 +28,7 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/cmake_
 # [DEPENDENCIES target1...targetN]
 
 MACRO(MYSQL_ADD_PLUGIN)
-  CMAKE_PARSE_ARGUMENTS(ARG
+  MYSQL_PARSE_ARGUMENTS(ARG
     "LINK_LIBRARIES;DEPENDENCIES;MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME"
     "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED"
     ${ARGN}


Attachment: [text/bzr-bundle] bzr/[e-mail]