X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2FCMakeLists.txt;h=831fbd9f463c544fb2877c724867ae667160b3de;hb=46ede379a9baf278466e6106bf55a01e175884bb;hp=0fe2451ff35217ee516161a69d7526acb1e6182e;hpb=05fc311b489e5c929433c722439eef45116f0e8b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 0fe2451..831fbd9 100644
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 CMAKE_POLICY(SET CMP0012 NEW) # Prevent dereferencing of OFF/ON as variables
 
-SET(name "dali-toolkit")
+SET(name "dali2-toolkit")
 
 PROJECT(${name})
 SET(PKG_NAME ${name})
@@ -14,7 +14,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 +36,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 +46,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,11 +152,6 @@ 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()
-
 # Set paths
 SET( toolkit_images_dir  ${ROOT_SRC_DIR}/dali-toolkit/styles/images-common )
 SET( toolkit_sounds_dir  ${ROOT_SRC_DIR}/dali-toolkit/sounds )
@@ -198,7 +193,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()
 
@@ -255,6 +250,11 @@ 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( ENABLE_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 +263,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 +283,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()
 
 
@@ -337,7 +339,7 @@ IF( INSTALL_CMAKE_MODULES )
 
   # Install the pdb file.
   IF( ENABLE_DEBUG )
-    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/${name}.pdb DESTINATION ${BIN_DIR} )
+    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}.pdb DESTINATION ${BIN_DIR} )
   ENDIF()
 ELSE()
   # Install the library so file and symlinks