From 05daaf0e9242be79b74fd42ee665328107d875dd Mon Sep 17 00:00:00 2001 From: Seungha Son Date: Fri, 7 Apr 2023 00:16:31 +0900 Subject: [PATCH] [Build] Move NNS_EDGE_LIB_NAME variable to root CMakeLists.txt Move the NNS_EDGE_LIB_NAME variable from the src/CMakeLists.txt to CMakeLists.txt in the root directory. Since the nnstreamer-edge value is also referenced in the tests/CMakeLists.txt file, change the variable to use in common to minimize human errors. Signed-off-by: Seungha Son --- CMakeLists.txt | 1 + src/CMakeLists.txt | 1 - tests/CMakeLists.txt | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c1ec234..c1c979e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,6 +41,7 @@ SET(INCLUDE_INSTALL_DIR "${PREFIX}/include") SET(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) SET(INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) SET(NNS_EDGE_SRC_DIR ${SOURCE_DIR}/libnnstreamer-edge) +SET(NNS_EDGE_LIB_NAME nnstreamer-edge) # Build options and required packages SET(REQUIRE_PKGS "") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 51427a5..9aaf179 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,4 @@ # NNStreamer-Edge library -SET(NNS_EDGE_LIB_NAME nnstreamer-edge) SET(NNS_EDGE_SRCS ${NNS_EDGE_SRC_DIR}/nnstreamer-edge-metadata.c ${NNS_EDGE_SRC_DIR}/nnstreamer-edge-data.c diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 65bc4e0..8b50342 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,14 +1,14 @@ # nnstreamer-edge test ADD_EXECUTABLE(unittest_nnstreamer-edge unittest_nnstreamer-edge.cc) TARGET_INCLUDE_DIRECTORIES(unittest_nnstreamer-edge PRIVATE ${EDGE_REQUIRE_PKGS_INCLUDE_DIRS} ${INCLUDE_DIR} ${NNS_EDGE_SRC_DIR}) -TARGET_LINK_LIBRARIES(unittest_nnstreamer-edge ${TEST_REQUIRE_PKGS_LDFLAGS} nnstreamer-edge) +TARGET_LINK_LIBRARIES(unittest_nnstreamer-edge ${TEST_REQUIRE_PKGS_LDFLAGS} ${NNS_EDGE_LIB_NAME}) INSTALL (TARGETS unittest_nnstreamer-edge DESTINATION ${BIN_INSTALL_DIR}) # AITT test IF(AITT_SUPPORT) ADD_EXECUTABLE(unittest_nnstreamer-edge-aitt unittest_nnstreamer-edge-aitt.cc) TARGET_INCLUDE_DIRECTORIES(unittest_nnstreamer-edge-aitt PRIVATE ${EDGE_REQUIRE_PKGS_INCLUDE_DIRS} ${INCLUDE_DIR} ${NNS_EDGE_SRC_DIR}) -TARGET_LINK_LIBRARIES(unittest_nnstreamer-edge-aitt ${TEST_REQUIRE_PKGS_LDFLAGS} nnstreamer-edge) +TARGET_LINK_LIBRARIES(unittest_nnstreamer-edge-aitt ${TEST_REQUIRE_PKGS_LDFLAGS} ${NNS_EDGE_LIB_NAME}) INSTALL (TARGETS unittest_nnstreamer-edge-aitt DESTINATION ${BIN_INSTALL_DIR}) ENDIF() @@ -16,6 +16,6 @@ ENDIF() IF(MQTT_SUPPORT) ADD_EXECUTABLE(unittest_nnstreamer-edge-mqtt unittest_nnstreamer-edge-mqtt.cc) TARGET_INCLUDE_DIRECTORIES(unittest_nnstreamer-edge-mqtt PRIVATE ${EDGE_REQUIRE_PKGS_INCLUDE_DIRS} ${INCLUDE_DIR} ${NNS_EDGE_SRC_DIR}) -TARGET_LINK_LIBRARIES(unittest_nnstreamer-edge-mqtt ${TEST_REQUIRE_PKGS_LDFLAGS} nnstreamer-edge) +TARGET_LINK_LIBRARIES(unittest_nnstreamer-edge-mqtt ${TEST_REQUIRE_PKGS_LDFLAGS} ${NNS_EDGE_LIB_NAME}) INSTALL (TARGETS unittest_nnstreamer-edge-mqtt DESTINATION ${BIN_INSTALL_DIR}) ENDIF() -- 2.34.1