X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=build%2Ftizen%2FCMakeLists.txt;h=21b7c0f28275f60c37d24d07c7810d542278881d;hp=0fe2451ff35217ee516161a69d7526acb1e6182e;hb=facc5c0abe18ba940652ae1a45ce0566ee76fd76;hpb=abfaaa9f9de8f422c3ce5a72cdf74044908a67e3 diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index 0fe2451..21b7c0f 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -1,8 +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 "dali-toolkit") +SET(name "dali2-toolkit") +SET(CMAKE_C_STANDARD 99) +SET(CMAKE_CXX_STANDARD 17) PROJECT(${name}) SET(PKG_NAME ${name}) @@ -14,7 +16,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") endif() # API VERSION (Not DALi release version) -SET(${name}_VERSION_MAJOR 0) +SET(${name}_VERSION_MAJOR 2) SET(${name}_VERSION_MINOR 0) SET(${name}_VERSION_PATCH 0) SET(${name}_VERSION ${${name}_VERSION_MAJOR}.${${name}_VERSION_MINOR}.${${name}_VERSION_PATCH} ) @@ -36,8 +38,8 @@ OPTION(USE_DEFAULT_RESOURCE_DIR "Whether to use the default resource folders. O IF( ENABLE_PKG_CONFIGURE ) FIND_PACKAGE( PkgConfig REQUIRED ) - PKG_CHECK_MODULES(DALICORE REQUIRED dali-core) - PKG_CHECK_MODULES(DALIADAPTOR REQUIRED dali-adaptor) + PKG_CHECK_MODULES(DALICORE REQUIRED dali2-core) + PKG_CHECK_MODULES(DALIADAPTOR REQUIRED dali2-adaptor) ENDIF() IF( INSTALL_DOXYGEN_DOC ) @@ -46,8 +48,8 @@ ENDIF() IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc. FIND_PACKAGE( dali-windows-dependencies REQUIRED) - FIND_PACKAGE( dali-core REQUIRED) - FIND_PACKAGE( dali-adaptor REQUIRED) + FIND_PACKAGE( dali2-core REQUIRED) + FIND_PACKAGE( dali2-adaptor REQUIRED) ENDIF() SET( VCPKG_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") @@ -152,10 +154,8 @@ IF( ENABLE_TRACE ) ADD_DEFINITIONS("-DTRACE_ENABLED") ENDIF() -# Platforms with highp shader support can use vector based text -IF( "${PROFILE}" STREQUAL "UBUNTU" ) - SET( ENABLE_VECTOR_BASED_TEXT_RENDERING 1 ) -ENDIF() +# Remove below when thorvg is ready +ADD_DEFINITIONS( "-DNO_THORVG" ) # Set paths SET( toolkit_images_dir ${ROOT_SRC_DIR}/dali-toolkit/styles/images-common ) @@ -198,7 +198,7 @@ IF( ENABLE_PKG_CONFIGURE ) # Requires the following variables to be setup: # @PREFIX@ @EXEC_PREFIX@ @DALI_VERSION@ @LIB_DIR@ @DEV_INCLUDE_PATH@ SET( DEV_INCLUDE_PATH ${INCLUDE_DIR} ) - SET( CORE_PKG_CFG_FILE dali-toolkit.pc ) + SET( CORE_PKG_CFG_FILE dali2-toolkit.pc ) CONFIGURE_FILE( ${CORE_PKG_CFG_FILE}.in ${CORE_PKG_CFG_FILE} @ONLY ) ENDIF() @@ -208,7 +208,6 @@ IF( WIN32 ) 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++11 ) ADD_COMPILE_OPTIONS( -Wno-ignored-qualifiers ) # TODO: Clang is a lot more strict with warnings, we should address @@ -255,6 +254,16 @@ INCLUDE( ${ROOT_SRC_DIR}/dali-toolkit/devel-api/file.list ) INCLUDE( ${ROOT_SRC_DIR}/dali-toolkit/third-party/file.list ) INCLUDE( ${ROOT_SRC_DIR}/doc/file.list ) +# Platforms with highp shader support can use vector based text +IF( NOT DEFINED ENABLE_VECTOR_BASED_TEXT_RENDERING ) + SET(ENABLE_VECTOR_BASED_TEXT_RENDERING ON) +ENDIF() + +IF( ENABLE_VECTOR_BASED_TEXT_RENDERING ) + ADD_DEFINITIONS( "-DENABLE_VECTOR_BASED_TEXT_RENDERING" ) + INCLUDE( ${ROOT_SRC_DIR}/dali-toolkit/internal/text/rendering/vector-based/file.list ) +ENDIF() + SET(LIBTYPE SHARED) IF(DEFINED STATIC) SET(LIBTYPE STATIC) @@ -263,7 +272,7 @@ ENDIF() IF( WIN32 ) SET( DALICORE_LDFLAGS "${DALICORE_LDFLAGS}" - dali-core::dali-core ) + dali2-core::dali2-core ) FIND_PACKAGE( pthreads REQUIRED ) FIND_PACKAGE( curl REQUIRED ) @@ -283,9 +292,11 @@ IF( WIN32 ) FIND_PACKAGE( unofficial-angle REQUIRED ) FIND_PACKAGE( unofficial-cairo REQUIRED ) + FIND_PACKAGE( WebP REQUIRED ) + SET( DALIADAPTOR_LDFLAGS "${DALIADAPTOR_LDFLAGS}" - dali-adaptor::dali-adaptor ) + dali2-adaptor::dali2-adaptor ) ENDIF() @@ -527,6 +538,7 @@ MESSAGE( STATUS "Style Dir: " ${STYLE_DIR} ) MESSAGE( STATUS "Style: " ${dali_style} ) MESSAGE( STATUS "i18n: " ${ENABLE_I18N} ) MESSAGE( STATUS "Use pkg configure: " ${ENABLE_PKG_CONFIGURE} ) +MESSAGE( STATUS "Vector Based Text Rendering: " ${ENABLE_VECTOR_BASED_TEXT_RENDERING} ) MESSAGE( STATUS "Enable link test: " ${ENABLE_LINK_TEST} ) MESSAGE( STATUS "Configure automated tests: " ${CONFIGURE_AUTOMATED_TESTS} ) MESSAGE( STATUS "CXXFLAGS: " ${CMAKE_CXX_FLAGS} )