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 | |
| 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
| -rw-r--r-- | ports/vcpkg-cmake-config/vcpkg.json | 3 | ||||
| -rw-r--r-- | ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake | 10 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/v-/vcpkg-cmake-config.json | 5 |
4 files changed, 13 insertions, 9 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() diff --git a/versions/baseline.json b/versions/baseline.json index d70cc7b89..0c670e09b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6353,8 +6353,8 @@ "port-version": 2 }, "vcpkg-cmake-config": { - "baseline": "2021-02-26", - "port-version": 1 + "baseline": "2021-05-22", + "port-version": 0 }, "vcpkg-gfortran": { "baseline": "3", diff --git a/versions/v-/vcpkg-cmake-config.json b/versions/v-/vcpkg-cmake-config.json index 5ad51b918..0b1778c5c 100644 --- a/versions/v-/vcpkg-cmake-config.json +++ b/versions/v-/vcpkg-cmake-config.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "2d4f997a32b8e8bfe98d12beb2bfe6be713c7086", + "version-date": "2021-05-22", + "port-version": 0 + }, + { "git-tree": "46d60d4dd4297bedecdcd308167ad2492b269183", "version-date": "2021-02-26", "port-version": 1 |