From 8a67a113d850fc6f43ff019ad38f40f5c968dd47 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Wed, 10 Jan 2018 18:47:48 -0800 Subject: [PATCH] Revert "Work around cmake/ninja bug that leads to installation failure" This reverts commit 36a2f2cc01c2a04b240819884f41174cf56f79a6. This attempted to modify RPATH when building with Ninja, but the CMake if statement wasn't actually valid so this wasn't doing anything. This check couldn't really be tested - let's make sure not to accumulate build system rules that we don't understand. --- CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ffb17956..83e40363c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,12 +4,6 @@ PROJECT(fish-shell CXX) # We are C++11. SET(CMAKE_CXX_STANDARD 11) -# Work around cmake/ninja bug that fails on install with ninja -# See https://cmake.org/Bug/print_bug_page.php?bug_id=13934 -if (NINJA) - SET(CMAKE_BUILD_WITH_INSTALL_RPATH 1) -endif(NINJA) - # Disable exception handling. ADD_COMPILE_OPTIONS(-fno-exceptions)