Permalink
Browse files

Fix issue #926. We don't build shared libs anymore. No need for rpath

at all.
  • Loading branch information...
Andersbakken committed Mar 28, 2017
1 parent 2e007c8 commit c369b188a3cd84f437d461871b37a257b5a7c93b
Showing with 4 additions and 7 deletions.
  1. +4 −0 configure
  2. +0 −7 src/CMakeLists.txt
View
@@ -20,6 +20,7 @@ function usage ()
echo " --clang-libdir [arg] Sets the libdir RTags will use for clang."
echo " --cotire Enable cotire when building RTags"
echo " --emacs Use arg instead of \"emacs\" when byte-compiling elisp"
+ echo " --lua-enabled Enable LUA AST scripting"
echo " --no-lua-files-install Don't install RTags lua files"
echo " --no-elisp-files-install Don't install RTags elisp files"
echo " --no-elisp-bytecompile Don't bytecompile RTags elisp files"
@@ -69,6 +70,9 @@ while [ -n "$1" ]; do
shift
CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=\"$1\""
;;
+ --lua-enabled)
+ CMAKE_ARGS="${CMAKE_ARGS} -DLUA_ENABLED=1"
+ ;;
--clang-libraries)
shift
CMAKE_ARGS="${CMAKE_ARGS} -DLIBCLANG_LIBRARIES=\"$1\""
View
@@ -1,6 +1,5 @@
set(CMAKE_SKIP_BUILD_RPATH FALSE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
include(ExternalProject)
@@ -36,12 +35,6 @@ if (MSYS)
set(CMAKE_SYSTEM_NAME "CYGWIN")
endif ()
-# Set RPATH when installing to a custom (non-system) directory
-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
-if ("${isSystemDir}" STREQUAL "-1")
- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:${CMAKE_INSTALL_PREFIX}/lib")
-endif ()
-
include(${CMAKE_SOURCE_DIR}/cmake/EnsureLibraries.cmake)
if (NOT DEFINED LIBCLANG_LIBRARIES)

0 comments on commit c369b18

Please sign in to comment.