diff options
| author | Brad King <brad.king@kitware.com> | 2012-11-26 16:44:56 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-11-26 16:46:04 -0500 |
| commit | b96f6fc2aabed8a77cd45c0f87af7abb6a687576 (patch) | |
| tree | c97047b70e55b785795d1ab7e38e42c8c8c85402 /Source | |
| parent | e5748521206e1f240d495d1ec3b2ccd31611f081 (diff) | |
| download | cmake-b96f6fc2aabed8a77cd45c0f87af7abb6a687576.tar.gz | |
Teach find_(path|file) about Linux multiarch (#13742)
Implement support for multiarch include directories as specified here:
https://wiki.ubuntu.com/MultiarchCross
Generalize the multiarch feature added in commit b41ad3b3 (Teach
find_(library|package) about Linux multiarch, 2011-06-08) to the
find_path and find_file commands. Teach them to search
<prefix>/include/<arch> whenever they would search <prefix>/include.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmFindBase.cxx | 4 | ||||
| -rw-r--r-- | Source/cmFindPathCommand.cxx | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx index 1de3982f4e..7ce0032165 100644 --- a/Source/cmFindBase.cxx +++ b/Source/cmFindBase.cxx @@ -360,13 +360,13 @@ void cmFindBase::AddPrefixPaths(std::vector<std::string> const& in_paths, { dir += "/"; } - if(subdir == "lib") + if(subdir == "include" || subdir == "lib") { const char* arch = this->Makefile->GetDefinition("CMAKE_LIBRARY_ARCHITECTURE"); if(arch && *arch) { - this->AddPathInternal(dir+"lib/"+arch, pathType); + this->AddPathInternal(dir+subdir+"/"+arch, pathType); } } std::string add = dir + subdir; diff --git a/Source/cmFindPathCommand.cxx b/Source/cmFindPathCommand.cxx index 952492463b..6a432984d4 100644 --- a/Source/cmFindPathCommand.cxx +++ b/Source/cmFindPathCommand.cxx @@ -45,8 +45,10 @@ void cmFindPathCommand::GenerateDocumentation() "SEARCH_XXX", "file in a directory"); cmSystemTools::ReplaceString(this->GenericDocumentation, "XXX_SUBDIR", "include"); - cmSystemTools::ReplaceString(this->GenericDocumentation, - "XXX_EXTRA_PREFIX_ENTRY", ""); + cmSystemTools::ReplaceString( + this->GenericDocumentation, + "XXX_EXTRA_PREFIX_ENTRY", + " <prefix>/include/<arch> if CMAKE_LIBRARY_ARCHITECTURE is set, and\n"); cmSystemTools::ReplaceString(this->GenericDocumentation, "CMAKE_FIND_ROOT_PATH_MODE_XXX", "CMAKE_FIND_ROOT_PATH_MODE_INCLUDE"); |