commit 91e1d89ad35ad081a4d5995d541791fbefdb3060
author Rob Hughes <robert.hughes@arm.com> Fri Aug 23 10:11:58 2019 +0100
committer Rob Hughes <robert.hughes@arm.com> Fri Aug 23 09:16:16 2019 +0000
tree 57022df335b5ccd38aa697394f97d12e6bfd3db5
parent 1cd451cdd818e7df83cf60935abc54345fbc40e6

Fix Windows build:

* CMake "install" commands require a RUNTIME argument for platforms with
DLLs (e.g. Windows).
* Replace use of non-standard variable length array with vector
* Remove unnecessary #include of unistd.h
* Add #ifdefs to dynamic backend code to disable for non-Unix platforms
where you can't use dlopen etc. We could implement this properly for Windows
later using LoadLibrary etc., but for now erroring is fine.
* Add missing #include of <algorithm>

Change-Id: Ic8ef5fd599b37bf8772510157b6e479819f6a1eb

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2236e24..420aabd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -449,18 +449,22 @@
 target_link_libraries(armnn ${CMAKE_DL_LIBS})
 
 install(TARGETS armnn
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 if(BUILD_CAFFE_PARSER)
     install(TARGETS armnnCaffeParser
-            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 if(BUILD_ONNX_PARSER)
     install(TARGETS armnnOnnxParser
-            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 if(BUILD_TF_PARSER)
     install(TARGETS armnnTfParser
-            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
 install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})