ADD_DEFINITIONS("-D_GNU_SOURCE")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+
# Set compiler warning flags
# TODO uncomment these when it's cleanup time
ADD_DEFINITIONS("-Werror") # Make all warnings into errors.
#ADD_DEFINITIONS("-Wall") # Generate all warnings
#ADD_DEFINITIONS("-Wextra") # Generate even more extra warnings
-ADD_DEFINITIONS("-D_CYNARA_INTEGRATION")
+# Enable tizen-specific preprocessor defines
+IF(DEFINED TIZEN)
+ ADD_DEFINITIONS("-D__TIZEN__")
+ ADD_DEFINITIONS("-D_CYNARA_INTEGRATION")
+ENDIF(DEFINED TIZEN)
IF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
- ADD_DEFINITIONS("-DTIZEN_DEBUG_ENABLE")
ADD_DEFINITIONS("-DBUILD_TYPE_DEBUG")
ADD_DEFINITIONS("-ggdb -O0")
# undefine _FORTIFY_SOURCE - it makes no sense without optimization and produces warnings
* Include files\r
*-----------------------------------------------------------------------------*/\r
#include <string>\r
+#include <cstdint>\r
using namespace std;\r
\r
/*-----------------------------------------------------------------------------\r
#endif
#ifdef __TIZEN__
-#include <dlog.h>
-#define TA_SDK_TAG "TA_SDK"
+#include <dlog/dlog.h>
+#define TA_SDK_TAG "TA_SDK"
#endif
#ifdef _ANDROID_NDK
#define _LOG(module_level,debug_level,...) PrintLog(__FUNCTION__,__LINE__,module_level,debug_level,##__VA_ARGS__)
+// if we use dlog, we need to replace its macros with our own
+#ifdef __TIZEN__
+#undef LOGE
+#undef LOGV
+#undef LOGD
+#undef LOGI
+#undef LOGS
+#undef LOGP
+#endif
+
#define LOGE(module_level,...) PrintLog(__FUNCTION__,__LINE__,module_level,ERROR_LEVEL_LOG,##__VA_ARGS__)
#define LOGV(module_level,...) PrintLog(__FUNCTION__,__LINE__,module_level,VERBOSE_LEVEL_LOG,##__VA_ARGS__)
#define LOGD(module_level,...) PrintLog(__FUNCTION__,__LINE__,module_level,DEBUG_LEVEL_LOG,##__VA_ARGS__)
-DPKGCFG_LIB_DIR=%{lib_dir} \
-DPKGCFG_PREFIX=/usr \
-DPKGCFG_VERSION=%{version} \
- -DSMACK_DOMAIN_NAME=%{smack_domain_name}
+ -DSMACK_DOMAIN_NAME=%{smack_domain_name} \
+ -DTIZEN=1
make %{?jobs:-j%jobs}
%install
security-manager
libsystemd-daemon
libtzplatform-config
+ dlog
)
# We require tef-libteec only for tee_client_api.h header