summaryrefslogtreecommitdiffstats
path: root/Source/cmTarget.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-01-02 19:23:09 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-01-02 19:23:09 (GMT)
commit0d63bdd2d9690cfdb43671af7465704675a68733 (patch)
tree17370b9ce679a48de0ed5f3baf7cddd27ed08e01 /Source/cmTarget.h
parentc0ea0604a0dcd1d580e9b6a976aae0069cab2986 (diff)
parentd25ad482e978cbf5e4fcfa8b1dcc342ba93dcda0 (diff)
downloadCMake-0d63bdd2d9690cfdb43671af7465704675a68733.zip
CMake-0d63bdd2d9690cfdb43671af7465704675a68733.tar.gz
CMake-0d63bdd2d9690cfdb43671af7465704675a68733.tar.bz2
Merge topic 'rpath-default'
d25ad48 OS X: Add CMP0042 to enable MACOSX_RPATH by default
Diffstat (limited to 'Source/cmTarget.h')
-rw-r--r--Source/cmTarget.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index bf4a8ef..e026c59 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -26,7 +26,8 @@
F(CMP0020) \
F(CMP0021) \
F(CMP0022) \
- F(CMP0041)
+ F(CMP0041) \
+ F(CMP0042)
class cmake;
class cmMakefile;
@@ -382,7 +383,10 @@ public:
std::string GetSOName(const char* config) const;
/** Whether this library has \@rpath and platform supports it. */
- bool HasMacOSXRpath(const char* config) const;
+ bool HasMacOSXRpathInstallNameDir(const char* config) const;
+
+ /** Whether this library defaults to \@rpath. */
+ bool MacOSXRpathInstallNameDirDefault() const;
/** Test for special case of a third-party shared library that has
no soname at all. */