diff options
| author | Brad King <brad.king@kitware.com> | 2012-07-20 18:09:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-07-20 18:19:11 (GMT) |
| commit | 733726edf61aa7889b57aa9490cb719c83d3ea0f (patch) | |
| tree | 7e757a1828ac7e9a936b1161aea7dcb70ba91680 /Tests/CMakeOnly | |
| parent | 54add62f1b36ffc25f333762901e14b2def21db2 (diff) | |
| download | CMake-733726edf61aa7889b57aa9490cb719c83d3ea0f.zip CMake-733726edf61aa7889b57aa9490cb719c83d3ea0f.tar.gz CMake-733726edf61aa7889b57aa9490cb719c83d3ea0f.tar.bz2 | |
find_library: Fix mixed lib->lib64 (non-)conversion cases (#13419)
When a search path contains multiple "lib/" instances we previously
converted all or none. This fails for cases where only some of the
multiple instances must be converted. Teach AddArchitecturePaths to
generate all combinations that exist. Uncomment these cases in the
CMakeOnly.find_library test now that they work.
Diffstat (limited to 'Tests/CMakeOnly')
| -rw-r--r-- | Tests/CMakeOnly/find_library/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/CMakeOnly/find_library/CMakeLists.txt b/Tests/CMakeOnly/find_library/CMakeLists.txt index 1938896..08f9331 100644 --- a/Tests/CMakeOnly/find_library/CMakeLists.txt +++ b/Tests/CMakeOnly/find_library/CMakeLists.txt @@ -50,9 +50,9 @@ endforeach() set(CMAKE_SIZEOF_VOID_P 8) foreach(lib64 lib/64/libtest2.a - #lib/A/lib64/libtest3.a # known breakage + lib/A/lib64/libtest3.a lib/libtest3.a - #lib64/A/lib/libtest2.a # known breakage + lib64/A/lib/libtest2.a lib64/A/lib64/libtest1.a lib64/A/libtest1.a lib64/libtest1.a |