reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-11 13:24:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FindICU: Find 64-bit Windows builds under CMP0074 NEW behavior

Browse Source 
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
This commit is contained in:
Johannes Reiff 2019-01-24 14:44:18 -05:00 committed by Brad King
parent 378473f9f1
commit 26b7a8e77e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/FindICU.cmake
View File

@ -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}")