Commit 188baef0 authored by Harry Mallon's avatar Harry Mallon Committed by Brad King

find_path: Fix location of <dir/header.h> in a framework on OS X

After finding it in `foo.Framework/Headers/dir/header.h`, we should
report the `foo.Framework/Headers` directory, not
`foo.Framework/Headers/dir`, because the former is what actually
contains the path the caller wishes to include.
parent eeac8430
......@@ -117,7 +117,7 @@ std::string cmFindPathCommand::FindHeaderInFramework(std::string const& file,
if (this->IncludeFileInPath) {
return fheader;
}
fheader = cmSystemTools::GetFilenamePath(fheader);
fheader.resize(fheader.size() - file.size());
return fheader;
}
return "";
......
-- SOME_INCLUDE_DIR='[^']*Tests/RunCMake/find_path/Frameworks/Foo.framework/Headers'
set(CMAKE_FRAMEWORK_PATH "${CMAKE_CURRENT_SOURCE_DIR}/Frameworks")
find_path(SOME_INCLUDE_DIR "Some/Dir/Header.h")
message(STATUS "SOME_INCLUDE_DIR='${SOME_INCLUDE_DIR}'")
......@@ -3,3 +3,7 @@ include(RunCMake)
if(WIN32 OR CYGWIN)
run_cmake(PrefixInPATH)
endif()
if(APPLE)
run_cmake(FrameworksWithSubdirs)
endif()
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