diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-28 15:49:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-28 15:49:17 (GMT) |
| commit | 56fec2fe8f7014abb5677fd4fca03fa208c498e8 (patch) | |
| tree | 684b599228be5a2322fbea65b66c043c6398a526 /Modules | |
| parent | da78d0f5ea5506602db9f761e559ff9057430c57 (diff) | |
| parent | 59c392b44eb2920240b05a46e7f9c069ef374558 (diff) | |
| download | CMake-56fec2fe8f7014abb5677fd4fca03fa208c498e8.zip CMake-56fec2fe8f7014abb5677fd4fca03fa208c498e8.tar.gz CMake-56fec2fe8f7014abb5677fd4fca03fa208c498e8.tar.bz2 | |
Merge topic 'FindICU-find-names'
59c392b44e FindICU: Pass explicit NAMES argument to find command calls
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3371
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindICU.cmake | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Modules/FindICU.cmake b/Modules/FindICU.cmake index e4b4909..38081f5 100644 --- a/Modules/FindICU.cmake +++ b/Modules/FindICU.cmake @@ -162,7 +162,8 @@ function(_ICU_FIND) string(TOUPPER "${program}" program_upcase) set(cache_var "ICU_${program_upcase}_EXECUTABLE") set(program_var "ICU_${program_upcase}_EXECUTABLE") - find_program("${cache_var}" "${program}" + find_program("${cache_var}" + NAMES "${program}" HINTS ${icu_roots} PATH_SUFFIXES ${icu_binary_suffixes} DOC "ICU ${program} executable" @@ -228,13 +229,15 @@ function(_ICU_FIND) list(APPEND component_libnames ${static_component_libnames}) list(APPEND component_debug_libnames ${static_component_debug_libnames}) endif() - find_library("${component_cache_release}" ${component_libnames} + find_library("${component_cache_release}" + NAMES ${component_libnames} HINTS ${icu_roots} PATH_SUFFIXES ${icu_library_suffixes} DOC "ICU ${component} library (release)" NO_PACKAGE_ROOT_PATH ) - find_library("${component_cache_debug}" ${component_debug_libnames} + find_library("${component_cache_debug}" + NAMES ${component_debug_libnames} HINTS ${icu_roots} PATH_SUFFIXES ${icu_library_suffixes} DOC "ICU ${component} library (debug)" @@ -286,7 +289,8 @@ function(_ICU_FIND) string(REPLACE "." "_" data_upcase "${data_upcase}") set(cache_var "ICU_${data_upcase}") set(data_var "ICU_${data_upcase}") - find_file("${cache_var}" "${data}" + find_file("${cache_var}" + NAMES "${data}" HINTS ${icu_roots} PATH_SUFFIXES ${icu_data_suffixes} DOC "ICU ${data} data file") |