From 9e7e0a456ddca39493f1dec4dd87a1f348691a18 Mon Sep 17 00:00:00 2001 From: "Francisco Blas (klondike) Izquierdo Riera" Date: Wed, 31 Dec 2014 19:05:54 +0100 Subject: [PATCH] Use better install paths --- build/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt index a7d979e7..780eb386 100644 --- a/build/CMakeLists.txt +++ b/build/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required ( VERSION 2.8 ) +cmake_minimum_required ( VERSION 2.8.5 ) project ( "i2pd" ) # configurale options @@ -143,6 +143,9 @@ message(STATUS " LIBRARY : ${WITH_LIBRARY}") message(STATUS " STATIC BUILD : ${WITH_STATIC}") message(STATUS "---------------------------------------") +#Handle paths nicely +include(GNUInstallDirs) + add_executable ( "${PROJECT_NAME}-bin" ${COMMON_SRC} ${DAEMON_SRC}) set_target_properties("${PROJECT_NAME}-bin" PROPERTIES OUTPUT_NAME "${PROJECT_NAME}") @@ -157,9 +160,9 @@ endif () target_link_libraries( "${PROJECT_NAME}-bin" ${Boost_LIBRARIES} ${CRYPTO++_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) -install(TARGETS "${PROJECT_NAME}-bin" RUNTIME DESTINATION "bin") +install(TARGETS "${PROJECT_NAME}-bin" RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) if (WITH_LIBRARY) add_library(${PROJECT_NAME} SHARED ${COMMON_SRC} ${LIBRARY_SRC}) - install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "lib") + install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) endif ()