From 01fa5177952cfa9d7b8ae798a381388e4c18dc12 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Tue, 18 Aug 2020 18:51:45 +0100 Subject: [PATCH] Change to C++14 Support Change-Id: I1def65b69b1678e5dc14af8e872fe1b91228b1c2 --- 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 be96e15..b1f48de 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -2,6 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.1) CMAKE_POLICY(SET CMP0012 NEW) # Prevent dereferencing of OFF/ON as variables SET(CMAKE_C_STANDARD 99) +SET(CMAKE_CXX_STANDARD 14) PROJECT(${name} CXX) SET(PKG_NAME ${name}) @@ -105,14 +106,12 @@ ENDIF() # Set up compiler flags and warnings IF( UNIX ) - ADD_COMPILE_OPTIONS( -std=c++17 ) # c++17 support ADD_COMPILE_OPTIONS( -Wall ${DALI_CFLAGS} )# -Wextra -Wno-unused-parameter )# -Wfloat-equal ) ELSEIF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc. ADD_COMPILE_OPTIONS( /FIdali-windows-dependencies.h ) # ADD_COMPILE_OPTIONS( /FIextern-definitions.h ) # Adds missing definitions. ADD_COMPILE_OPTIONS( /FIpreprocessor-definitions.h ) # 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'" ENDIF() -- 2.7.4