Commit 1be60d6d authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'multiarch-include'

da1d9bac Test find_path multiarch support (#13742)
b96f6fc2 Teach find_(path|file) about Linux multiarch (#13742)
parents e0af55a5 da1d9bac
......@@ -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;
......
......@@ -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");
......
......@@ -32,6 +32,7 @@ add_CMakeOnly_test(SelectLibraryConfigurations)
add_CMakeOnly_test(TargetScope)
add_CMakeOnly_test(find_library)
add_CMakeOnly_test(find_path)
add_test(CMakeOnly.ProjectInclude ${CMAKE_CMAKE_COMMAND}
-DTEST=ProjectInclude
......
cmake_minimum_required(VERSION 2.8)
project(FindPathTest NONE)
set(CMAKE_FIND_DEBUG_MODE 1)
macro(test_find_path expected)
unset(HDR CACHE)
find_path(HDR ${ARGN}
NO_CMAKE_ENVIRONMENT_PATH
NO_SYSTEM_ENVIRONMENT_PATH
)
if(HDR)
# Convert to relative path for comparison to expected location.
file(RELATIVE_PATH REL_HDR "${CMAKE_CURRENT_SOURCE_DIR}" "${HDR}")
# Check and report failure.
if(NOT "${REL_HDR}" STREQUAL "${expected}")
message(SEND_ERROR "Header ${expected} found as [${REL_HDR}]")
elseif(CMAKE_FIND_DEBUG_MODE)
message(STATUS "Header ${expected} found as [${REL_HDR}]")
endif()
else()
message(SEND_ERROR "Header ${expected} NOT FOUND")
endif()
endmacro()
set(CMAKE_SYSTEM_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR})
set(CMAKE_LIBRARY_ARCHITECTURE arch)
test_find_path(include NAMES test1.h)
test_find_path(include/arch NAMES test1arch.h)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment