Commit 9b6289bb4ce84ecfab4781312bc7977eb9a146ae
1 parent
f00dca41
Change to C++14 Support
Change-Id: I9100493525a0f62cb41bcc0e8d8339515cdf1d4a
Showing
1 changed file
with
1 additions
and
2 deletions
build/tizen/CMakeLists.txt
| 1 | 1 | CMAKE_MINIMUM_REQUIRED(VERSION 2.6) |
| 2 | 2 | |
| 3 | 3 | SET(CMAKE_C_STANDARD 99) |
| 4 | +SET(CMAKE_CXX_STANDARD 14) | |
| 4 | 5 | PROJECT(dali-demo C CXX) |
| 5 | 6 | |
| 6 | 7 | SET(dali-demo_VERSION_MAJOR 1) |
| ... | ... | @@ -306,10 +307,8 @@ ENDIF(INTERNATIONALIZATION) |
| 306 | 307 | IF( WIN32 ) |
| 307 | 308 | ADD_COMPILE_OPTIONS( /FIdali-windows-dependencies.h ) # Adds missing definitions. |
| 308 | 309 | ADD_COMPILE_OPTIONS( /vmg ) # Avoids a 'reinterpret_cast' compile error while compiling signals and callbacks. |
| 309 | - ADD_COMPILE_OPTIONS( /std:c++17 ) # c++17 support | |
| 310 | 310 | ADD_COMPILE_OPTIONS( /wd4251 ) # Ignores warning C4251: "'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'" |
| 311 | 311 | ELSE() |
| 312 | - ADD_COMPILE_OPTIONS( -std=c++17 ) # c++17 support | |
| 313 | 312 | SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -Werror -Wall -fPIE") |
| 314 | 313 | |
| 315 | 314 | IF( NOT ${ENABLE_EXPORTALL} ) | ... | ... |