Remove cmake build warning + Allow debug / trace option

Change-Id: I377302706cc483bb0ab2b71defa002d4612f1e5c
Signed-off-by: Eunki Hong <eunkiki.hong@samsung.com>

diff --git a/build/ubuntu/CMakeLists.txt b/build/ubuntu/CMakeLists.txt
index afe9ea3a2b7ef9416f9d9fb6b0088b1b0a424209..94b070c57b71c1f71b4758f0ea8e842b76b88c62 100644 (file)
--- a/build/ubuntu/CMakeLists.txt
+++ b/build/ubuntu/CMakeLists.txt
@@ -1,7 +1,15 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.8.2)
 CMAKE_POLICY(SET CMP0012 NEW) # Prevent dereferencing of OFF/ON as variables
 
-OPTION(ENABLE_DEBUG "Enable Debug" OFF)
+SET(name "dali2-extension")
+
+SET(CMAKE_C_STANDARD 99)
+SET(CMAKE_CXX_STANDARD 17)
+PROJECT(${name})
+SET(PKG_NAME ${name})
+
+OPTION(ENABLE_DEBUG         "Enable Debug"  OFF)
+OPTION(ENABLE_PKG_CONFIGURE "Use pkgconfig" ON)
 
 IF(CMAKE_BUILD_TYPE MATCHES Debug)
   SET( ENABLE_DEBUG ON )

diff --git a/build/ubuntu/vector-animation-renderer/CMakeLists.txt b/build/ubuntu/vector-animation-renderer/CMakeLists.txt
index 883384102fbffc70de1688a828dda142820a3f64..3ddc0bbbe796c1c7339ec44a6b520fa82f2afa68 100644 (file)
--- a/build/ubuntu/vector-animation-renderer/CMakeLists.txt
+++ b/build/ubuntu/vector-animation-renderer/CMakeLists.txt
@@ -12,11 +12,13 @@ IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   ENDIF()
 ENDIF()
 
-FIND_PACKAGE( PkgConfig REQUIRED )
-PKG_CHECK_MODULES(DALICORE REQUIRED dali2-core)
-PKG_CHECK_MODULES(DALIADAPTOR REQUIRED dali2-adaptor)
-PKG_CHECK_MODULES(DALITOOLKIT REQUIRED dali2-toolkit)
-PKG_CHECK_MODULES(RLOTTIE REQUIRED rlottie)
+IF( ENABLE_PKG_CONFIGURE )
+  FIND_PACKAGE( PkgConfig REQUIRED )
+  PKG_CHECK_MODULES(DALICORE REQUIRED dali2-core)
+  PKG_CHECK_MODULES(DALIADAPTOR REQUIRED dali2-adaptor)
+  PKG_CHECK_MODULES(DALITOOLKIT REQUIRED dali2-toolkit)
+  PKG_CHECK_MODULES(RLOTTIE REQUIRED rlottie)
+ENDIF()
 
 # Deployment folder should come from spec file or command line:
 SET( PREFIX ${CMAKE_INSTALL_PREFIX})
@@ -49,6 +51,18 @@ IF( NOT BIN_DIR )
   SET( BIN_DIR ${PREFIX}/bin )
 ENDIF()
 
+IF( ENABLE_DEBUG )
+  MESSAGE( STATUS "CMAKE_BUILD_TYPE: " Debug )
+  ADD_DEFINITIONS( "-DDEBUG_ENABLED" )
+  SET( ENABLE_EXPORTALL ON )
+ELSE()
+  MESSAGE( STATUS "CMAKE_BUILD_TYPE: " Release )
+ENDIF()
+
+IF( ENABLE_TRACE )
+  ADD_DEFINITIONS("-DTRACE_ENABLED")
+ENDIF()
+
 INCLUDE(CheckCXXCompilerFlag)
 
 ADD_COMPILE_OPTIONS( -Werror -Wall -Wextra -Wno-unused-parameter -Wfloat-equal )
@@ -136,11 +150,7 @@ MESSAGE( STATUS "Bin Dir:               " ${BIN_DIR} )
 MESSAGE( STATUS "Include Dir:           " ${INCLUDE_DIR} )
 MESSAGE( STATUS "Debug build:           " ${ENABLE_DEBUG} )
 MESSAGE( STATUS "Export all symbols:    " ${ENABLE_EXPORTALL} )
-MESSAGE( STATUS "Backtrace:             " ${ENABLE_BACKTRACE} )
-MESSAGE( STATUS "Scoped Lock backtrace: " ${ENABLE_LOCK_BACKTRACE} )
-MESSAGE( STATUS "Coverage:              " ${ENABLE_COVERAGE} )
 MESSAGE( STATUS "Trace:                 " ${ENABLE_TRACE} )
 MESSAGE( STATUS "Use pkg configure:     " ${ENABLE_PKG_CONFIGURE} )
-MESSAGE( STATUS "Enable link test:      " ${ENABLE_LINK_TEST} )
 MESSAGE( STATUS "CXXFLAGS:              " ${CMAKE_CXX_FLAGS} )
 MESSAGE( STATUS "LDFLAGS:               " ${CMAKE_SHARED_LINKER_FLAGS_INIT}${CMAKE_SHARED_LINKER_FLAGS} )