diff options
-rw-r--r-- | CMakeLists.txt | 16 | ||||
-rwxr-xr-x | src/armnnSerializer/CMakeLists.txt | 5 | ||||
-rwxr-xr-x | src/armnnTfLiteParser/CMakeLists.txt | 5 |
3 files changed, 19 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c9ca70e07f..00866c03c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,8 @@ foreach(cmake_file ${additional_cmake_files}) include(${cmake_file}) endforeach() +include(GNUInstallDirs) + add_subdirectory(samples) add_subdirectory(src/armnnTfLiteParser) add_subdirectory(src/armnnSerializer) @@ -416,18 +418,22 @@ target_link_libraries(armnn armnnUtils) target_link_libraries(armnn ${CMAKE_DL_LIBS}) -install(TARGETS armnn DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) +install(TARGETS armnn + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) if(BUILD_CAFFE_PARSER) - install(TARGETS armnnCaffeParser DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + install(TARGETS armnnCaffeParser + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() if(BUILD_ONNX_PARSER) - install(TARGETS armnnOnnxParser DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + install(TARGETS armnnOnnxParser + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() if(BUILD_TF_PARSER) - install(TARGETS armnnTfParser DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + install(TARGETS armnnTfParser + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include) +install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) target_link_libraries(armnn ${Boost_LOG_LIBRARY} ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY}) diff --git a/src/armnnSerializer/CMakeLists.txt b/src/armnnSerializer/CMakeLists.txt index bca36f93d1..a7f85ec871 100755 --- a/src/armnnSerializer/CMakeLists.txt +++ b/src/armnnSerializer/CMakeLists.txt @@ -34,4 +34,7 @@ if(BUILD_ARMNN_SERIALIZER) target_include_directories(armnnSerializer SYSTEM PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(armnnSerializer armnn ${FLATBUFFERS_LIBRARY}) -endif()
\ No newline at end of file + + install(TARGETS armnnSerializer + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +endif() diff --git a/src/armnnTfLiteParser/CMakeLists.txt b/src/armnnTfLiteParser/CMakeLists.txt index 2a6a0a19cd..8ff0837e31 100755 --- a/src/armnnTfLiteParser/CMakeLists.txt +++ b/src/armnnTfLiteParser/CMakeLists.txt @@ -20,4 +20,7 @@ if(BUILD_TF_LITE_PARSER) target_link_libraries(armnnTfLiteParser ${Boost_FILESYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY}) target_link_libraries(armnnTfLiteParser armnn ${FLATBUFFERS_LIBRARY}) -endif()
\ No newline at end of file + + install(TARGETS armnnTfLiteParser + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +endif() |