Merge topic 'x32-abi-tests'

7a2de256 Tests: Fix CMakeOnly.find_library test logic for libx32 case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !573
This commit is contained in:
Brad King 2017-03-13 13:00:49 +00:00 committed by Kitware Robot
commit 2591e89c14

View File

@ -24,7 +24,7 @@ endmacro()
macro(test_find_library_subst expected)
get_filename_component(dir ${expected} PATH)
get_filename_component(name ${expected} NAME)
string(REGEX REPLACE "lib/?[36X][24Y][Z]*" "lib" dir "${dir}")
string(REGEX REPLACE "lib/?[36Xx][24Y3][Z2]*" "lib" dir "${dir}")
test_find_library(", searched as ${dir}" "${expected}"
NAMES ${name}
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/${dir}