From: DoHyun Pyun Date: Mon, 21 Nov 2016 06:05:50 +0000 (+0900) Subject: Modify build feature names as Tizen 3.0 build option naming rule X-Git-Tag: submit/tizen/20161122.051739^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=214d6f49674bae2c2cb76a000e82d4167a5eb0de;p=platform%2Fcore%2Fconnectivity%2Fbt-syspopup.git Modify build feature names as Tizen 3.0 build option naming rule Change-Id: I6f63f147d597b9e61ece55aaaa24b36d842eaae0 Signed-off-by: DoHyun Pyun --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 297c87c..7bab2a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,16 +1,16 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) PROJECT(bt-syspopup C) -IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_WEARABLE") +IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_PROFILE_WEARABLE") SET(SRCS ${CMAKE_SOURCE_DIR}/src/bt-syspopup-w.c) ENDIF() -IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_MOBILE") +IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_PROFILE_MOBILE") SET(SRCS ${CMAKE_SOURCE_DIR}/src/bt-syspopup-m.c) ENDIF() SET(PREFIX ${CMAKE_INSTALL_PREFIX}) -IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_WEARABLE") +IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_PROFILE_WEARABLE") SET(TABLEDIR "/usr/apps/org.tizen.bt-syspopup/shared/res/tables") SET(IMAGE_DIR "/usr/apps/org.tizen.bt-syspopup/res/images/") ENDIF() @@ -23,7 +23,7 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}) INCLUDE(FindPkgConfig) -IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_WEARABLE") +IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_PROFILE_WEARABLE") pkg_check_modules(pkgs REQUIRED capi-appfw-application bundle @@ -49,7 +49,7 @@ pkg_check_modules(pkgs REQUIRED efl-extension capi-system-device vconf) -ELSEIF("$ENV{CFLAGS}" MATCHES "-DTIZEN_MOBILE") +ELSEIF("$ENV{CFLAGS}" MATCHES "-DTIZEN_PROFILE_MOBILE") pkg_check_modules(pkgs REQUIRED capi-appfw-application bundle @@ -111,7 +111,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie") ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS}) -IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_WEARABLE") +IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_PROFILE_WEARABLE") ADD_CUSTOM_TARGET(custom_popup.edj COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/data/images ${CMAKE_CURRENT_SOURCE_DIR}/data/custom_popup_w.edc @@ -119,7 +119,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/data/custom_popup.edj DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/data/custom_popup_w.edc ) ENDIF() -IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_MOBILE") +IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_PROFILE_MOBILE") ADD_CUSTOM_TARGET(custom_popup.edj COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_SOURCE_DIR}/data/custom_popup_m.edc @@ -138,7 +138,7 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX}) INSTALL(FILES ${CMAKE_BINARY_DIR}/data/org.tizen.bt-syspopup.xml DESTINATION /usr/share/packages/) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/org.tizen.bt-syspopup.png DESTINATION ${TZ_SYS_SHARE}/icons/default/small) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/custom_popup.edj DESTINATION ${TZ_SYS_RO_APP}/org.tizen.bt-syspopup/res/edje) -IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_WEARABLE") +IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_PROFILE_WEARABLE") INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tables/ DESTINATION ${TABLEDIR} FILES_MATCHING PATTERN "*.xml") INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/images/ DESTINATION ${IMAGE_DIR} FILES_MATCHING PATTERN "tw_ic_popup*.png") ENDIF() diff --git a/packaging/org.tizen.bt-syspopup.spec b/packaging/org.tizen.bt-syspopup.spec index 06ad2d4..daae9d9 100644 --- a/packaging/org.tizen.bt-syspopup.spec +++ b/packaging/org.tizen.bt-syspopup.spec @@ -53,11 +53,11 @@ bluetooth system-popup application (bluetooth system popup). %build %if "%{?profile}" == "wearable" -export CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE -DTIZEN_WEARABLE" +export CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE -DTIZEN_PROFILE_WEARABLE" export CXXFLAGS="$CXXFLAGS -DTIZEN_ENGINEER_MODE" export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE" %else -export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE -DTIZEN_MOBILE" +export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE -DTIZEN_PROFILE_MOBILE" export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE" export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" %endif