kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CMakeFindPackageMode: Fix Debian multiarch default guess (#15250) 

In commit v2.8.6~102^2~18 (Better support for lib64 and Debian
multiarch, 2011-07-14) variable names "..._LANGUAGE_ARCHITECTURE" were
set instead of the correct "..._LIBRARY_ARCHITECTURE".  Fix this typo
and also set the language-independent variable
CMAKE_LIBRARY_ARCHITECTURE.
This commit is contained in:
Felix Geyer 2015-01-19 10:39:21 -05:00 committed by Brad King
parent 2e71d92ef2
commit 4898495819
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/CMakeFindPackageMode.cmake
View File

@ -102,15 +102,18 @@ if(UNIX)
# guess Debian multiarch if it has not been set: # guess Debian multiarch if it has not been set:
if(EXISTS /etc/debian_version) if(EXISTS /etc/debian_version)
if(NOT CMAKE_${LANGUAGE}_LANGUAGE_ARCHITECTURE ) if(NOT CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE )
file(GLOB filesInLib RELATIVE /lib /lib/*-linux-gnu* ) file(GLOB filesInLib RELATIVE /lib /lib/*-linux-gnu* )
foreach(file ${filesInLib}) foreach(file ${filesInLib})
if("${file}" MATCHES "${CMAKE_LIBRARY_ARCHITECTURE_REGEX}") if("${file}" MATCHES "${CMAKE_LIBRARY_ARCHITECTURE_REGEX}")
set(CMAKE_${LANGUAGE}_LANGUAGE_ARCHITECTURE ${file}) set(CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE ${file})
break() break()
endif() endif()
endforeach() endforeach()
endif() endif()
if(NOT CMAKE_LIBRARY_ARCHITECTURE)
set(CMAKE_LIBRARY_ARCHITECTURE ${CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE})
endif()
endif() endif()
endif() endif()