github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-23 03:32:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Work around cmake/ninja bug that leads to installation failure"

Browse Source 
This reverts commit 36a2f2cc01.

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.
This commit is contained in:
ridiculousfish 2018-01-10 18:47:48 -08:00
parent af5869886b
commit 8a67a113d8
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -4,12 +4,6 @@ PROJECT(fish-shell CXX)
# We are C++11. # We are C++11.
SET(CMAKE_CXX_STANDARD 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. # Disable exception handling.
ADD_COMPILE_OPTIONS(-fno-exceptions) ADD_COMPILE_OPTIONS(-fno-exceptions)