[Common] move common h files
authorJaeyun <jy1210.jung@samsung.com>
Wed, 31 Oct 2018 04:36:32 +0000 (13:36 +0900)
committerMyungJoo Ham <myungjoo.ham@gmail.com>
Wed, 31 Oct 2018 09:12:22 +0000 (09:12 +0000)
1. move h files info gst/nnstreamer and change cmake to install these files.
2. remove unnecessary def in cmake (INCLUDE_INSTALL_DIR defined {PREFIX}/include)

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>
CMakeLists.txt
gst/nnstreamer/tensor_common.h [moved from include/tensor_common.h with 100% similarity]
gst/nnstreamer/tensor_filter_custom.h [moved from include/tensor_filter_custom.h with 100% similarity]
gst/nnstreamer/tensor_typedef.h [moved from include/tensor_typedef.h with 100% similarity]

index c7301bd..bfa847a 100644 (file)
@@ -64,16 +64,10 @@ ELSE(TIZEN OR GTEST_LIB)
        SET(gtestInc /usr/src/gtest)
 ENDIF(TIZEN OR GTEST_LIB)
 
-IF (NOT INCLUDE_INSTALL_DIR)
-       # We need to define includedir path
-       SET (INCLUDE_INSTALL_DIR /usr/include)
-       MESSAGE ("Warning: INCLUDE_INSTALL_DIR not defined. Using /usr/include")
-ENDIF (NOT INCLUDE_INSTALL_DIR)
-
 pkg_check_modules(pkgs REQUIRED ${PKG_MODULES})
 
 INCLUDE_DIRECTORIES(
-       ${CMAKE_SOURCE_DIR}/include
+       ${CMAKE_SOURCE_DIR}/gst/nnstreamer
 )
 INCLUDE_DIRECTORIES(
        SYSTEM
@@ -193,12 +187,12 @@ ENDIF (SINGLE_BINARY)
 CONFIGURE_FILE(nnstreamer.pc.in nnstreamer.pc @ONLY)
 
 # For nnstreamer users (gst app developers using via gstreamer API)
-INSTALL(FILES include/tensor_typedef.h
+INSTALL(FILES gst/nnstreamer/tensor_typedef.h
        DESTINATION ${INCLUDE_INSTALL_DIR}/nnstreamer
        )
 
 # For nnstreamer custom filter developers
-INSTALL(FILES include/tensor_common.h include/tensor_filter_custom.h
+INSTALL(FILES gst/nnstreamer/tensor_common.h gst/nnstreamer/tensor_filter_custom.h
        DESTINATION ${INCLUDE_INSTALL_DIR}/nnstreamer
        )