diff --git a/libretroshare b/libretroshare index 167589952..59ebd8136 160000 --- a/libretroshare +++ b/libretroshare @@ -1 +1 @@ -Subproject commit 16758995237494a1f39fa86f0f04cf37de121a91 +Subproject commit 59ebd813697eda75b188ea5a8cc5d650c5602700 diff --git a/retroshare-service/CMakeLists.txt b/retroshare-service/CMakeLists.txt index 2a09602d8..2fcdabe28 100644 --- a/retroshare-service/CMakeLists.txt +++ b/retroshare-service/CMakeLists.txt @@ -10,6 +10,12 @@ project(retroshare-service) include(CMakeDependentOption) +set( + RS_BIN_INSTALL_DIR + "${CMAKE_INSTALL_PREFIX}/bin" + CACHE PATH + "Path where to install retroshare-service compiled binary" ) + option( RS_DEVELOPMENT_BUILD "Disable optimization to speed up build, enable verbose build log. \ @@ -67,7 +73,7 @@ list( add_executable(${PROJECT_NAME} ${RS_SERVICE_SOURCES}) -install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) +install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR}) ################################################################################