From 74358fb94a825631d1144f87fbf930ef49935cd4 Mon Sep 17 00:00:00 2001 From: Mu-Woong Lee Date: Thu, 14 Jan 2016 19:25:52 +0900 Subject: [PATCH] Fix cmake scripts to set LOG_TAG properly Change-Id: Ife8694d2d0e0d3dbc5804e4a4956bf7d78b84a89 Signed-off-by: Mu-Woong Lee --- src/device/CMakeLists.txt | 3 ++- src/place/CMakeLists.txt | 9 ++++----- src/statistics/CMakeLists.txt | 9 ++++----- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt index 20a8db1..94a604b 100644 --- a/src/device/CMakeLists.txt +++ b/src/device/CMakeLists.txt @@ -1,5 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) SET(target "ctx-device") +SET(definitions LOG_TAG=\"CONTEXT-DEVICE\") # Common Profile FILE(GLOB srcs ./*.cpp) @@ -49,7 +50,7 @@ ENDFOREACH(flag) ADD_LIBRARY(${target} SHARED ${srcs}) TARGET_LINK_LIBRARIES(${target} ${device_pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_FLAGS ${extra_cflags}) -SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITIONS "LOG_TAG=\"CONTEXT-DEVICE\"") +SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITIONS "${definitions}") SET_TARGET_PROPERTIES(${target} PROPERTIES SOVERSION ${MAJORVER}) SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${FULLVER}) diff --git a/src/place/CMakeLists.txt b/src/place/CMakeLists.txt index 9ee741d..65d1c98 100644 --- a/src/place/CMakeLists.txt +++ b/src/place/CMakeLists.txt @@ -1,5 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) SET(target "ctx-place") +SET(definitions LOG_TAG=\"CONTEXT-PLACE\") # Build flag for the place auto detection engine. # Set this to "yes" to enable the engine. @@ -16,6 +17,8 @@ IF("${PROFILE}" STREQUAL "mobile") FILE(GLOB_RECURSE srcs ${srcs} recognition/*.cpp) SET(deps "${deps} capi-location-manager") SET(deps "${deps} capi-network-wifi") + ELSE("${enable_recog_engine}" STREQUAL "yes") + SET(definitions ${definitions} "_DISABLE_RECOG_ENGINE_") ENDIF("${enable_recog_engine}" STREQUAL "yes") ENDIF("${PROFILE}" STREQUAL "mobile") @@ -32,13 +35,9 @@ ENDFOREACH(flag) ADD_LIBRARY(${target} SHARED ${srcs}) TARGET_LINK_LIBRARIES(${target} ${place_pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_FLAGS ${extra_cflags}) -SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITIONS "LOG_TAG=\"CONTEXT-PLACE\"") +SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITIONS "${definitions}") SET_TARGET_PROPERTIES(${target} PROPERTIES SOVERSION ${MAJORVER}) SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${FULLVER}) -IF(NOT "${enable_recog_engine}" STREQUAL "yes") - SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITIONS "_DISABLE_RECOG_ENGINE_") -ENDIF(NOT "${enable_recog_engine}" STREQUAL "yes") - # Install INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries) diff --git a/src/statistics/CMakeLists.txt b/src/statistics/CMakeLists.txt index 1085dce..f9f3a65 100644 --- a/src/statistics/CMakeLists.txt +++ b/src/statistics/CMakeLists.txt @@ -1,5 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) SET(target "ctx-statistics") +SET(definitions LOG_TAG=\"CONTEXT-STATS\") # Build flag for the prediction engine. # Set this to "yes" to enable the engine. @@ -16,6 +17,8 @@ FILE(GLOB srcs ${srcs} shared/*.cpp) FILE(GLOB srcs ${srcs} app/*.cpp) IF("${enable_prediction_engine}" STREQUAL "yes") FILE(GLOB srcs ${srcs} prediction/*.cpp) +ELSE("${enable_prediction_engine}" STREQUAL "yes") + SET(definitions ${definitions} "_DISABLE_PREDICTION_ENGINE_") ENDIF("${enable_prediction_engine}" STREQUAL "yes") SET(deps "capi-system-runtime-info pkgmgr pkgmgr-info capi-appfw-package-manager") @@ -60,13 +63,9 @@ ENDFOREACH(flag) ADD_LIBRARY(${target} SHARED ${srcs}) TARGET_LINK_LIBRARIES(${target} ${stats_pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_FLAGS ${extra_cflags}) -SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITIONS "LOG_TAG=\"CONTEXT-STATS\"") +SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITIONS "${definitions}") SET_TARGET_PROPERTIES(${target} PROPERTIES SOVERSION ${MAJORVER}) SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${FULLVER}) -IF(NOT "${enable_prediction_engine}" STREQUAL "yes") - SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITIONS "_DISABLE_PREDICTION_ENGINE_") -ENDIF(NOT "${enable_prediction_engine}" STREQUAL "yes") - # Install INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries) -- 2.34.1