diff options
| author | Brad King <brad.king@kitware.com> | 2022-07-01 15:16:18 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-07-01 15:16:32 (GMT) |
| commit | f41b2b25a6951212e7745383ca808cb3ff701fd7 (patch) | |
| tree | d1774e3b385c4340fb63dbbe89485fd5d03b2759 /Modules | |
| parent | 2ecdf00f07c0fc57ad9dbe41956249eb4aa3e40c (diff) | |
| parent | 669b6a37f5ce5b0b6a2623b4acb5442784d93b43 (diff) | |
| download | CMake-f41b2b25a6951212e7745383ca808cb3ff701fd7.zip CMake-f41b2b25a6951212e7745383ca808cb3ff701fd7.tar.gz CMake-f41b2b25a6951212e7745383ca808cb3ff701fd7.tar.bz2 | |
Merge topic 'findicu'
669b6a37f5 FindICU: Fix component reporting logic
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7430
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindICU.cmake | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Modules/FindICU.cmake b/Modules/FindICU.cmake index 91dcba5..b4f4d71 100644 --- a/Modules/FindICU.cmake +++ b/Modules/FindICU.cmake @@ -254,13 +254,6 @@ function(_ICU_FIND) set("${component_found}" ON) set("${component_found_compat}" ON) list(APPEND ICU_LIBRARY "${${component_cache}}") - endif() - mark_as_advanced("${component_found}") - mark_as_advanced("${component_found_compat}") - set("${component_cache}" "${${component_cache}}" PARENT_SCOPE) - set("${component_found}" "${${component_found}}" PARENT_SCOPE) - set("${component_found_compat}" "${${component_found_compat}}" PARENT_SCOPE) - if(component_found OR component_found_compat) if (ICU_FIND_REQUIRED_${component}) list(APPEND ICU_LIBS_FOUND "${component} (required): ${${component_cache}}") else() @@ -274,6 +267,11 @@ function(_ICU_FIND) list(APPEND ICU_LIBS_NOTFOUND "${component} (optional)") endif() endif() + mark_as_advanced("${component_found}") + mark_as_advanced("${component_found_compat}") + set("${component_cache}" "${${component_cache}}" PARENT_SCOPE) + set("${component_found}" "${${component_found}}" PARENT_SCOPE) + set("${component_found_compat}" "${${component_found_compat}}" PARENT_SCOPE) endforeach() set(_ICU_REQUIRED_LIBS_FOUND "${ICU_REQUIRED_LIBS_FOUND}" PARENT_SCOPE) set(ICU_LIBRARY "${ICU_LIBRARY}" PARENT_SCOPE) |