IVGCVSW-6989 'Fixed build issue'
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I20e22821b6d4532953ddec2a8eac2a0f09e8013b
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b535b2..959675d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
#
-# Copyright © 2020 Arm Ltd and Contributors. All rights reserved.
+# Copyright © 2022 Arm Ltd and Contributors. All rights reserved.
# Copyright 2020 NXP
# SPDX-License-Identifier: MIT
#
@@ -116,7 +116,9 @@
src/armnnUtils/Transpose.cpp
)
-add_library_ex(armnnUtils OBJECT ${armnnUtils_sources})
+add_library(armnnUtilsObj OBJECT ${armnnUtils_sources})
+add_library_ex(armnnUtils STATIC ${armnnUtils_sources})
+
target_include_directories(armnnUtils PRIVATE src/backends)
if(BUILD_ONNX_PARSER)
@@ -816,7 +818,7 @@
target_link_libraries(UnitTests ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(UnitTests armnn)
- target_link_libraries(UnitTests armnnUtils)
+ target_link_libraries(UnitTests $<TARGET_OBJECTS:armnnUtilsObj>)
target_link_libraries(UnitTests armnnTestUtils)
if(BUILD_GATORD_MOCK)
@@ -963,6 +965,14 @@
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
+install(
+ TARGETS armnnUtilsObj
+ EXPORT armnn-targets
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ OBJECTS DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+
####################################################
## Set export alias
set_target_properties(armnn
diff --git a/shim/sl/CMakeLists.txt b/shim/sl/CMakeLists.txt
index 82dc444..81c97f9 100644
--- a/shim/sl/CMakeLists.txt
+++ b/shim/sl/CMakeLists.txt
@@ -489,7 +489,7 @@
canonical/SystemPropertiesUtils.hpp
support_library_service.cpp)
-list(APPEND armnn_support_library_sources "$<TARGET_OBJECTS:Armnn::armnnUtils>")
+list(APPEND armnn_support_library_sources "$<TARGET_OBJECTS:Armnn::armnnUtilsObj>")
list(APPEND armnn_support_library_sources "$<TARGET_OBJECTS:Armnn::armnnSerializerObj>")
add_library(armnn_support_library SHARED ${armnn_support_library_sources})