|
 |
ec1d151 |
From 9dd0210613c6ed6fc0867e7f4d57b9b8ee751345 Mon Sep 17 00:00:00 2001
|
|
|
affaa57 |
From: Valient Gough <vgough@pobox.com>
|
|
|
affaa57 |
Date: Thu, 15 Sep 2016 16:34:03 -0700
|
|
|
ec1d151 |
Subject: [PATCH] add LIB_INSTALL_DIR override, fixes #213
|
|
|
affaa57 |
|
|
|
ec1d151 |
(cherry picked from commit 3fa633fffe2376ff90c5134bd9aa736a63d29438)
|
|
|
affaa57 |
---
|
|
|
affaa57 |
CMakeLists.txt | 14 +++++++++-----
|
|
|
affaa57 |
create-dev-pkg.sh | 2 +-
|
|
|
affaa57 |
2 files changed, 10 insertions(+), 6 deletions(-)
|
|
|
affaa57 |
|
|
|
affaa57 |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
ec1d151 |
index 270b2d3..de8e573 100644
|
|
|
affaa57 |
--- a/CMakeLists.txt
|
|
|
affaa57 |
+++ b/CMakeLists.txt
|
|
|
affaa57 |
@@ -19,6 +19,10 @@ option (USE_INTERNAL_TINYXML "use built-in TinyXML2" ON)
|
|
|
affaa57 |
option (ENABLE_NLS "compile with Native Language Support (using gettext)" ON)
|
|
|
affaa57 |
option (INSTALL_LIBENCFS "install libencfs" OFF)
|
|
|
affaa57 |
|
|
|
affaa57 |
+if (NOT DEFINED LIB_INSTALL_DIR)
|
|
|
affaa57 |
+ set (LIB_INSTALL_DIR lib)
|
|
|
affaa57 |
+endif ()
|
|
|
affaa57 |
+
|
|
|
affaa57 |
# We need C++ 11
|
|
|
affaa57 |
if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.0)
|
|
|
affaa57 |
# CMake 3.1 has built-in CXX standard checks.
|
|
|
affaa57 |
@@ -43,11 +47,11 @@ if (APPLE)
|
|
|
affaa57 |
set(CMAKE_MACOSX_RPATH ON)
|
|
|
affaa57 |
set(CMAKE_SKIP_BUILD_RPATH FALSE)
|
|
|
affaa57 |
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
|
|
|
affaa57 |
- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
|
|
|
affaa57 |
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
|
|
|
affaa57 |
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
|
|
affaa57 |
- list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
|
|
|
affaa57 |
+ list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}" isSystemDir)
|
|
|
affaa57 |
if("${isSystemDir}" STREQUAL "-1")
|
|
|
affaa57 |
- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
|
|
|
affaa57 |
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
|
|
|
affaa57 |
endif()
|
|
|
affaa57 |
endif()
|
|
|
affaa57 |
|
|
|
ec1d151 |
@@ -170,7 +174,7 @@ target_link_libraries(encfs
|
|
|
ec1d151 |
${CMAKE_THREAD_LIBS_INIT}
|
|
|
affaa57 |
)
|
|
|
affaa57 |
if (INSTALL_LIBENCFS)
|
|
|
affaa57 |
- install (TARGETS encfs DESTINATION lib)
|
|
|
affaa57 |
+ install (TARGETS encfs DESTINATION ${LIB_INSTALL_DIR})
|
|
|
affaa57 |
endif (INSTALL_LIBENCFS)
|
|
|
affaa57 |
|
|
|
affaa57 |
if (IWYU)
|
|
|
ec1d151 |
@@ -185,7 +189,7 @@ endif()
|
|
|
affaa57 |
|
|
|
affaa57 |
|
|
|
affaa57 |
# Set RPATH to library install path.
|
|
|
affaa57 |
-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
|
|
|
affaa57 |
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
|
|
|
affaa57 |
|
|
|
affaa57 |
add_executable (encfs-bin encfs/main.cpp)
|
|
|
affaa57 |
target_link_libraries (encfs-bin encfs)
|
|
|
affaa57 |
diff --git a/create-dev-pkg.sh b/create-dev-pkg.sh
|
|
|
affaa57 |
index 04c5c40..2ad0072 100755
|
|
|
affaa57 |
--- a/create-dev-pkg.sh
|
|
|
affaa57 |
+++ b/create-dev-pkg.sh
|
|
|
affaa57 |
@@ -1,6 +1,6 @@
|
|
|
affaa57 |
mkdir build
|
|
|
affaa57 |
cd build
|
|
|
affaa57 |
-cmake ..
|
|
|
affaa57 |
+cmake .. $@
|
|
|
affaa57 |
make -j4
|
|
|
affaa57 |
sudo checkinstall --install=no \
|
|
|
affaa57 |
--pkgname="encfs" \
|
|
|
affaa57 |
--
|
|
|
affaa57 |
2.7.4
|
|
|
affaa57 |
|