diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2016-10-29 06:34:17 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2016-10-29 07:03:38 +0000 |
| commit | 54bbff9c65b3dad55559212f8bed2d341b47b6dd (patch) | |
| tree | aea0f20cf617a9f350e99d192a83c304377c1373 | |
| parent | 4728bc201bddc34a7834aedf65704c7aa1c9daf1 (diff) | |
Revert "Instead of supressing the warning of policy 42, set MACOSX_RPATH.":
---------
CMake Warning (dev):
Policy CMP0042 is not set: MACOSX_RPATH is enabled by default. Run "cmake
--help-policy CMP0042" for policy details. Use the cmake_policy command to
set the policy and suppress this warning.
MACOSX_RPATH is not specified for the following targets:
epan
wiretap
wscodecs
wsutil
This warning is for project developers. Use -Wno-dev to suppress it.
-----------
This reverts commit 4728bc201bddc34a7834aedf65704c7aa1c9daf1.
Change-Id: I7ea056d56c0352b54be5bebadc35de6173ef593f
Reviewed-on: https://code.wireshark.org/review/18562
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e9e5df1894..044f43c20c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,8 +67,10 @@ if (POLICY CMP0054) cmake_policy(SET CMP0054 OLD) endif() -# See https://cmake.org/Wiki/CMake_RPATH_handling -set(MACOSX_RPATH ON) +# Set old behaviour for MACOSX_RPATH +if (POLICY CMP0042) + cmake_policy(SET CMP0042 OLD) +endif() # If our target platform is enforced by our generator, set # WIRESHARK_TARGET_PLATFORM accordingly. Otherwise use |