commit a7b7928b87825502a428acd5a71713d88622982b
author Matthew Bentham <matthew.bentham@arm.com> Mon Jun 03 13:00:50 2019 +0100
committer Matthew Bentham <matthew.bentham@arm.com> Mon Jun 03 13:01:13 2019 +0100
tree 54324fde7880cfc89d2ec632741a6321eef6e150
parent 8c7324dd7b8751f31f39ba55aaae5c3b48882f3c

MLCE-124 Fix install target wrt serializer and tflite parser

Change-Id: If38336f1678504849edb0134a59daae1c8d9ef92
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9ca70e..00866c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,8 @@
     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 ${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})
 

src/armnnSerializer/CMakeLists.txt

diff --git a/src/armnnSerializer/CMakeLists.txt b/src/armnnSerializer/CMakeLists.txt
index bca36f9..a7f85ec 100755
--- a/src/armnnSerializer/CMakeLists.txt
+++ b/src/armnnSerializer/CMakeLists.txt
@@ -34,4 +34,7 @@
     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()

src/armnnTfLiteParser/CMakeLists.txt

diff --git a/src/armnnTfLiteParser/CMakeLists.txt b/src/armnnTfLiteParser/CMakeLists.txt
index 2a6a0a1..8ff0837 100755
--- a/src/armnnTfLiteParser/CMakeLists.txt
+++ b/src/armnnTfLiteParser/CMakeLists.txt
@@ -20,4 +20,7 @@
 
     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()