diff options
| author | Johannes Reiff <mail@jreiff.de> | 2019-01-24 19:44:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-01-24 19:55:35 (GMT) |
| commit | 26b7a8e77ecafea417a0430276533ec5e58fa33a (patch) | |
| tree | 6426491dd8982145f7444aea83394d1039447ba1 /Modules/FindICU.cmake | |
| parent | 378473f9f184000cb768c1b99e6242e054787f34 (diff) | |
| download | CMake-26b7a8e77ecafea417a0430276533ec5e58fa33a.zip CMake-26b7a8e77ecafea417a0430276533ec5e58fa33a.tar.gz CMake-26b7a8e77ecafea417a0430276533ec5e58fa33a.tar.bz2 | |
FindICU: Find 64-bit Windows builds under CMP0074 NEW behavior
CMP0074 causes FindICU.cmake to always prefer the 32-bit version of ICU
programs/libraries on Windows. NO_PACKAGE_ROOT_PATH reverts this behavior.
Fixes: #18742
Diffstat (limited to 'Modules/FindICU.cmake')
| -rw-r--r-- | Modules/FindICU.cmake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Modules/FindICU.cmake b/Modules/FindICU.cmake index 70e10f5..e4b4909 100644 --- a/Modules/FindICU.cmake +++ b/Modules/FindICU.cmake @@ -165,7 +165,9 @@ function(_ICU_FIND) find_program("${cache_var}" "${program}" HINTS ${icu_roots} PATH_SUFFIXES ${icu_binary_suffixes} - DOC "ICU ${program} executable") + DOC "ICU ${program} executable" + NO_PACKAGE_ROOT_PATH + ) mark_as_advanced(cache_var) set("${program_var}" "${${cache_var}}" PARENT_SCOPE) endforeach() @@ -229,11 +231,15 @@ function(_ICU_FIND) find_library("${component_cache_release}" ${component_libnames} HINTS ${icu_roots} PATH_SUFFIXES ${icu_library_suffixes} - DOC "ICU ${component} library (release)") + DOC "ICU ${component} library (release)" + NO_PACKAGE_ROOT_PATH + ) find_library("${component_cache_debug}" ${component_debug_libnames} HINTS ${icu_roots} PATH_SUFFIXES ${icu_library_suffixes} - DOC "ICU ${component} library (debug)") + DOC "ICU ${component} library (debug)" + NO_PACKAGE_ROOT_PATH + ) include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) select_library_configurations(ICU_${component_upcase}) mark_as_advanced("${component_cache_release}" "${component_cache_debug}") |