X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=build%2Ftizen%2FCMakeLists.txt;h=3bedbd14ef8c6e0532158f26c4921194577338c0;hp=831fbd9f463c544fb2877c724867ae667160b3de;hb=40dbb87b6124a8357e82913e39d61087ad102ff3;hpb=a0ace335207810b8b924ebcd9c7396897983d936

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 831fbd9..3bedbd1 100644
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -3,6 +3,7 @@ CMAKE_POLICY(SET CMP0012 NEW) # Prevent dereferencing of OFF/ON as variables
 
 SET(name "dali2-toolkit")
 
+SET(CMAKE_C_STANDARD 99)
 PROJECT(${name})
 SET(PKG_NAME ${name})
 
@@ -200,10 +201,11 @@ ENDIF()
 IF( WIN32 )
   ADD_COMPILE_OPTIONS( /FIdali-windows-dependencies.h ) # Adds missing definitions.
   ADD_COMPILE_OPTIONS( /vmg )                           # Avoids a 'reinterpret_cast' compile error while compiling signals and callbacks.
+  ADD_COMPILE_OPTIONS( /std:c++17 )                     # c++17 support
   ADD_COMPILE_OPTIONS( /wd4251 )                        # Ignores warning C4251: "'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'"
 ELSE()
   # Set up compiler flags and warnings
-  ADD_COMPILE_OPTIONS( -std=c++11 )
+  ADD_COMPILE_OPTIONS( -std=c++17 )
   ADD_COMPILE_OPTIONS( -Wno-ignored-qualifiers )
 
   # TODO: Clang is a lot more strict with warnings, we should address
@@ -251,7 +253,12 @@ INCLUDE( ${ROOT_SRC_DIR}/dali-toolkit/third-party/file.list )
 INCLUDE( ${ROOT_SRC_DIR}/doc/file.list )
 
 # Platforms with highp shader support can use vector based text
+IF( NOT DEFINED ENABLE_VECTOR_BASED_TEXT_RENDERING )
+  SET(ENABLE_VECTOR_BASED_TEXT_RENDERING ON)
+ENDIF()
+
 IF( ENABLE_VECTOR_BASED_TEXT_RENDERING )
+  ADD_DEFINITIONS( "-DENABLE_VECTOR_BASED_TEXT_RENDERING" )
   INCLUDE( ${ROOT_SRC_DIR}/dali-toolkit/internal/text/rendering/vector-based/file.list )
 ENDIF()
 
@@ -339,7 +346,7 @@ IF( INSTALL_CMAKE_MODULES )
 
   # Install the pdb file.
   IF( ENABLE_DEBUG )
-    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}.pdb DESTINATION ${BIN_DIR} )
+    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/${name}.pdb DESTINATION ${BIN_DIR} )
   ENDIF()
 ELSE()
   # Install the library so file and symlinks
@@ -529,6 +536,7 @@ MESSAGE( STATUS "Style Dir:                     " ${STYLE_DIR} )
 MESSAGE( STATUS "Style:                         " ${dali_style} )
 MESSAGE( STATUS "i18n:                          " ${ENABLE_I18N} )
 MESSAGE( STATUS "Use pkg configure:             " ${ENABLE_PKG_CONFIGURE} )
+MESSAGE( STATUS "Vector Based Text Rendering:   " ${ENABLE_VECTOR_BASED_TEXT_RENDERING} )
 MESSAGE( STATUS "Enable link test:              " ${ENABLE_LINK_TEST} )
 MESSAGE( STATUS "Configure automated tests:     " ${CONFIGURE_AUTOMATED_TESTS} )
 MESSAGE( STATUS "CXXFLAGS:                      " ${CMAKE_CXX_FLAGS} )