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/cmFindLibraryCommand.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/cmFindLibraryCommand.h')
-rw-r--r-- | Source/cmFindLibraryCommand.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmFindLibraryCommand.h b/Source/cmFindLibraryCommand.h index 233f766..539f9fe 100644 --- a/Source/cmFindLibraryCommand.h +++ b/Source/cmFindLibraryCommand.h @@ -68,7 +68,10 @@ public: protected: void AddArchitecturePaths(const char* suffix); void AddLib64Paths(); - std::string FindLibrary(const char* name); + std::string FindLibrary(); +private: + std::string FindNormalLibrary(); + std::string FindFrameworkLibrary(); }; |