diff options
| author | Brad King <brad.king@kitware.com> | 2008-06-09 15:58:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-06-09 15:58:29 (GMT) |
| commit | 6706f84cd997d39026080e47e4944072add7f925 (patch) | |
| tree | e047d48fd75fbcb0a58f50fdffc3359226710c7e /Source/cmFindBase.h | |
| parent | d53e5dec3748e1d800dae595dcb78f2c4d55f788 (diff) | |
| download | CMake-6706f84cd997d39026080e47e4944072add7f925.zip CMake-6706f84cd997d39026080e47e4944072add7f925.tar.gz CMake-6706f84cd997d39026080e47e4944072add7f925.tar.bz2 | |
ENH: Refactor find_* command framework/appbundle search order impl.
- CMAKE_FIND_FRAMEWORK and CMAKE_FIND_APPBUNDLE are supposed to specify
whether to find frameworks/appbundles FIRST, LAST, ONLY, or NEVER.
- Previously this affected only the placement of CMAKE_FRAMEWORK_PATH
and CMAKE_APPBUNDLE_PATH with respect to the other path specifiers.
- Now it behaves as documented. The entire search path is inspected for
each kind of program, library, or header before trying the next kind.
- Additionally the ONLY mode is now honored for headers so that users
do not end up with a library in framework and a header from elsewhere.
Diffstat (limited to 'Source/cmFindBase.h')
| -rw-r--r-- | Source/cmFindBase.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/cmFindBase.h b/Source/cmFindBase.h index a678ccf..7392c23 100644 --- a/Source/cmFindBase.h +++ b/Source/cmFindBase.h @@ -62,15 +62,12 @@ protected: bool AlreadyInCacheWithoutMetaInfo; private: // Add pieces of the search. - void AddFrameworkPath(); - void AddAppBundlePath(); void AddCMakeEnvironmentPath(); void AddCMakeVariablePath(); void AddSystemEnvironmentPath(); void AddCMakeSystemVariablePath(); // Helpers. - void AddMacPath(const char* var, const char* sysvar); void AddCMakePrefixPath(const char* variable); void AddEnvPrefixPath(const char* variable); void AddPrefixPaths(std::vector<std::string> const& in_paths, |