Commit 26b7a8e7 authored by Johannes Reiff's avatar Johannes Reiff Committed by Brad King
Browse files

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
parent 378473f9
......@@ -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}")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment