Skip to content

Commit 79c79e6

Browse files
author
Ximin Luo
committed
directly use GNU install dirs rather than hard-coding matching ones
1 parent 99b9110 commit 79c79e6

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,5 @@ endif()
6767

6868
enable_testing()
6969

70-
install(DIRECTORY boost DESTINATION "include")
70+
include(GNUInstallDirs)
71+
install(DIRECTORY boost DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

libs/network/src/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ set(CPP-NETLIB_URI_SRCS uri/uri.cpp uri/schemes.cpp)
1212
add_library(cppnetlib-uri ${CPP-NETLIB_URI_SRCS})
1313
set_target_properties(cppnetlib-uri
1414
PROPERTIES VERSION ${CPPNETLIB_VERSION_STRING} SOVERSION ${CPPNETLIB_VERSION_MAJOR})
15-
install(TARGETS cppnetlib-uri DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE})
15+
install(TARGETS cppnetlib-uri DESTINATION ${CMAKE_INSTALL_LIBDIR})
1616

1717
set(CPP-NETLIB_HTTP_SERVER_SRCS server_request_parsers_impl.cpp)
1818
add_library(cppnetlib-server-parsers ${CPP-NETLIB_HTTP_SERVER_SRCS})
1919
set_target_properties(cppnetlib-server-parsers
2020
PROPERTIES VERSION ${CPPNETLIB_VERSION_STRING} SOVERSION ${CPPNETLIB_VERSION_MAJOR})
21-
install(TARGETS cppnetlib-server-parsers DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE})
21+
install(TARGETS cppnetlib-server-parsers DESTINATION ${CMAKE_INSTALL_LIBDIR})
2222

2323
set(CPP-NETLIB_HTTP_CLIENT_SRCS client.cpp)
2424
add_library(cppnetlib-client-connections ${CPP-NETLIB_HTTP_CLIENT_SRCS})
2525
set_target_properties(cppnetlib-client-connections
2626
PROPERTIES VERSION ${CPPNETLIB_VERSION_STRING} SOVERSION ${CPPNETLIB_VERSION_MAJOR})
27-
install(TARGETS cppnetlib-client-connections DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE})
27+
install(TARGETS cppnetlib-client-connections DESTINATION ${CMAKE_INSTALL_LIBDIR})

0 commit comments

Comments
 (0)