diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-08 16:56:00 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-08 16:56:00 (GMT) |
| commit | 8632251b25c217e12ae8741e935d6b9aa03ac04b (patch) | |
| tree | c8dbd2b0fb0d39decea7106af8970c05eec79f59 /Source | |
| parent | 5572f5fffd040473c588215a7c87a12530e1548e (diff) | |
| parent | 188baef00c3b19c6ee6ed8c3735817bae50f110e (diff) | |
| download | CMake-8632251b25c217e12ae8741e935d6b9aa03ac04b.zip CMake-8632251b25c217e12ae8741e935d6b9aa03ac04b.tar.gz CMake-8632251b25c217e12ae8741e935d6b9aa03ac04b.tar.bz2 | |
Merge topic 'find_path-in-framework'
188baef0 find_path: Fix location of <dir/header.h> in a framework on OS X
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmFindPathCommand.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmFindPathCommand.cxx b/Source/cmFindPathCommand.cxx index d24be6a..d71fc1a 100644 --- a/Source/cmFindPathCommand.cxx +++ b/Source/cmFindPathCommand.cxx @@ -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 ""; |