diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-07 13:10:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-07 13:10:57 (GMT) |
| commit | 9c4d105680c99e194c6d6063315ee2affd2a7b63 (patch) | |
| tree | caba0f75ad3328ca6791417d8e6c439d4906b7b9 /Source/cmLocalGenerator.h | |
| parent | 89b03498ef0005778260f4734e3102e8a5463ff0 (diff) | |
| parent | 20e62f74c5a030a25fe1c3a6c835d67eea152d8f (diff) | |
| download | CMake-9c4d105680c99e194c6d6063315ee2affd2a7b63.zip CMake-9c4d105680c99e194c6d6063315ee2affd2a7b63.tar.gz CMake-9c4d105680c99e194c6d6063315ee2affd2a7b63.tar.bz2 | |
Merge topic 'cleanup-Convert'
20e62f74 cmLocalGenerator: Simplify ConvertToLinkReference
fd93b360 cmOutputConverter: Add a flag for IsUnix
1365e18b Convert: Inline platform-specific methods
1ed5f6b3 Makefiles: Introduce local RelativePath method
8377d9e0 Fortran: Inline conversion to relative path
00173b71 Fortran: Wrap path convert in a call with a more-suitable name
d5911ef0 Makefiles: Hardcode the relative location of the CMakeCache file
c3264f48 Convert: Extract method to determine if paths are in directory
52168f32 Convert: Remove asserts which are duplicated in delegate method
5213f893 Convert: Remove early return check
b61c268b Convert: Extract local variables for readability
e278f5a8 Convert: Extract local variables
51bc6bdd cmOutputConverter: remove unused code
8e0c1599 Xcode: Inline ConvertToRelativePath calls
Diffstat (limited to 'Source/cmLocalGenerator.h')
| -rw-r--r-- | Source/cmLocalGenerator.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 2c1aeac..e16ddab 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -370,9 +370,7 @@ protected: std::string& CreateSafeUniqueObjectFileName(const std::string& sin, std::string const& dir_max); - virtual std::string ConvertToLinkReference( - std::string const& lib, - cmOutputConverter::OutputFormat format = cmOutputConverter::SHELL); + virtual std::string ConvertToLinkReference(std::string const& lib); /** Check whether the native build system supports the given definition. Issues a warning. */ |