From 9f0861c204ec42bcd02bdc19845832b9d06cdbe0 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Tue, 18 Aug 2020 18:51:38 +0100 Subject: [PATCH] Change to C++14 Support Change-Id: Ibfcb7570c627f54e64125a0949a74cd17b324196 --- build/tizen/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index 3bedbd1..8837310 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -4,6 +4,7 @@ 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 14) PROJECT(${name}) SET(PKG_NAME ${name}) @@ -201,11 +202,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 -- 2.7.4