diff options
author | Brad King <brad.king@kitware.com> | 2017-03-13 13:00:49 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-13 13:00:52 (GMT) |
commit | 2591e89c14cf3e0e14312c5bfee8397cf31efdd2 (patch) | |
tree | 60212905187bb103829cc30117bfa9340f711187 /Tests | |
parent | 3806e186d1ac3efabcbd3237927fc660645fdc26 (diff) | |
parent | 7a2de256c49e5ac2d78646dd9f3075f0842902bc (diff) | |
download | CMake-2591e89c14cf3e0e14312c5bfee8397cf31efdd2.zip CMake-2591e89c14cf3e0e14312c5bfee8397cf31efdd2.tar.gz CMake-2591e89c14cf3e0e14312c5bfee8397cf31efdd2.tar.bz2 |
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
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/CMakeOnly/find_library/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CMakeOnly/find_library/CMakeLists.txt b/Tests/CMakeOnly/find_library/CMakeLists.txt index 749cf42..fe3815e 100644 --- a/Tests/CMakeOnly/find_library/CMakeLists.txt +++ b/Tests/CMakeOnly/find_library/CMakeLists.txt @@ -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} |