Remove unnecessary definitions in CMake 31/211931/1 accepted/tizen/unified/20190812.235533 submit/tizen/20190812.092422
authorKartik Tidke <kr.tidke@samsung.com>
Mon, 12 Aug 2019 14:21:29 +0000 (19:51 +0530)
committerKartik Tidke <kr.tidke@samsung.com>
Mon, 12 Aug 2019 14:21:29 +0000 (19:51 +0530)
Change-Id: I541709996f90df355e5ff067ebe5d66041f2cd83
Signed-off-by: Kartik Tidke <kr.tidke@samsung.com>
CMake/CMakeLists.txt
CMake/res/resource/CMakeLists.txt

index 6e9093b..9bada98 100644 (file)
@@ -14,8 +14,7 @@ SET(PROJECT_EDC_DIR "${PROJECT_RESOURCES_DIR}/resource")
 SET(PROJECT_IMAGES_DIR "${PROJECT_RESOURCES_DIR}/images")
 SET(PROJECT_PO_DIR "${PROJECT_RESOURCES_DIR}/po")
 
-SET(TIZEN_PROFILE_MOBILE "TIZEN_PROFILE")
-SET(TIZEN_PROFILE_COMMON "TIZEN_PROFILE")
+SET(TIZEN_PROFILE "TIZEN_PROFILE")
 
 IF("${TIZEN_PROFILE_NAME}" STREQUAL "MOBILE")
 
@@ -57,7 +56,7 @@ pkg_check_modules(pkgs REQUIRED
        msg-service
 )
 
-SET(TIZEN_PROFILE_MOBILE "TIZEN_PROFILE_MOBILE")
+SET(TIZEN_PROFILE "TIZEN_PROFILE_MOBILE")
 
 ELSEIF("${TIZEN_PROFILE_NAME}" STREQUAL "COMMON")
 
@@ -98,7 +97,7 @@ pkg_check_modules(pkgs REQUIRED
        msg-service
 )
 
-SET(TIZEN_PROFILE_COMMON "TIZEN_PROFILE_COMMON")
+SET(TIZEN_PROFILE "TIZEN_PROFILE_COMMON")
 
 ENDIF()
 
@@ -128,7 +127,6 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${INSTALL_EXEC_PREFIX})
 INSTALL(DIRECTORY DESTINATION ${PREFIX}/data})
 INSTALL(FILES ${PROJECT_ROOT_DIR}/tizen-manifest.xml DESTINATION ${SYS_PACKAGES_DIR} RENAME org.tizen.indicator.xml)
 
-ADD_DEFINITIONS("-D\"${TIZEN_PROFILE_MOBILE}\"")
-ADD_DEFINITIONS("-D\"${TIZEN_PROFILE_COMMON}\"")
+ADD_DEFINITIONS("-D\"${TIZEN_PROFILE}\"")
 
 ADD_SUBDIRECTORY(res)
