From de4791f0c7eef5a5b2cc33d9e40e7ae978c64ab3 Mon Sep 17 00:00:00 2001 From: Matias Fontanini Date: Sat, 17 Mar 2018 15:35:04 -0700 Subject: [PATCH] Allow users to specify library install dir Fixes #273 --- CMakeLists.txt | 11 ++++++----- src/CMakeLists.txt | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8db81b1..cd8520b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,18 +224,19 @@ IF(DOXYGEN_FOUND) ) ENDIF(DOXYGEN_FOUND) -# The library output directory -SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) -SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) - # Configuration file CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/include/tins/config.h.in" "${PROJECT_SOURCE_DIR}/include/tins/config.h" ) +IF (NOT CMAKE_INSTALL_LIBDIR) + SET(CMAKE_INSTALL_LIBDIR lib) +ENDIF() +# The library output directory +SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) +SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) # Support for pkg-config -SET(CMAKE_INSTALL_LIBDIR lib) SET(pkgconfig_prefix ${CMAKE_INSTALL_PREFIX}) SET(pkgconfig_exec_prefix ${CMAKE_INSTALL_PREFIX}) SET(pkgconfig_libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index da877f8..c5f2d26 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -219,8 +219,8 @@ SET_TARGET_PROPERTIES(tins PROPERTIES VERSION ${LIBTINS_VERSION} SOVERSION ${LIB INSTALL( TARGETS tins EXPORT libtinsTargets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev ) @@ -233,4 +233,4 @@ MACRO(INSTALL_HEADERS_WITH_DIRECTORY HEADER_LIST) ENDFOREACH(HEADER) ENDMACRO() -INSTALL_HEADERS_WITH_DIRECTORY(${HEADERS}) \ No newline at end of file +INSTALL_HEADERS_WITH_DIRECTORY(${HEADERS})