diff options
| author | Brad King <brad.king@kitware.com> | 2009-04-09 17:56:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-04-09 17:56:08 (GMT) |
| commit | 68248be52ec69f06e41c52dcf950caf7d6f2da08 (patch) | |
| tree | 6ae3d3ffc890aeb8f33b40e21d7b907fad93286e /Modules | |
| parent | dfd95e100dc5fcfd428cdc00f1d79d44c99449ac (diff) | |
| download | CMake-68248be52ec69f06e41c52dcf950caf7d6f2da08.zip CMake-68248be52ec69f06e41c52dcf950caf7d6f2da08.tar.gz CMake-68248be52ec69f06e41c52dcf950caf7d6f2da08.tar.bz2 | |
ENH: Allow lists in AddExternalProject arguments
The add_external_project function separates its arguments with ';'
separators, so previously no command line argument could contain one.
When specifying CMAKE_ARGS, some -D argument values may need to contain
a semicolon to form lists in the external project cache.
This adds add_external_project argument LIST_SEPARATOR to specify a list
separator string. The separator is replaced by ';' in arguments to any
command created to drive the external project. For example:
add_external_project(...
LIST_SEPARATOR ::
CMAKE_ARGS -DSOME_LIST:STRING=A::B::C
...)
passes "-DSOME_LIST:STRING=A;B;C" to CMake for the external project.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/AddExternalProject.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Modules/AddExternalProject.cmake b/Modules/AddExternalProject.cmake index 2474de8..be1ab85 100644 --- a/Modules/AddExternalProject.cmake +++ b/Modules/AddExternalProject.cmake @@ -211,6 +211,12 @@ function(add_external_project_step name step) endif() get_property(work_dir TARGET ${name} PROPERTY AEP_${step}_WORKING_DIRECTORY) + # Replace list separators. + get_property(sep TARGET ${name} PROPERTY AEP_LIST_SEPARATOR) + if(sep AND command) + string(REPLACE "${sep}" "\\;" command "${command}") + endif() + # Custom comment? get_property(comment_set TARGET ${name} PROPERTY AEP_${step}_COMMENT SET) if(comment_set) @@ -594,6 +600,7 @@ foreach(key IN ITEMS DOWNLOAD_COMMAND INSTALL_ARGS INSTALL_COMMAND + LIST_SEPARATOR PATCH_COMMAND SVN_REPOSITORY SVN_TAG |