Skip to content

Commit c6f742d

Browse files
committed
cmake: use GnuInstallDirs
This installs stuff in multiarch compatibile directories
1 parent 8e7b975 commit c6f742d

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

CMakeLists.txt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
project ("ev3devkit" C)
22

33
cmake_minimum_required (VERSION 3.10)
4+
include(GNUInstallDirs)
45

56
get_directory_property(PARENT_DIR PARENT_DIRECTORY)
67

@@ -202,14 +203,14 @@ target_link_libraries(${LIBRARY_NAME}-static ${DEPS_LIBRARIES})
202203
set_target_properties(${LIBRARY_NAME}-static PROPERTIES
203204
OUTPUT_NAME ${LIBRARY_NAME})
204205
add_dependencies(${LIBRARY_NAME} ev3devkit_data)
205-
install (TARGETS ${LIBRARY_NAME}-shared LIBRARY DESTINATION lib)
206-
install (TARGETS ${LIBRARY_NAME}-static ARCHIVE DESTINATION lib)
206+
install (TARGETS ${LIBRARY_NAME}-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
207+
install (TARGETS ${LIBRARY_NAME}-static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
207208

208-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${EV3DEVKIT_PACKAGE}.h DESTINATION include/)
209-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-${GIR_VERSION}.pc DESTINATION lib/pkgconfig/)
210-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${EV3DEVKIT_PACKAGE}.vapi DESTINATION share/vala/vapi/)
211-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GIR_VERSION}.gir DESTINATION share/gir-1.0/)
212-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GIR_VERSION}.typelib DESTINATION lib/girepository-1.0/)
209+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${EV3DEVKIT_PACKAGE}.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
210+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-${GIR_VERSION}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/)
211+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${EV3DEVKIT_PACKAGE}.vapi DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/)
212+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GIR_VERSION}.gir DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/gir-1.0/)
213+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GIR_VERSION}.typelib DESTINATION ${CMAKE_INSTALL_LIBDIR}/girepository-1.0/)
213214

214215
if (EV3DEVKIT_BUILD_DEMO)
215216
set (EXEC_PACKAGES ${COMMON_PACKAGES} ${EV3DEVKIT_PACKAGE})
@@ -243,7 +244,7 @@ if (EV3DEVKIT_BUILD_DEMO)
243244
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
244245
)
245246

246-
install (TARGETS ${DEVICES_DEMO_EXEC_NAME} RUNTIME DESTINATION bin)
247+
install (TARGETS ${DEVICES_DEMO_EXEC_NAME} RUNTIME DESTINATION bi${CMAKE_INSTALL_BINDIR}n)
247248

248249

249250
# User interface demo program
@@ -274,7 +275,7 @@ if (EV3DEVKIT_BUILD_DEMO)
274275
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
275276
)
276277

277-
install (TARGETS ${UI_DEMO_EXEC_NAME} RUNTIME DESTINATION bin)
278+
install (TARGETS ${UI_DEMO_EXEC_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
278279

279280
endif (EV3DEVKIT_BUILD_DEMO)
280281

0 commit comments

Comments
 (0)