mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-21 14:40:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Teach find_(library|package) about Linux multiarch (#12037)

Browse Source 
Implement support for multiarch as specified here:

  http://wiki.debian.org/Multiarch
  https://wiki.ubuntu.com/MultiarchSpec

Detect the <arch> part of <prefix>/lib/<arch> from the implicit library
search path from each compiler to set CMAKE_<lang>_LIBRARY_ARCHITECTURE.
Define CMAKE_LIBRARY_ARCHITECTURE using one of these values (they should
all be the same).  Teach the find_library and find_package commands to
search <prefix>/lib/<arch> whenever they would search <prefix>/lib.
This commit is contained in:
Brad King
2011-06-08 08:46:31 -04:00
parent 0f939ee164
commit b41ad3b399
12 changed files with 88 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmFindProgramCommand.cxx
View File

@@ -41,6 +41,8 @@ void cmFindProgramCommand::GenerateDocumentation()
"SEARCH_XXX", "program");
cmSystemTools::ReplaceString(this->GenericDocumentation,
"XXX_SUBDIR", "[s]bin");
cmSystemTools::ReplaceString(this->GenericDocumentation,
"XXX_EXTRA_PREFIX_ENTRY", "");
cmSystemTools::ReplaceString(this->GenericDocumentation,
"CMAKE_FIND_ROOT_PATH_MODE_XXX",
"CMAKE_FIND_ROOT_PATH_MODE_PROGRAM");