diff options
| author | martin-s <webmaster@macside.net> | 2018-06-16 16:42:25 +0000 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-06-16 18:42:25 +0200 |
| commit | c2b9c33adf25ac78fac63ddd0ea9b26a923e1b6e (patch) | |
| tree | 33828575872586965e7c943738cb359c558828c0 /scripts | |
| parent | 3726ce95576204cc8a2c37d07a1ae74b0b70c1d2 (diff) | |
| download | vcpkg-c2b9c33adf25ac78fac63ddd0ea9b26a923e1b6e.tar.gz vcpkg-c2b9c33adf25ac78fac63ddd0ea9b26a923e1b6e.zip | |
Added parameter to vcpkg_copy_pdbs.cmake (#3688)
* - Added paths argument to locate pdbs.
* n/a
* - fixed line endings.
* [vcpkg-copy-pdbs] Tweak argument to replace patterns instead of adding patterns. Add slightly more detailed documentation.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_copy_pdbs.cmake | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/scripts/cmake/vcpkg_copy_pdbs.cmake b/scripts/cmake/vcpkg_copy_pdbs.cmake index ca55eb015..4e9f642b5 100644 --- a/scripts/cmake/vcpkg_copy_pdbs.cmake +++ b/scripts/cmake/vcpkg_copy_pdbs.cmake @@ -4,17 +4,32 @@ ## ## ## Usage ## ```cmake -## vcpkg_copy_pdbs() +## vcpkg_copy_pdbs([BUILD_PATHS <${CURRENT_PACKAGES_DIR}/bin/*.dll> ...]) ## ``` ## ## ## Notes ## This command should always be called by portfiles after they have finished rearranging the binary output. ## +## ## Parameters +## ### BUILD_PATHS +## Path patterns passed to `file(GLOB_RECURSE)` for locating dlls. +## +## Defaults to `${CURRENT_PACKAGES_DIR}/bin/*.dll` and `${CURRENT_PACKAGES_DIR}/debug/bin/*.dll`. +## ## ## Examples ## ## * [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) ## * [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) function(vcpkg_copy_pdbs) + cmake_parse_arguments(_vcp "" "" "BUILD_PATHS" ${ARGN}) + + if(NOT _vcp_BUILD_PATHS) + set( + _vcp_BUILD_PATHS + ${CURRENT_PACKAGES_DIR}/bin/*.dll + ${CURRENT_PACKAGES_DIR}/debug/bin/*.dll + ) + endif() function(merge_filelist OUTVAR INVAR) set(MSG "") @@ -25,7 +40,7 @@ function(vcpkg_copy_pdbs) endfunction() if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(GLOB_RECURSE DLLS ${CURRENT_PACKAGES_DIR}/bin/*.dll ${CURRENT_PACKAGES_DIR}/debug/bin/*.dll) + file(GLOB_RECURSE DLLS ${_vcp_BUILD_PATHS}) set(DLLS_WITHOUT_MATCHING_PDBS) |