merge

cmake/cmake_parse_arguments.cmake

@@ -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})

cmake/install_macros.cmake

@@ -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}
@@ -249,7 +249,7 @@ SET(DEBUGBUILDDIR "${BINARY_PARENTDIR}/debug" CACHE INTERNAL "Directory of debug
 
 
 FUNCTION(INSTALL_DEBUG_TARGET target)
- CMAKE_PARSE_ARGUMENTS(ARG
+ MYSQL_PARSE_ARGUMENTS(ARG
   "DESTINATION;RENAME;PDB_DESTINATION;COMPONENT"
   ""
   ${ARGN}

cmake/libutils.cmake

@@ -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}

cmake/mysql_add_executable.cmake

@@ -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}

cmake/plugin.cmake

@@ -28,7 +28,7 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/cmake_parse_arguments.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}