X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=CMakeLists.txt;h=fc4f40e7aa78bb066eae5875376e233b87be01ad;hb=refs%2Fheads%2Faccepted%2Ftizen_unified_x;hp=c163416f0c457f5c1b395c3f1fe97f12a1049f23;hpb=3646ad0f19e05145bbe3b7c25da01b669a07e136;p=platform%2Fcore%2Fuifw%2Fcapi-ui-sticker.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c163416..fc4f40e 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,13 +5,16 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "${PREFIX}")
 SET(VERSION 0.2.56)
 
+IF("${TEST_ENABLE}" STREQUAL "true")
+	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_ENABLE=${TEST_ENABLE}")
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_ENABLE=${TEST_ENABLE}")
+ENDIF()
+
 ADD_DEFINITIONS("-Werror")
 
 ## Include common directory ##
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/client")
-INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/provider")
-INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/consumer")
 
 ## Dependent packages ##
 INCLUDE(FindPkgConfig)
@@ -35,15 +38,12 @@ pkg_check_modules(pkgs REQUIRED
 ## API ##
 ADD_SUBDIRECTORY(include)
 
+## Sticker client ##
+ADD_SUBDIRECTORY(client)
+
 ## Sticker server ##
 ADD_SUBDIRECTORY(server)
 
-## Sticker provider library ##
-ADD_SUBDIRECTORY(provider)
-
-## Sticker consumer library ##
-ADD_SUBDIRECTORY(consumer)
-
 ## Sticker parser ##
 ADD_SUBDIRECTORY(sticker-parser)
 
@@ -53,14 +53,11 @@ ADD_SUBDIRECTORY(receiver)
 ENDIF()
 
 ## Test
-IF(NOT DEFINED MINIMUM_BUILD)
 ENABLE_TESTING()
-SET(UTC_STICKER sticker_unittests)
+SET(UTC_STICKER capi-ui-sticker-unittest)
 ADD_TEST(NAME ${UTC_STICKER} COMMAND ${UTC_STICKER}
-                        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/unit_tests)
-
-ADD_SUBDIRECTORY(unit_tests)
-ENDIF(NOT DEFINED MINIMUM_BUILD)
+                        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+ADD_SUBDIRECTORY(tests)
 
 ## config ##
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/capi-ui-sticker.info DESTINATION ${TZ_SYS_RO_SHARE}/parser-plugins)