Commit 6aee44b29dec6319a7dcc1aab6ccac4c4ba77d4f
[dali_1.4.45] Merge branch 'devel/master'
Change-Id: I852c01e0343e04c9d525b5e23bc3b22101508aeb
Showing
2 changed files
with
8 additions
and
1 deletions
build/tizen/CMakeLists.txt
| @@ -4,6 +4,13 @@ PROJECT(dali-demo C CXX) | @@ -4,6 +4,13 @@ PROJECT(dali-demo C CXX) | ||
| 4 | SET(dali-demo_VERSION_MAJOR 1) | 4 | SET(dali-demo_VERSION_MAJOR 1) |
| 5 | SET(dali-demo_VERSION_MINOR 0) | 5 | SET(dali-demo_VERSION_MINOR 0) |
| 6 | 6 | ||
| 7 | +SET(GCC_COMPILER_VERSION_REQUIRED "6") | ||
| 8 | +if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") | ||
| 9 | + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS GCC_COMPILER_VERSION_REQUIRED) | ||
| 10 | + message(FATAL_ERROR "The GCC required compiler version is " ${GCC_COMPILER_VERSION_REQUIRED}) | ||
| 11 | + endif() | ||
| 12 | +endif() | ||
| 13 | + | ||
| 7 | SET(ROOT_SRC_DIR ${CMAKE_SOURCE_DIR}/../..) | 14 | SET(ROOT_SRC_DIR ${CMAKE_SOURCE_DIR}/../..) |
| 8 | SET(DEMO_SHARED ${CMAKE_SOURCE_DIR}/../../shared) | 15 | SET(DEMO_SHARED ${CMAKE_SOURCE_DIR}/../../shared) |
| 9 | 16 |
packaging/com.samsung.dali-demo.spec
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | 2 | ||
| 3 | Name: com.samsung.dali-demo | 3 | Name: com.samsung.dali-demo |
| 4 | Summary: The OpenGLES Canvas Core Demo | 4 | Summary: The OpenGLES Canvas Core Demo |
| 5 | -Version: 1.4.44 | 5 | +Version: 1.4.45 |
| 6 | Release: 1 | 6 | Release: 1 |
| 7 | Group: System/Libraries | 7 | Group: System/Libraries |
| 8 | License: Apache-2.0 | 8 | License: Apache-2.0 |