diff options
| author | Brad King <brad.king@kitware.com> | 2012-11-30 15:35:59 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-11-30 15:35:59 (GMT) |
| commit | 1be60d6dc7500e22ea59a01ed502b18ffa4c8df2 (patch) | |
| tree | a7dc7f08559e5239eccfe00ca3df4fe3262d4c83 /Source | |
| parent | e0af55a5f4cd84db1cc5a3517e730ea8c6332f45 (diff) | |
| parent | da1d9bac63d486d430b0c61ee8d3928f8d09ab26 (diff) | |
| download | CMake-1be60d6dc7500e22ea59a01ed502b18ffa4c8df2.zip CMake-1be60d6dc7500e22ea59a01ed502b18ffa4c8df2.tar.gz CMake-1be60d6dc7500e22ea59a01ed502b18ffa4c8df2.tar.bz2 | |
Merge topic 'multiarch-include'
da1d9ba Test find_path multiarch support (#13742)
b96f6fc Teach find_(path|file) about Linux multiarch (#13742)
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 1de3982..7ce0032 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 9524924..6a43298 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"); |