index 3891223..0999abe 100644 (file)
@@ -1,8 +1,7 @@
 ADD_CUSTOM_TARGET(indicator_port.edj
                COMMAND edje_cc
                -id ${PROJECT_EDC_DIR}/icons_edc
-               -D${TIZEN_PROFILE_MOBILE}
-               -D${TIZEN_PROFILE_COMMON} "${EDJEFLAGS}"
+               -D${TIZEN_PROFILE} "${EDJEFLAGS}"
                ${PROJECT_EDC_DIR}/indicator_port.edc
                indicator_port.edj
                DEPENDS ${PROJECT_EDC_DIR}/indicator_port.edc
@@ -12,8 +11,7 @@ ADD_DEPENDENCIES(${PROJECT_NAME} indicator_port.edj)
 ADD_CUSTOM_TARGET(ticker.edj
                COMMAND edje_cc
                -id ${PROJECT_EDC_DIR}/icons_edc
-               -D${TIZEN_PROFILE_MOBILE}
-               -D${TIZEN_PROFILE_COMMON} "${EDJEFLAGS}"
+               -D${TIZEN_PROFILE} "${EDJEFLAGS}"
                ${PROJECT_EDC_DIR}/ticker.edc
                ticker.edj
                DEPENDS ${PROJECT_EDC_DIR}/ticker.edc
@@ -23,8 +21,7 @@ ADD_DEPENDENCIES(${PROJECT_NAME} ticker.edj)
 ADD_CUSTOM_TARGET(ticker_default.edj
                COMMAND edje_cc
                -id ${PROJECT_EDC_DIR}/icons_edc
-               -D${TIZEN_PROFILE_MOBILE}
-               -D${TIZEN_PROFILE_COMMON} "${EDJEFLAGS}"
+               -D${TIZEN_PROFILE} "${EDJEFLAGS}"
                ${PROJECT_EDC_DIR}/ticker_default.edc
                ticker_default.edj
                DEPENDS ${PROJECT_EDC_DIR}/ticker_default.edc
@@ -34,8 +31,7 @@ ADD_DEPENDENCIES(${PROJECT_NAME} ticker_default.edj)
 ADD_CUSTOM_TARGET(ticker_animated_icon.edj
                COMMAND edje_cc
                -id ${PROJECT_EDC_DIR}/animated_icon
-               -D${TIZEN_PROFILE_MOBILE}
-               -D${TIZEN_PROFILE_COMMON} "${EDJEFLAGS}"
+               -D${TIZEN_PROFILE} "${EDJEFLAGS}"
                ${PROJECT_EDC_DIR}/ticker_animated_icon.edc
                ticker_animated_icon.edj
                DEPENDS ${PROJECT_EDC_DIR}/ticker_animated_icon.edc
@@ -44,8 +40,7 @@ ADD_DEPENDENCIES(${PROJECT_NAME} ticker_animated_icon.edj)
 
 ADD_CUSTOM_TARGET(indicator_icon_theme.edj
                COMMAND edje_cc
-               -D${TIZEN_PROFILE_MOBILE}
-               -D${TIZEN_PROFILE_COMMON} "${EDJEFLAGS}"
+               -D${TIZEN_PROFILE} "${EDJEFLAGS}"
                ${PROJECT_EDC_DIR}/indicator_icon_theme.edc
                indicator_icon_theme.edj
                DEPENDS ${PROJECT_EDC_DIR}/indicator_icon_theme.edc
@@ -54,8 +49,7 @@ ADD_DEPENDENCIES(${PROJECT_NAME} indicator_icon_theme.edj)
 
 ADD_CUSTOM_TARGET(indicator_icon_nonfixed_theme.edj
                COMMAND edje_cc
-               -D${TIZEN_PROFILE_MOBILE}
-               -D${TIZEN_PROFILE_COMMON} "${EDJEFLAGS}"
+               -D${TIZEN_PROFILE} "${EDJEFLAGS}"
                ${PROJECT_EDC_DIR}/indicator_icon_nonfixed_theme.edc
                indicator_icon_nonfixed_theme.edj
                DEPENDS ${PROJECT_EDC_DIR}/indicator_icon_nonfixed_theme.edc
@@ -65,8 +59,7 @@ ADD_DEPENDENCIES(${PROJECT_NAME} indicator_icon_nonfixed_theme.edj)
 ADD_CUSTOM_TARGET(indicator_icon_animation.edj
                COMMAND edje_cc
                -id ${PROJECT_EDC_DIR}/icons_edc
-               -D${TIZEN_PROFILE_MOBILE}
-               -D${TIZEN_PROFILE_COMMON} "${EDJEFLAGS}"
+               -D${TIZEN_PROFILE} "${EDJEFLAGS}"
                ${PROJECT_EDC_DIR}/indicator_icon_animation.edc
                indicator_icon_animation.edj
                DEPENDS ${PROJECT_EDC_DIR}/indicator_icon_animation.edc