From 4728bc201bddc34a7834aedf65704c7aa1c9daf1 Mon Sep 17 00:00:00 2001 From: Joerg Mayer Date: Fri, 28 Oct 2016 11:49:06 +0200 Subject: Instead of supressing the warning of policy 42, set MACOSX_RPATH. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes picking up the system libpcap instead of the one in /usr/local/lib/ Change-Id: I488c8512fc2cde145107062a6e8b7815ad764a3b Reviewed-on: https://code.wireshark.org/review/18545 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Jörg Mayer --- CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 044f43c20c..e9e5df1894 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,10 +67,8 @@ if (POLICY CMP0054) cmake_policy(SET CMP0054 OLD) endif() -# Set old behaviour for MACOSX_RPATH -if (POLICY CMP0042) - cmake_policy(SET CMP0042 OLD) -endif() +# See https://cmake.org/Wiki/CMake_RPATH_handling +set(MACOSX_RPATH ON) # If our target platform is enforced by our generator, set # WIRESHARK_TARGET_PLATFORM accordingly. Otherwise use -- cgit v1.2.1