database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Rename CMAKE_PARSE_ARGUMENTS macro to avoid name collision

Browse Source 
with CMake 2.8.3 builtin macro
This commit is contained in:
Vladislav Vaintroub
2010-09-29 11:42:35 +02:00
parent 76f4cfde66
commit bc684baba2
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/cmake_parse_arguments.cmake
View File

@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Handy macro to parse macro arguments # 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) SET(DEFAULT_ARGS)
FOREACH(arg_name ${arg_names}) FOREACH(arg_name ${arg_names})
SET(${prefix}_${arg_name}) SET(${prefix}_${arg_name})

6
cmake/install_macros.cmake
View File

@ -83,7 +83,7 @@ FUNCTION(INSTALL_MANPAGE file)
ENDFUNCTION() ENDFUNCTION()
FUNCTION(INSTALL_SCRIPT) FUNCTION(INSTALL_SCRIPT)
CMAKE_PARSE_ARGUMENTS(ARG MYSQL_PARSE_ARGUMENTS(ARG
"DESTINATION;COMPONENT" "DESTINATION;COMPONENT"
"" ""
${ARGN} ${ARGN}
@ -205,7 +205,7 @@ ENDMACRO()
# #
FUNCTION(MYSQL_INSTALL_TARGETS) FUNCTION(MYSQL_INSTALL_TARGETS)
CMAKE_PARSE_ARGUMENTS(ARG MYSQL_PARSE_ARGUMENTS(ARG
"DESTINATION;COMPONENT" "DESTINATION;COMPONENT"
"" ""
${ARGN} ${ARGN}
@ -249,7 +249,7 @@ SET(DEBUGBUILDDIR "${BINARY_PARENTDIR}/debug" CACHE INTERNAL "Directory of debug
FUNCTION(INSTALL_DEBUG_TARGET target) FUNCTION(INSTALL_DEBUG_TARGET target)
CMAKE_PARSE_ARGUMENTS(ARG MYSQL_PARSE_ARGUMENTS(ARG
"DESTINATION;RENAME;PDB_DESTINATION;COMPONENT" "DESTINATION;RENAME;PDB_DESTINATION;COMPONENT"
"" ""
${ARGN} ${ARGN}

2
cmake/libutils.cmake
View File

@ -213,7 +213,7 @@ ENDMACRO()
# [OUTPUT_NAME output_name] # [OUTPUT_NAME output_name]
#) #)
MACRO(MERGE_LIBRARIES) MACRO(MERGE_LIBRARIES)
CMAKE_PARSE_ARGUMENTS(ARG MYSQL_PARSE_ARGUMENTS(ARG
"EXPORTS;OUTPUT_NAME;COMPONENT" "EXPORTS;OUTPUT_NAME;COMPONENT"
"STATIC;SHARED;MODULE;NOINSTALL" "STATIC;SHARED;MODULE;NOINSTALL"
${ARGN} ${ARGN}

2
cmake/mysql_add_executable.cmake
View File

@ -28,7 +28,7 @@ INCLUDE(cmake_parse_arguments)
FUNCTION (MYSQL_ADD_EXECUTABLE) FUNCTION (MYSQL_ADD_EXECUTABLE)
# Pass-through arguments for ADD_EXECUTABLE # Pass-through arguments for ADD_EXECUTABLE
CMAKE_PARSE_ARGUMENTS(ARG MYSQL_PARSE_ARGUMENTS(ARG
"WIN32;MACOSX_BUNDLE;EXCLUDE_FROM_ALL;DESTINATION;COMPONENT" "WIN32;MACOSX_BUNDLE;EXCLUDE_FROM_ALL;DESTINATION;COMPONENT"
"" ""
${ARGN} ${ARGN}

2
cmake/plugin.cmake
View File

@ -28,7 +28,7 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/cmake_parse_arguments.cmake)
# [DEPENDENCIES target1...targetN] # [DEPENDENCIES target1...targetN]
MACRO(MYSQL_ADD_PLUGIN) MACRO(MYSQL_ADD_PLUGIN)
CMAKE_PARSE_ARGUMENTS(ARG MYSQL_PARSE_ARGUMENTS(ARG
"LINK_LIBRARIES;DEPENDENCIES;MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME" "LINK_LIBRARIES;DEPENDENCIES;MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME"
"STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED" "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED"
${ARGN} ${ARGN}