Cmake test build refactoring

- include -> target_include
- clean pkg_check_modules usage
- remove manual compile option
- remove unused libraries
- remove unused command

Change-Id: I1e3a389ac41ed18637ff15fcd8898b2652319fbf
Signed-off-by: Kwang Son <k.son@samsung.com>

4 files changed, 15 insertions, 50 deletions

diff --git a/test/testsuites/common/CMakeLists.txt b/test/testsuites/common/CMakeLists.txt
index e62cc2a0..7f375808 100644
--- a/test/testsuites/common/CMakeLists.txt
+++ b/test/testsuites/common/CMakeLists.txt
@@ -1,6 +1,3 @@
-project(mv_testsuites_common)
-cmake_minimum_required(VERSION 2.6)
-
-add_subdirectory(${PROJECT_SOURCE_DIR}/image_helper)
-add_subdirectory(${PROJECT_SOURCE_DIR}/video_helper)
-add_subdirectory(${PROJECT_SOURCE_DIR}/testsuite_common)
+add_subdirectory(image_helper)
+add_subdirectory(video_helper)
+add_subdirectory(testsuite_common)
diff --git a/test/testsuites/common/image_helper/CMakeLists.txt b/test/testsuites/common/image_helper/CMakeLists.txt
index 2ed724ac..ef9cc677 100644
--- a/test/testsuites/common/image_helper/CMakeLists.txt
+++ b/test/testsuites/common/image_helper/CMakeLists.txt
@@ -1,15 +1,6 @@
 project(mv_image_helper)
 cmake_minimum_required(VERSION 2.6)
 
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG _DEBUG)
-
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
-include_directories("${PROJECT_SOURCE_DIR}/include")
-
-file(GLOB MV_IMAGE_HELPER_INCLUDE_LIST "${PROJECT_SOURCE_DIR}/include/*.h")
 file(GLOB MV_IMAGE_HELPER_SRC_LIST "${PROJECT_SOURCE_DIR}/src/*.c"
                                    "${PROJECT_SOURCE_DIR}/src/*.cpp")
 
@@ -18,16 +9,15 @@ find_package(OpenCV REQUIRED core highgui imgproc)
 if(NOT OpenCV_FOUND)
     message(SEND_ERROR "Failed to find OpenCV")
     return()
-else()
-    include_directories(${OpenCV_INCLUDE_DIRS})
 endif()
 
 if(FORCED_STATIC_BUILD)
-    add_library(${PROJECT_NAME} STATIC ${MV_IMAGE_HELPER_INCLUDE_LIST} ${MV_IMAGE_HELPER_SRC_LIST})
+    add_library(${PROJECT_NAME} STATIC ${MV_IMAGE_HELPER_SRC_LIST})
 else()
-    add_library(${PROJECT_NAME} SHARED ${MV_IMAGE_HELPER_INCLUDE_LIST} ${MV_IMAGE_HELPER_SRC_LIST})
+    add_library(${PROJECT_NAME} SHARED ${MV_IMAGE_HELPER_SRC_LIST})
 endif()
 
+target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/include ${OpenCV_INCLUDE_DIRS})
 target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS})
 
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
diff --git a/test/testsuites/common/testsuite_common/CMakeLists.txt b/test/testsuites/common/testsuite_common/CMakeLists.txt
index 567dcc43..a7ca583e 100644
--- a/test/testsuites/common/testsuite_common/CMakeLists.txt
+++ b/test/testsuites/common/testsuite_common/CMakeLists.txt
@@ -1,15 +1,8 @@
-set (pkgname mv_testsuite_common)
-project(${pkgname})
-
+project(mv_testsuite_common)
 cmake_minimum_required(VERSION 2.6)
 
-set(INC_DIR include)
-include_directories(${INC_DIR})
-include_directories(${INC_IMAGE_HELPER})
-include_directories(${INC_VIDEO_HELPER})
-
-add_library(${pkgname} SHARED "mv_testsuite_common.c" "mv_testsuite_common.h")
-
-target_link_libraries(${pkgname} ${MV_COMMON_LIB_NAME} mv_image_helper)
+add_library(${PROJECT_NAME} SHARED mv_testsuite_common.c)
+target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} mv_image_helper)
+target_include_directories(${PROJECT_NAME} PUBLIC . ${INC_VIDEO_HELPER})
 
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
diff --git a/test/testsuites/common/video_helper/CMakeLists.txt b/test/testsuites/common/video_helper/CMakeLists.txt
index 0f5254c4..2dc8cd59 100644
--- a/test/testsuites/common/video_helper/CMakeLists.txt
+++ b/test/testsuites/common/video_helper/CMakeLists.txt
@@ -1,25 +1,10 @@
-set (pkgname mv_video_helper)
-project(${pkgname})
-
+project(mv_video_helper)
 cmake_minimum_required(VERSION 2.6)
 
-set(INC_DIR include)
-include_directories(${INC_DIR})
-include_directories(${INC_IMAGE_HELPER})
-
-set(dependents "gstreamer-1.0 gstreamer-app-1.0 dlog")
-
-include(FindPkgConfig)
-pkg_check_modules(${pkgname} REQUIRED ${dependents})
-foreach(flag ${${pkgname}_CFLAGS})
-  set(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-endforeach(flag)
-
-set(CMAKE_C_FLAGS "-I./include -I./include/headers ${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall")
-set(CMAKE_C_FLAGS_DEBUG "-O0 -g")
-
-add_library(${pkgname} SHARED "mv_video_helper.c" "mv_video_helper.h")
+pkg_check_modules(${PROJECT_NAME}_DEP REQUIRED gstreamer-1.0 gstreamer-app-1.0 gstreamer-video-1.0 dlog)
 
-target_link_libraries(${pkgname} ${${pkgname}_LDFLAGS} gstvideo-1.0)
+add_library(${PROJECT_NAME} SHARED mv_video_helper.c)
+target_link_libraries(${PROJECT_NAME} ${${PROJECT_NAME}_DEP_LIBRARIES})
+target_include_directories(${PROJECT_NAME} PUBLIC ${INC_IMAGE_HELPER} ${${PROJECT_NAME}_DEP_INCLUDE_DIRS})
 
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})