diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-05-24 21:02:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-24 12:02:20 -0700 |
| commit | 8f6e982c35f837c56207c761c5b570ad322ae753 (patch) | |
| tree | 418df6264a5d2b1fa8c80818a5b375b41e79c6bc /ports | |
| parent | 01ba491712d6ff666f49d513ebca4b2e165bb55f (diff) | |
| download | vcpkg-8f6e982c35f837c56207c761c5b570ad322ae753.tar.gz vcpkg-8f6e982c35f837c56207c761c5b570ad322ae753.zip | |
[vcpkg-cmake-config] Fix removal of files in `debug/share` (#18063)
* Actually remove *empty* directories
* Quote unused files individually
* New version
* x-add-version
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/vcpkg-cmake-config/vcpkg.json | 3 | ||||
| -rw-r--r-- | ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/ports/vcpkg-cmake-config/vcpkg.json b/ports/vcpkg-cmake-config/vcpkg.json index 63f53948e..fde8492dc 100644 --- a/ports/vcpkg-cmake-config/vcpkg.json +++ b/ports/vcpkg-cmake-config/vcpkg.json @@ -1,5 +1,4 @@ { "name": "vcpkg-cmake-config", - "version-date": "2021-02-26", - "port-version": 1 + "version-date": "2021-05-22" } diff --git a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake index e858c70e6..03a6c1d09 100644 --- a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake +++ b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake @@ -136,9 +136,9 @@ function(vcpkg_cmake_config_fixup) "${debug_share}/*[Cc]onfigVersion.cmake" "${debug_share}/*[Cc]onfig-version.cmake" ) - if(NOT unused_files STREQUAL "") - file(REMOVE "${unused_files}") - endif() + foreach(unused_file IN LISTS unused_files) + file(REMOVE "${unused_file}") + endforeach() file(GLOB_RECURSE release_targets "${release_share}/*-release.cmake" @@ -223,13 +223,13 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)]] # Remove /debug/<target_path>/ if it's empty. file(GLOB_RECURSE remaining_files "${debug_share}/*") - if(NOT remaining_files STREQUAL "") + if(remaining_files STREQUAL "") file(REMOVE_RECURSE "${debug_share}") endif() # Remove /debug/share/ if it's empty. file(GLOB_RECURSE remaining_files "${CURRENT_PACKAGES_DIR}/debug/share/*") - if(NOT remaining_files STREQUAL "") + if(remaining_files STREQUAL "") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() endfunction() |