diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-12-26 18:14:19 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-12-26 18:14:19 (GMT) |
| commit | 452925649a619256e509ed19bb7c41af1d643deb (patch) | |
| tree | 3d4d79fdeda6d6a578cf8c529daa2d0c47ba8c6b /Source/cmMakefile.cxx | |
| parent | 102ab85a172b67696cf72c4ba526012a83a5bc2e (diff) | |
| download | CMake-452925649a619256e509ed19bb7c41af1d643deb.zip CMake-452925649a619256e509ed19bb7c41af1d643deb.tar.gz CMake-452925649a619256e509ed19bb7c41af1d643deb.tar.bz2 | |
ENH: add better support for framework linking
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 6cf4329..ae8c116 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2215,6 +2215,11 @@ std::string cmMakefile::FindLibrary(const char* name, cmSystemTools::GetPath(path, "CMAKE_LIBRARY_PATH"); cmSystemTools::GetPath(path, "LIB"); cmSystemTools::GetPath(path); + bool supportFrameworks = false; + if(this->GetDefinition("APPLE")) + { + supportFrameworks = true; + } // now add the path path.insert(path.end(), userPaths.begin(), userPaths.end()); // Add some lib directories specific to compilers, depending on the @@ -2270,6 +2275,13 @@ std::string cmMakefile::FindLibrary(const char* name, path.push_back(lib_path); } } + else if(supportFrameworks) + { + path.push_back("~/Library/Frameworks"); + path.push_back("/Library/Frameworks"); + path.push_back("/System/Library/Frameworks"); + path.push_back("/Network/Library/Frameworks"); + } } if(m_LocalGenerator->GetGlobalGenerator()->GetLanguageEnabled("C")) { |