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