X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=build%2Ftizen%2FCMakeLists.txt;h=21b7c0f28275f60c37d24d07c7810d542278881d;hp=3bedbd14ef8c6e0532158f26c4921194577338c0;hb=facc5c0abe18ba940652ae1a45ce0566ee76fd76;hpb=40dbb87b6124a8357e82913e39d61087ad102ff3 diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index 3bedbd1..21b7c0f 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -1,9 +1,10 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +CMAKE_MINIMUM_REQUIRED(VERSION 3.8.2) CMAKE_POLICY(SET CMP0012 NEW) # Prevent dereferencing of OFF/ON as variables SET(name "dali2-toolkit") SET(CMAKE_C_STANDARD 99) +SET(CMAKE_CXX_STANDARD 17) PROJECT(${name}) SET(PKG_NAME ${name}) @@ -153,6 +154,9 @@ IF( ENABLE_TRACE ) ADD_DEFINITIONS("-DTRACE_ENABLED") ENDIF() +# Remove below when thorvg is ready +ADD_DEFINITIONS( "-DNO_THORVG" ) + # Set paths SET( toolkit_images_dir ${ROOT_SRC_DIR}/dali-toolkit/styles/images-common ) SET( toolkit_sounds_dir ${ROOT_SRC_DIR}/dali-toolkit/sounds ) @@ -201,11 +205,9 @@ 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++17 ) ADD_COMPILE_OPTIONS( -Wno-ignored-qualifiers ) # TODO: Clang is a lot more strict with warnings, we should address