File tree Expand file tree Collapse file tree 2 files changed +7
-5
lines changed
Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -45,6 +45,8 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${PAHO_VERSION_MAJOR})
4545set (CPACK_PACKAGE_VERSION_MINOR ${PAHO_VERSION_MINOR} )
4646set (CPACK_PACKAGE_VERSION_PATCH ${PAHO_VERSION_PATCH} )
4747
48+ INCLUDE (GNUInstallDirs)
49+
4850## --- Build options ---
4951
5052if (WIN32 )
Original file line number Diff line number Diff line change @@ -79,9 +79,9 @@ if(PAHO_BUILD_SHARED)
7979
8080 ## install the shared library
8181 install (TARGETS ${PAHO_MQTT_CPP}
82- ARCHIVE DESTINATION lib
83- LIBRARY DESTINATION lib
84- RUNTIME DESTINATION bin )
82+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
83+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
84+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
8585endif ()
8686
8787## --- Build static version of the library, if requested ---
@@ -95,8 +95,8 @@ if(PAHO_BUILD_STATIC)
9595
9696 ## install the static library
9797 install (TARGETS ${PAHO_MQTT_CPP_STATIC}
98- ARCHIVE DESTINATION lib
99- LIBRARY DESTINATION lib )
98+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
99+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
100100
101101 ## Static lib has same name as shared lib
102102 set_target_properties (${PAHO_MQTT_CPP_STATIC} PROPERTIES OUTPUT_NAME ${PAHO_MQTT_CPP} )
You can’t perform that action at this time.
0 commit comments