diff options
| author | Brad King <brad.king@kitware.com> | 2012-10-02 14:07:32 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-10-02 14:07:32 (GMT) |
| commit | 47e50423bfbbb277e60b578d1a7174f1fc24b01c (patch) | |
| tree | a4c46d3a4e0d9a08e6b2b83b783385392d182ece /Source/cmLocalGenerator.h | |
| parent | 851a3a0b750cde77ae6cb0895fac1e19e020c05e (diff) | |
| parent | 1e47ccb5542954e1258affe36e0089f13618d23d (diff) | |
| download | CMake-47e50423bfbbb277e60b578d1a7174f1fc24b01c.zip CMake-47e50423bfbbb277e60b578d1a7174f1fc24b01c.tar.gz CMake-47e50423bfbbb277e60b578d1a7174f1fc24b01c.tar.bz2 | |
Merge topic 'ninja-LIBPATH'
1e47ccb Ninja: add option to enforce usage of response files
e31df03 Ninja: move <OBJECTS> in front of the first linker option
8d674e7 Ninja: move -LIBPATH behind -link option
Diffstat (limited to 'Source/cmLocalGenerator.h')
| -rw-r--r-- | Source/cmLocalGenerator.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 9aaacf7..49bce38 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -340,11 +340,16 @@ public: void GetTargetFlags(std::string& linkLibs, std::string& flags, std::string& linkFlags, + std::string& frameworkPath, + std::string& linkPath, cmGeneratorTarget* target); protected: ///! put all the libraries for a target on into the given stream - virtual void OutputLinkLibraries(std::ostream&, cmGeneratorTarget&, + virtual void OutputLinkLibraries(std::string& linkLibraries, + std::string& frameworkPath, + std::string& linkPath, + cmGeneratorTarget &, bool relink); // Expand rule variables in CMake of the type found in language rules |