From b6e248905e3bbd59ec2eaf3a598b21780eab1f62 Mon Sep 17 00:00:00 2001 From: haejoonkim-lunit Date: Mon, 16 Sep 2019 05:08:32 +0000 Subject: [PATCH 1/2] add GNUInstallDirs module --- CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1937f19..ba4f0d2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -267,16 +267,18 @@ target_link_libraries(getSupportedAPITest PUBLIC ${PROTOBUF_LIB} nvonnxparser_st # -------------------------------- # Installation # -------------------------------- +include(GNUInstallDirs) + install(TARGETS onnx2trt nvonnxparser nvonnxparser_static - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(FILES ${HEADERS} - DESTINATION include + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) SET(CPACK_GENERATOR "DEB") From f1b1a78c0797a01bc6ea2f18ba0cef62267a12d5 Mon Sep 17 00:00:00 2001 From: haejoonkim-lunit Date: Tue, 17 Sep 2019 01:56:28 +0000 Subject: [PATCH 2/2] fix indents --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ba4f0d2a..fcfc0a36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,9 +272,9 @@ include(GNUInstallDirs) install(TARGETS onnx2trt nvonnxparser nvonnxparser_static - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(FILES ${HEADERS}