diff options
author | Matthew Bentham <matthew.bentham@arm.com> | 2019-06-03 13:00:50 +0100 |
---|---|---|
committer | Matthew Bentham <matthew.bentham@arm.com> | 2019-06-03 13:01:13 +0100 |
commit | a7b7928b87825502a428acd5a71713d88622982b (patch) | |
tree | 54324fde7880cfc89d2ec632741a6321eef6e150 /CMakeLists.txt | |
parent | 8c7324dd7b8751f31f39ba55aaae5c3b48882f3c (diff) | |
download | armnn-a7b7928b87825502a428acd5a71713d88622982b.tar.gz |
MLCE-124 Fix install target wrt serializer and tflite parser
Change-Id: If38336f1678504849edb0134a59daae1c8d9ef92
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 11 insertions, 5 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}) |