From a37388fbb6bd45f1376e865c02410abf59e6bc2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Sun, 20 Jan 2019 22:10:46 +0000 Subject: CMake: Remove unnecessary check for CMAKE_INSTALL_RPATH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CMAKE_INSTALL_RPATH is set inside the if() block and not before. Change-Id: Id8a863ca9bf5fed367de3fa7681a9a269d3f4f07 Reviewed-on: https://code.wireshark.org/review/31646 Reviewed-by: João Valverde Petri-Dish: João Valverde Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index a5c9e2f5a3..99fb4f3e5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -181,7 +181,7 @@ include(GNUInstallDirs) # Make sure our executables can can load our libraries if we install into # a non-default directory on Unix-like systems other than macOS. # https://gitlab.kitware.com/cmake/community/wikis/doc/cmake/RPATH-handling -if(NOT CMAKE_INSTALL_RPATH AND NOT (WIN32 OR APPLE)) +if(NOT (WIN32 OR APPLE)) # Try to set a RPATH for installed binaries if the library directory is # not already included in the default search list. list(FIND CMAKE_C_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_FULL_LIBDIR}" IS_SYSTEM_DIR) -- cgit v1.2.3