Merge "Changed minimum supported Cmake Version to allow C++17 Support" into devel...
authorDavid Steele <david.steele@samsung.com>
Thu, 20 Aug 2020 14:10:20 +0000 (14:10 +0000)
committerGerrit Code Review <gerrit@review>
Thu, 20 Aug 2020 14:10:20 +0000 (14:10 +0000)
README.md
build/tizen/CMakeLists.txt

index e653068..ff51191 100644 (file)
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@
  - Ubuntu 16.04 or later
  - Environment created using dali_env script in dali-core repository
  - GCC version 9
+ - Cmake version 3.8.2 or later
 
 DALi requires a compiler supporting C++17 features.
 
index 8837310..d122fd5 100644 (file)
@@ -1,10 +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 14)
+SET(CMAKE_CXX_STANDARD 17)
 PROJECT(${name})
 SET(PKG_NAME ${name})