From 75c4120b0c958f8a724ddfd4fca805968eaae2f1 Mon Sep 17 00:00:00 2001 From: Vincent Raman Date: Thu, 3 Sep 2015 18:44:12 +0200 Subject: [PATCH 1/2] Standard install paths --- CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b704043..3b759a24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,13 +52,9 @@ list(APPEND TARGET_LIBRARIES sioclient_tls) endif() install(FILES ${ALL_HEADERS} - DESTINATION "${CMAKE_CURRENT_LIST_DIR}/build/include" + DESTINATION "include" ) install(TARGETS ${TARGET_LIBRARIES} - DESTINATION "${CMAKE_CURRENT_LIST_DIR}/build/lib/${CMAKE_BUILD_TYPE}" -) - -install(FILES ${Boost_LIBRARIES} - DESTINATION "${CMAKE_CURRENT_LIST_DIR}/build/lib/${CMAKE_BUILD_TYPE}" + DESTINATION "lib" ) From 7176b4649def7d2a7d43a518988892fcb8beb1d5 Mon Sep 17 00:00:00 2001 From: Vincent Raman Date: Mon, 21 Sep 2015 21:34:46 +0200 Subject: [PATCH 2/2] Use Cmake's GnuInstallDirs module for standard install paths --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b759a24..16f048ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,10 +51,12 @@ list(APPEND TARGET_LIBRARIES sioclient_tls) endif() +include(GNUInstallDirs) + install(FILES ${ALL_HEADERS} - DESTINATION "include" + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) install(TARGETS ${TARGET_LIBRARIES} - DESTINATION "lib" + DESTINATION ${CMAKE_INSTALL_LIBDIR} )