aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Cheng <kevin.cheng@arm.com>2021-11-03 22:09:42 -0700
committerKevin Cheng <kevin.cheng@arm.com>2021-11-05 11:58:21 -0700
commit87de41f7e0f74c8ad763297367ad79497280ea82 (patch)
tree8b3574714da5f1a83f6f40bf92115b1b6050e174
parentcc24c35c5be1967de520df60015a661b1dd6eb4c (diff)
downloadserialization_lib-87de41f7e0f74c8ad763297367ad79497280ea82.tar.gz
Build flatbuffers into libtosa_serialization.a
Signed-off-by: Kevin Cheng <kevin.cheng@arm.com> Change-Id: Ic148f17caba347e1b3969b15a9373f9be9e39174
-rw-r--r--CMakeLists.txt24
-rw-r--r--third_party/CMakeLists.txt25
2 files changed, 20 insertions, 29 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44af9c0..aaba60e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,12 +27,16 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
include_directories(${PROJECT_SOURCE_DIR}/third_party/flatbuffers/include)
+# Turn off unnecessary flatbuffers targets
+set(FLATBUFFERS_BUILD_TESTS OFF)
+add_subdirectory(third_party/flatbuffers)
+
add_library(tosa_serialization_lib STATIC
src/tosa_serialization_handler.cpp
src/numpy_utils.cpp
- )
+)
-add_subdirectory(third_party)
+target_link_libraries(tosa_serialization_lib PRIVATE flatbuffers)
add_executable(serialization_read_write
test/src/serialization_read_write.cpp
@@ -40,7 +44,6 @@ add_executable(serialization_read_write
target_link_libraries(serialization_read_write
tosa_serialization_lib
- flatbuffers
)
add_executable(serialization_npy_test
@@ -49,5 +52,18 @@ add_executable(serialization_npy_test
target_link_libraries(serialization_npy_test
tosa_serialization_lib
- flatbuffers
+)
+
+set(TOSA_SERIALIZATION_LIB_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/tosa_serialization_lib")
+
+install(
+ TARGETS tosa_serialization_lib EXPORT TosaSerializationLibTargets
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+
+install(EXPORT TosaSerializationLibTargets
+ FILE TosaSerializationLibTargets.cmake
+ NAMESPACE tosa::
+ DESTINATION ${TOSA_SERIALIZATION_LIB_CMAKE_DIR}
)
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
deleted file mode 100644
index b26a94c..0000000
--- a/third_party/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-cmake_minimum_required (VERSION 3.13.4)
-
-# Copyright (c) 2020-2021, ARM Limited.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-set(CMAKE_INSTALL_PREFIX "./third_party" CACHE PATH "..." FORCE)
-
-project(third_party LANGUAGES CXX)
-
-# Flatbuffers tests are not needed
-set(FLATBUFFERS_BUILD_TESTS OFF)
-
-add_subdirectory(flatbuffers)