Use CMake by default 56/212456/5
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 21 Aug 2019 14:57:40 +0000 (15:57 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 22 Aug 2019 18:20:06 +0000 (19:20 +0100)
Change-Id: I946555f2ef20f2456f95c207abce25c4857af3dc

22 files changed:
.gitignore
README.md
build/tizen-cmake/.gitignore [deleted file]
build/tizen-cmake/CMakeLists.txt [deleted file]
build/tizen-cmake/dali-core.pc.in [deleted file]
build/tizen-cmake/update-file-lists.sh [deleted file]
build/tizen/.gitignore
build/tizen/CMakeLists.txt [new file with mode: 0644]
build/tizen/Makefile.am [deleted file]
build/tizen/configure.ac [deleted file]
build/tizen/dali-core.pc.in
build/tizen/dali-core/Makefile.am [deleted file]
build/tizen/dali-core/linker-test.cpp [deleted file]
build/tizen/linker-test.cpp [new file with mode: 0644]
build/tizen/rename-cov-data [new file with mode: 0755]
dali/devel-api/file.list [changed mode: 0755->0644]
dali/integration-api/file.list
dali/internal/file.list
dali/public-api/file.list
doc/CMakeLists.txt [deleted file]
doc/file.list
packaging/dali.spec

index 258aabdbcd271bbe4a771da58d613e8befdf1403..37cc90fcc73c184f6db8afcc2a4b13dcd5c7f1b1 100644 (file)
@@ -10,8 +10,7 @@ CMakeFiles/
 cmake_install.cmake
 dali.info
 install_manifest.txt
-libdali-core.so.0
-libdali-core.so.0.1.1
+libdali-core.so*
 *~
 *.pc
 *.o
index b374d3ad5934ab5a6d98f6ac534d78decb900b6f..17972bc1d33a98af416d932ec9094eea79ff064d 100644 (file)
--- a/README.md
+++ b/README.md
@@ -63,10 +63,14 @@ To build the repository enter the 'build/tizen' folder:
 
          $ cd dali-core/build/tizen
 
-Then run the following commands:
+Then run the following command to set up the build:
+
+         $ cmake -DCMAKE_INSTALL_PREFIX=$DESKTOP_PREFIX .
+
+If a Debug build is required, then add -DCMAKE_BUILD_TYPE=Debug
+
+To build run:
 
-         $ autoreconf --install
-         $ ./configure --prefix=$DESKTOP_PREFIX
          $ make install -j8
 
 ### Building and executing test cases
diff --git a/build/tizen-cmake/.gitignore b/build/tizen-cmake/.gitignore
deleted file mode 100644 (file)
index 5df5866..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/doc
diff --git a/build/tizen-cmake/CMakeLists.txt b/build/tizen-cmake/CMakeLists.txt
deleted file mode 100644 (file)
index fb2b224..0000000
+++ /dev/null
@@ -1,233 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-CMAKE_POLICY(SET CMP0012 NEW) # Prevent dereferencing of OFF/ON as variables
-
-SET(name "dali-core")
-
-PROJECT(${name})
-SET(PKG_NAME ${name})
-
-# API VERSION (Not DALi release version)
-SET(${name}_VERSION_MAJOR 0)
-SET(${name}_VERSION_MINOR 1)
-SET(${name}_VERSION_PATCH 1)
-SET(${name}_VERSION ${${name}_VERSION_MAJOR}.${${name}_VERSION_MINOR}.${${name}_VERSION_PATCH})
-
-SET(DALI_VERSION ${${name}_VERSION} )
-
-# Define options to CMake
-
-OPTION(ENABLE_EXPORTALL      "Enable Export all symbols" OFF)
-OPTION(ENABLE_DEBUG          "Enable Debug" OFF)
-OPTION(ENABLE_BACKTRACE      "Enable Backtrace" OFF)
-OPTION(ENABLE_LOCK_BACKTRACE "Enable" OFF)
-OPTION(ENABLE_COVERAGE       "Coverage" OFF)
-
-# Set up compiler definitions
-
-IF(CMAKE_BUILD_TYPE MATCHES Debug)
-  MESSAGE( STATUS "CMAKE_BUILD_TYPE: " Debug )
-  SET(ENABLE_DEBUG ON)
-ELSE()
-  MESSAGE( STATUS "CMAKE_BUILD_TYPE: " Release )
-ENDIF()
-
-ADD_DEFINITIONS(-DPLATFORM_TIZEN -DDALI_COMPILATION)
-ADD_DEFINITIONS(-DPIC -DSTDC_HEADERS)
-
-IF("${ARCH}" STREQUAL "arm")
-  ADD_DEFINITIONS("-DTARGET")
-ENDIF("${ARCH}" STREQUAL "arm")
-
-IF( NOT ${ENABLE_EXPORTALL} AND NOT ${ENABLE_DEBUG} )
-  ADD_DEFINITIONS( "-fvisibility=hidden -DHIDE_DALI_INTERNALS" )
-ENDIF( NOT ${ENABLE_EXPORTALL} AND NOT ${ENABLE_DEBUG} )
-
-IF( ENABLE_DEBUG )
-  ADD_DEFINITIONS( "-DDEBUG_ENABLED" )
-ENDIF( ENABLE_DEBUG )
-
-IF( ENABLE_BACKTRACE OR ENABLE_LOCK_BACKTRACE )
-  ADD_DEFINITIONS( "-DBACKTRACE_ENABLED" )
-ENDIF( ENABLE_BACKTRACE OR ENABLE_LOCK_BACKTRACE )
-
-IF( ENABLE_LOCK_BACKTRACE )
-  ADD_DEFINITIONS( "-DLOCK_BACKTRACE_ENABLED" )
-ENDIF( ENABLE_LOCK_BACKTRACE )
-
-# Deployment folder should come from spec file or command line:
-SET( PREFIX ${CMAKE_INSTALL_PREFIX})
-SET( EXEC_PREFIX ${CMAKE_INSTALL_PREFIX})
-
-# from root/build/tizen, get back to root
-SET(ROOT_SRC_DIR ${CMAKE_SOURCE_DIR}/../..)
-
-# Make sure the path is absolute
-GET_FILENAME_COMPONENT(ROOT_SRC_DIR ${ROOT_SRC_DIR} ABSOLUTE)
-
-# Set up the include dir
-SET( INCLUDE_DIR $ENV{includedir} )
-IF( NOT INCLUDE_DIR )
-  SET( INCLUDE_DIR ${PREFIX}/include )
-ENDIF()
-
-# Set up the lib dir
-SET( LIB_DIR $ENV{libdir} )
-IF( NOT LIB_DIR )
-  SET( LIB_DIR ${PREFIX}/lib )
-ENDIF()
-
-# Configure the pkg-config file
-# 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-core.pc )
-CONFIGURE_FILE( ${CORE_PKG_CFG_FILE}.in ${CORE_PKG_CFG_FILE} @ONLY )
-
-# Set up compiler flags and warnings
-#ADD_COMPILE_OPTIONS( -std=c++11 -ggdb )
-ADD_COMPILE_OPTIONS( -std=c++11 -gdwarf-4 )
-ADD_COMPILE_OPTIONS( -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast )
-
-# TODO: Clang is a lot more strict with warnings, we should address
-# those issues at some point.
-IF( NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
-  ADD_COMPILE_OPTIONS( -Werror )
-ENDIF()
-
-ADD_COMPILE_OPTIONS( -Wall -Wextra -Wno-unused-parameter -Wfloat-equal )
-
-IF( ENABLE_COVERAGE OR "$ENV{CXXFLAGS}" MATCHES --coverage )
-  ADD_COMPILE_OPTIONS( --coverage )
-  SET(ENABLE_COVERAGE ON)
-  SET(COVERAGE --coverage)
-ENDIF()
-
-INCLUDE_DIRECTORIES(
-  ${ROOT_SRC_DIR}
-)
-
-SET(SOURCE_DIR "${ROOT_SRC_DIR}/dali")
-SET(PACKAGE_DOXY_SRC_DIR "${ROOT_SRC_DIR}/doc")
-
-SET(SOURCES "")
-
-# Run sources update script automatically
-EXECUTE_PROCESS( COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/update-file-lists.sh
-                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
-
-# could use INCLUDE to get the source lists a different way;
-# would then need to specify a build folder somehow...
-INCLUDE( ${ROOT_SRC_DIR}/dali/internal/file-list.cmake )
-INCLUDE( ${ROOT_SRC_DIR}/dali/integration-api/file-list.cmake )
-INCLUDE( ${ROOT_SRC_DIR}/dali/public-api/file-list.cmake )
-INCLUDE( ${ROOT_SRC_DIR}/dali/devel-api/file-list.cmake )
-
-ADD_SUBDIRECTORY( ${PACKAGE_DOXY_SRC_DIR} doc )
-
-SET(LIBTYPE SHARED)
-IF(DEFINED STATIC)
-  SET(LIBTYPE STATIC)
-ENDIF()
-
-ADD_LIBRARY( ${name} ${LIBTYPE} ${SOURCES} )
-
-TARGET_LINK_LIBRARIES( ${name}
-  -lpthread
-  ${COVERAGE}
-)
-
-SET_TARGET_PROPERTIES( ${name}
-  PROPERTIES
-  VERSION ${DALI_VERSION}
-  SOVERSION ${${name}_VERSION_MAJOR}
-  CLEAN_DIRECT_OUPUT 1
-)
-
-# Install the library so file and symlinks
-INSTALL( TARGETS ${name} DESTINATION ${LIB_DIR} )
-
-# Install the pkg-config file
-INSTALL( FILES ${CMAKE_BINARY_DIR}/${CORE_PKG_CFG_FILE} DESTINATION ${LIB_DIR}/pkgconfig )
-
-# macro for installing headers by replacing prefix. (TODO, investigate
-# if there is a CMAKE way of doing this automatically)
-MACRO(INSTALL_HEADERS_WITH_DIRECTORY HEADER_LIST STRIP_PREFIX REPLACE_PREFIX)
-  GET_FILENAME_COMPONENT( SPREFIX ${STRIP_PREFIX} ABSOLUTE )
-  FOREACH(HEADER ${${HEADER_LIST}})
-    STRING(REGEX MATCH "(.*)[/]" DIR ${HEADER})
-    STRING(REPLACE ${SPREFIX} ${REPLACE_PREFIX} NEWDIR ${DIR})
-    INSTALL(FILES ${HEADER} DESTINATION ${INCLUDE_DIR}/${NEWDIR})
-  ENDFOREACH(HEADER)
-ENDMACRO(INSTALL_HEADERS_WITH_DIRECTORY)
-
-# Install headers using lists defined by ADD_SUBDIRECTORY
-INSTALL_HEADERS_WITH_DIRECTORY(PUBLIC_API_HEADERS ${ROOT_SRC_DIR}/dali "dali")
-INSTALL_HEADERS_WITH_DIRECTORY(DEVEL_API_HEADERS ${ROOT_SRC_DIR}/dali "dali")
-INSTALL_HEADERS_WITH_DIRECTORY(INTEGRATION_API_HEADERS ${ROOT_SRC_DIR}/dali "dali")
-INSTALL_HEADERS_WITH_DIRECTORY(PACKAGE_DOXY_HEADERS ${PACKAGE_DOXY_SRC_DIR} "dali/doc" )
-
-IF(UNIX)
-  # Define custom rules for coverage
-  SET(COVERAGE_DIR .cov)
-  SET(COVERAGE_OUTPUT_DIR doc/coverage)
-
-  # lcov prior to 1.10 doesn't have -rc option; this and subsequent version don't output
-  # branch coverage. Determine the lcov version, and enable branch coverage accordingly.
-  EXECUTE_PROCESS( COMMAND bash -c "lcov --version | cut -d' ' -f4" OUTPUT_VARIABLE LCOV_VERSION )
-  STRING( REPLACE "." ";" LCOV_VLIST ${LCOV_VERSION})
-  IF( NOT $<VERSION_LESS:${LCOV_VERSION},"1.10"> )
-    SET(LCOV_OPTS --rc lcov_branch_coverage=1)
-  ENDIF()
-
-  ADD_CUSTOM_TARGET( cov_data lcov ${LCOV_OPTS} --base-directory dali --directory . -c -o dali.info
-          COMMAND lcov ${LCOV_OPTS} --remove dali.info \"*/dali-env/*\" \"/usr/include/*\" \"public-api/shader-effects/*\" \"*/image-actor*\" -o dali.info )
-
-  ADD_CUSTOM_TARGET( coverage genhtml ${LCOV_OPTS} -o ${COVERAGE_OUTPUT_DIR} dali.info
-    DEPENDS cov_data )
-
-  ADD_CUSTOM_TARGET( reset_coverage @lcov -z --directory `pwd` )
-
-  # Define custom rule for distclean
-  ADD_CUSTOM_TARGET( distclean @echo cleaning for source distribution )
-  ADD_CUSTOM_COMMAND(
-        DEPENDS clean
-        COMMENT "distribution clean"
-        COMMAND find
-        ARGS    .
-        -not -name config.cmake -and \(
-        -name tester.c -or
-        -name Testing -or
-        -name CMakeFiles -or
-        -name cmake.depends -or
-        -name cmake.check_depends -or
-        -name CMakeCache.txt -or
-        -name cmake.check_cache -or
-        -name *.cmake -or
-        -name Makefile -or
-        -name core -or
-        -name core.* -or
-        -name gmon.out -or
-        -name install_manifest.txt -or
-        -name *.pc -or
-        -name *.gcov -or
-        -name *.gcno -or
-        -name *.gcda -or
-        -name *~ \)
-        | grep -v TC | xargs rm -rf
-        TARGET  distclean
-        VERBATIM
-        )
-
-ENDIF(UNIX)
-
-
-MESSAGE( STATUS "Configuration:\n" )
-MESSAGE( STATUS "Prefix:                " ${PREFIX} )
-MESSAGE( STATUS "Lib Dir:               " ${LIB_DIR} )
-MESSAGE( STATUS "Include Dir:           " ${INCLUDE_DIR} )
-MESSAGE( STATUS "Debug build:           " ${ENABLE_DEBUG} )
-MESSAGE( STATUS "Backtrace:             " ${ENABLE_BACKTRACE} )
-MESSAGE( STATUS "Scoped Lock backtrace: " ${ENABLE_LOCK_BACKTRACE} )
-MESSAGE( STATUS "Coverage:              " ${ENABLE_COVERAGE} )
-MESSAGE( STATUS "CXXFLAGS:              " ${CMAKE_CXX_FLAGS} )
-MESSAGE( STATUS "LDFLAGS:               " ${CMAKE_SHARED_LINKER_FLAGS_INIT}${CMAKE_SHARED_LINKER_FLAGS} )
diff --git a/build/tizen-cmake/dali-core.pc.in b/build/tizen-cmake/dali-core.pc.in
deleted file mode 100644 (file)
index 7bbcbfc..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
-apiversion=@DALI_VERSION@
-libdir=@LIB_DIR@
-includedir=@DEV_INCLUDE_PATH@
-
-Name: DALi 3D Engine
-Description: Cross platform 3D Engine
-Version: ${apiversion}
-Requires:
-Libs: -L${libdir} -ldali-core
-Cflags: -I${includedir} -std=c++11
diff --git a/build/tizen-cmake/update-file-lists.sh b/build/tizen-cmake/update-file-lists.sh
deleted file mode 100755 (executable)
index b60c09f..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/bash
-
-# check if there is 'realpath' tool installed
-if [ "$(which realpath)" == "" ] ; then
-  echo "You need 'realpath' to run this script."
-  echo "to install: apt-get install realpath"
-  exit
-fi
-
-# test whether script is running in the right directory
-if [[ $(realpath $(pwd)) != $(realpath $(dirname $0)) ]] ; then
-  echo "Error! You must launch this script from tizen-cmake directory!"
-  exit 0
-fi
-
-function find_file_lists_dirs()
-{
-  for f in $(find ../../ -name 'file.list') ; do
-    dirname $(realpath $f);
-  done
-}
-
-# now prepare file-lists
-# read line by line
-# 1. line with '=' defines variable name
-# 2. line with '#' defines comment
-function write_cmake_file_lists()
-{
-  doxy=
-
-  function update_list()
-  {
-    if [[ "$2" != "" ]] ; then
-      # update sources, headers, doxy
-      echo "  *** Updating $1 list..." >&2
-      echo ""
-      echo "SET( $1 \${$1}"
-      for var in $2 ; do
-        echo "  \${${var}}"
-      done
-      echo ")"
-    fi
-  }
-
-  for file_list_dir in ${file_cmake_lists} ; do
-    sources=
-    public_headers=
-    devel_headers=
-    integration_headers=
-    outfile=$file_list_dir/file-list.cmake
-    echo " * Writing $(realpath --relative-base=../../ $file_list_dir)/file-list.cmake..."
-    echo "# This file is auto-generated!" > $outfile
-    echo "#" >> $outfile
-
-    # look for *_src_dir variables ( should be just one ) and
-    # substitute it with current path
-    for dirpath in $(grep -oE '\(.*_src_dir\)' $file_list_dir/file.list | sort -u) ; do
-      src_dir=${dirpath:1:-1}
-      new_path=$(realpath --relative-base=../../ $file_list_dir)
-      echo -e "\n# Set the source directory\n" >> $outfile
-      echo "SET( $src_dir \${ROOT_SRC_DIR}/$new_path )" >> $outfile
-      echo "" >>$outfile
-    done
-    variable=
-    comment=
-    lines=$(cat $file_list_dir/file.list | sed -e 's/ /|/g;')
-    for l in $lines ; do
-      is_var=$(echo $l | grep '=')
-      is_comment=$(echo $l | grep '#')
-      if [ "$is_comment" ] ; then
-        comment="$(echo "$l" | sed -e 's/|/ /g;')"
-      elif [ "$is_var" ] ; then
-        if [ "$variable" ] ; then
-          echo ")"  >> $outfile
-          echo "" >> $outfile
-        fi
-        echo $comment >> $outfile
-        comment=
-        variable=$(echo $is_var | sed -e 's/|//g;' | awk -F '=' '{print $1}')
-        echo "SET( $variable " >> $outfile
-
-        # collect sources, headers and doxy to compile final
-        # set of vars to be included
-        if [[ ${variable:${#variable}-9:9} = src_files ]] ; then
-          sources="${sources} $variable"
-        elif [[ ${variable:${#variable}-12:12} = header_files ]] ; then
-          if [[ ${variable} = devel_api* ]] ; then
-            devel_headers="${devel_headers} $variable"
-          elif [[ ${variable} = public_api* ]] ; then
-            public_headers="${public_headers} $variable"
-          elif [[ ${variable} = platform_abstraction_* ]] ; then
-            integration_headers="${integration_headers} $variable"
-          else
-            echo "ERROR! Variable $variable in $file_list_dir unrecoginzed!"
-            exit 0
-          fi
-        elif [[ ${variable:${#variable}-10:10} = doxy_files ]] ; then
-          doxy="${doxy} $variable"
-        fi
-      else
-        echo "$(echo "$l" | sed -e 's/(/{/g;s/)/}/g;s/|/ /g;s/\\//g;')" >> $outfile
-      fi
-    done
-    if [ "$variable" ] ; then
-      echo ")" >> $outfile
-      echo "" >> $outfile
-    fi
-
-    update_list SOURCES "$sources" >> $outfile
-
-    update_list PUBLIC_API_HEADERS "$public_headers" >>$outfile
-
-    update_list DEVEL_API_HEADERS "$devel_headers" >>$outfile
-
-    update_list INTEGRATION_API_HEADERS "$integration_headers" >>$outfile
-
-    # Remove trailing whitespaces
-    cat $outfile | sed -e 's/[[:space:]]*$//' > /tmp/file-list.cmake
-    mv /tmp/file-list.cmake $outfile
-    echo "  * Done"
-  done
-
-}
-
-export file_cmake_lists=$(find_file_lists_dirs)
-
-write_cmake_file_lists
-
index 644f5f57c805b9c86e451ec229c6859a890739d6..14a77194f4b24c6e4932bcfcf2a64cbaedd4eefc 100644 (file)
@@ -1,21 +1,2 @@
-/gmon.out
-/aclocal.m4
-/autom4te.cache
-/ar-lib
-/compile
-/config.guess
-/config.log
-/config.status
-/config.sub
-/configure
-/depcomp
-/install-sh
-/libtool
-/ltmain.sh
-/missing
-/demo/dali-demo
-/dali-core.pc
-/dali.pc
-/dali-core/dali-shaders.cpp
-/dali-core/dali-shaders.h
-/documentation.list
+/doc
+/linker-test
diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
new file mode 100644 (file)
index 0000000..acece1e
--- /dev/null
@@ -0,0 +1,256 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_POLICY(SET CMP0012 NEW) # Prevent dereferencing of OFF/ON as variables
+
+SET(name "dali-core")
+
+PROJECT(${name})
+SET(PKG_NAME ${name})
+
+# API VERSION (Not DALi release version)
+SET(${name}_VERSION_MAJOR 0)
+SET(${name}_VERSION_MINOR 0)
+SET(${name}_VERSION_PATCH 0)
+SET(${name}_VERSION ${${name}_VERSION_MAJOR}.${${name}_VERSION_MINOR}.${${name}_VERSION_PATCH})
+
+SET(DALI_VERSION ${${name}_VERSION} )
+
+# Define options to CMake
+
+OPTION(ENABLE_EXPORTALL      "Enable Export all symbols" OFF)
+OPTION(ENABLE_DEBUG          "Enable Debug" OFF)
+OPTION(ENABLE_BACKTRACE      "Enable Backtrace" OFF)
+OPTION(ENABLE_LOCK_BACKTRACE "Enable" OFF)
+OPTION(ENABLE_COVERAGE       "Coverage" OFF)
+OPTION(ENABLE_TRACE          "Enable Trace" OFF)
+
+# Set up compiler definitions
+
+IF(CMAKE_BUILD_TYPE MATCHES Debug)
+  MESSAGE( STATUS "CMAKE_BUILD_TYPE: " Debug )
+  SET(ENABLE_DEBUG ON)
+ELSE()
+  MESSAGE( STATUS "CMAKE_BUILD_TYPE: " Release )
+ENDIF()
+
+ADD_DEFINITIONS(-DPLATFORM_TIZEN -DDALI_COMPILATION)
+ADD_DEFINITIONS(-DPIC -DSTDC_HEADERS)
+
+IF("${ARCH}" STREQUAL "arm")
+  ADD_DEFINITIONS("-DTARGET")
+ENDIF("${ARCH}" STREQUAL "arm")
+
+IF( NOT ${ENABLE_EXPORTALL} AND NOT ${ENABLE_DEBUG} )
+  ADD_DEFINITIONS( "-fvisibility=hidden -DHIDE_DALI_INTERNALS" )
+ENDIF( NOT ${ENABLE_EXPORTALL} AND NOT ${ENABLE_DEBUG} )
+
+IF( ENABLE_DEBUG )
+  ADD_DEFINITIONS( "-DDEBUG_ENABLED" )
+ENDIF( ENABLE_DEBUG )
+
+IF( ENABLE_BACKTRACE OR ENABLE_LOCK_BACKTRACE )
+  ADD_DEFINITIONS( "-DBACKTRACE_ENABLED" )
+ENDIF( ENABLE_BACKTRACE OR ENABLE_LOCK_BACKTRACE )
+
+IF( ENABLE_LOCK_BACKTRACE )
+  ADD_DEFINITIONS( "-DLOCK_BACKTRACE_ENABLED" )
+ENDIF( ENABLE_LOCK_BACKTRACE )
+
+# Deployment folder should come from spec file or command line:
+SET( PREFIX ${CMAKE_INSTALL_PREFIX})
+SET( EXEC_PREFIX ${CMAKE_INSTALL_PREFIX})
+
+# from root/build/tizen, get back to root
+SET(ROOT_SRC_DIR ${CMAKE_SOURCE_DIR}/../..)
+
+# Make sure the path is absolute
+GET_FILENAME_COMPONENT(ROOT_SRC_DIR ${ROOT_SRC_DIR} ABSOLUTE)
+
+# Set up the include dir
+SET( INCLUDE_DIR $ENV{includedir} )
+IF( NOT INCLUDE_DIR )
+  SET( INCLUDE_DIR ${PREFIX}/include )
+ENDIF()
+
+# Set up the lib dir
+SET( LIB_DIR $ENV{libdir} )
+IF( NOT LIB_DIR )
+  SET( LIB_DIR ${PREFIX}/lib )
+ENDIF()
+
+# Configure the pkg-config file
+# 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-core.pc )
+CONFIGURE_FILE( ${CORE_PKG_CFG_FILE}.in ${CORE_PKG_CFG_FILE} @ONLY )
+
+# Set up compiler flags and warnings
+#ADD_COMPILE_OPTIONS( -std=c++11 -ggdb )
+ADD_COMPILE_OPTIONS( -std=c++11 -gdwarf-4 )
+ADD_COMPILE_OPTIONS( -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast )
+
+# TODO: Clang is a lot more strict with warnings, we should address
+# those issues at some point.
+IF( NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
+  ADD_COMPILE_OPTIONS( -Werror )
+ENDIF()
+
+ADD_COMPILE_OPTIONS( -Wall -Wextra -Wno-unused-parameter -Wfloat-equal )
+
+IF( ENABLE_COVERAGE OR "$ENV{CXXFLAGS}" MATCHES --coverage )
+  ADD_COMPILE_OPTIONS( --coverage )
+  SET(ENABLE_COVERAGE ON)
+  SET(COVERAGE --coverage)
+ENDIF()
+
+IF( ENABLE_TRACE )
+  ADD_DEFINITIONS("-DTRACE_ENABLED")
+ENDIF()
+
+
+INCLUDE_DIRECTORIES(
+  ${ROOT_SRC_DIR}
+)
+
+SET(SOURCE_DIR "${ROOT_SRC_DIR}/dali")
+SET(PACKAGE_DOXY_SRC_DIR "${ROOT_SRC_DIR}/doc")
+
+SET(SOURCES "")
+
+# could use INCLUDE to get the source lists a different way;
+# would then need to specify a build folder somehow...
+INCLUDE( ${ROOT_SRC_DIR}/dali/internal/file.list )
+INCLUDE( ${ROOT_SRC_DIR}/dali/integration-api/file.list )
+INCLUDE( ${ROOT_SRC_DIR}/dali/public-api/file.list )
+INCLUDE( ${ROOT_SRC_DIR}/dali/devel-api/file.list )
+INCLUDE( ${ROOT_SRC_DIR}/doc/file.list )
+
+SET(LIBTYPE SHARED)
+IF(DEFINED STATIC)
+  SET(LIBTYPE STATIC)
+ENDIF()
+
+ADD_LIBRARY( ${name} ${LIBTYPE} ${SOURCES} )
+
+TARGET_LINK_LIBRARIES( ${name}
+  -lpthread
+  ${COVERAGE}
+)
+
+SET_TARGET_PROPERTIES( ${name}
+  PROPERTIES
+  VERSION ${DALI_VERSION}
+  SOVERSION ${${name}_VERSION_MAJOR}
+  CLEAN_DIRECT_OUPUT 1
+)
+
+# Install the library so file and symlinks
+INSTALL( TARGETS ${name} DESTINATION ${LIB_DIR} )
+
+# Install the pkg-config file
+INSTALL( FILES ${CMAKE_BINARY_DIR}/${CORE_PKG_CFG_FILE} DESTINATION ${LIB_DIR}/pkgconfig )
+
+# macro for installing headers by replacing prefix. (TODO, investigate
+# if there is a CMAKE way of doing this automatically)
+MACRO(INSTALL_HEADERS_WITH_DIRECTORY HEADER_LIST STRIP_PREFIX REPLACE_PREFIX)
+  GET_FILENAME_COMPONENT( SPREFIX ${STRIP_PREFIX} ABSOLUTE )
+  FOREACH(HEADER ${${HEADER_LIST}})
+    STRING(REGEX MATCH "(.*)[/]" DIR ${HEADER})
+    STRING(REPLACE ${SPREFIX} ${REPLACE_PREFIX} NEWDIR ${DIR})
+    INSTALL(FILES ${HEADER} DESTINATION ${INCLUDE_DIR}/${NEWDIR})
+  ENDFOREACH(HEADER)
+ENDMACRO(INSTALL_HEADERS_WITH_DIRECTORY)
+
+# Install headers using lists defined by ADD_SUBDIRECTORY
+INSTALL_HEADERS_WITH_DIRECTORY(PUBLIC_API_HEADERS ${ROOT_SRC_DIR}/dali "dali")
+INSTALL_HEADERS_WITH_DIRECTORY(DEVEL_API_HEADERS ${ROOT_SRC_DIR}/dali "dali")
+INSTALL_HEADERS_WITH_DIRECTORY(INTEGRATION_API_HEADERS ${ROOT_SRC_DIR}/dali "dali")
+INSTALL_HEADERS_WITH_DIRECTORY(PACKAGE_DOXY_HEADERS ${PACKAGE_DOXY_SRC_DIR} "dali/doc" )
+
+IF(UNIX)
+  # Define custom rules for coverage
+  SET(COVERAGE_DIR .cov)
+  SET(COVERAGE_OUTPUT_DIR doc/coverage)
+
+  # lcov prior to 1.10 doesn't have -rc option; this and subsequent version don't output
+  # branch coverage. Determine the lcov version, and enable branch coverage accordingly.
+  EXECUTE_PROCESS( COMMAND bash -c "lcov --version | cut -d' ' -f4" OUTPUT_VARIABLE LCOV_VERSION )
+  STRING( REPLACE "." ";" LCOV_VLIST ${LCOV_VERSION})
+  IF( NOT $<VERSION_LESS:${LCOV_VERSION},"1.10"> )
+    SET(LCOV_OPTS --rc lcov_branch_coverage=1)
+  ENDIF()
+
+  ADD_CUSTOM_TARGET( rename_cov_data ./rename-cov-data )
+
+  ADD_CUSTOM_TARGET( cov_data lcov ${LCOV_OPTS} --base-directory . --directory . -c -o dali.info
+          COMMAND lcov ${LCOV_OPTS} --remove dali.info \"*/dali-env/*\" \"/usr/include/*\" \"public-api/shader-effects/*\" \"*/image-actor*\" -o dali.info )
+
+  ADD_CUSTOM_TARGET( coverage genhtml ${LCOV_OPTS} -o ${COVERAGE_OUTPUT_DIR} dali.info
+    DEPENDS cov_data )
+
+  ADD_CUSTOM_TARGET( reset_coverage @lcov -z --directory `pwd` )
+
+  # Define custom rule for distclean
+  ADD_CUSTOM_TARGET( distclean @echo cleaning for source distribution )
+  ADD_CUSTOM_COMMAND(
+        DEPENDS clean
+        COMMENT "distribution clean"
+        COMMAND find
+        ARGS    .
+        -not -name config.cmake -and \(
+        -name tester.c -or
+        -name Testing -or
+        -name CMakeFiles -or
+        -name doc -or
+        -name cmake.depends -or
+        -name cmake.check_depends -or
+        -name CMakeCache.txt -or
+        -name cmake.check_cache -or
+        -name *.cmake -or
+        -name Makefile -or
+        -name core -or
+        -name core.* -or
+        -name gmon.out -or
+        -name install_manifest.txt -or
+        -name *.pc -or
+        -name *.gcov -or
+        -name *.gcno -or
+        -name *.gcda -or
+        -name *~ -or
+        -name libdali*.so* \)
+        | grep -v TC | xargs rm -rf
+        TARGET  distclean
+        VERBATIM
+        )
+
+ENDIF(UNIX)
+
+# Linker Test
+SET( DALI_TEST_SUITE_DIR ${ROOT_SRC_DIR}/automated-tests/src/dali/dali-test-suite-utils )
+SET( LINKER_TEST_NAME linker-test )
+SET( LINKER_TEST_SOURCES
+  linker-test.cpp
+  ${DALI_TEST_SUITE_DIR}/test-application.cpp
+  ${DALI_TEST_SUITE_DIR}/test-platform-abstraction.cpp
+  ${DALI_TEST_SUITE_DIR}/test-render-controller.cpp
+  ${DALI_TEST_SUITE_DIR}/test-render-surface.cpp
+  ${DALI_TEST_SUITE_DIR}/test-gl-abstraction.cpp
+  ${DALI_TEST_SUITE_DIR}/test-gl-sync-abstraction.cpp
+  ${DALI_TEST_SUITE_DIR}/test-trace-call-stack.cpp
+)
+ADD_EXECUTABLE( ${LINKER_TEST_NAME} ${LINKER_TEST_SOURCES} )
+TARGET_LINK_LIBRARIES(${LINKER_TEST_NAME} ${name} )
+TARGET_INCLUDE_DIRECTORIES( ${LINKER_TEST_NAME} PRIVATE ${DALI_TEST_SUITE_DIR} )
+
+# Configuration Messages
+MESSAGE( STATUS "Configuration:\n" )
+MESSAGE( STATUS "Prefix:                " ${PREFIX} )
+MESSAGE( STATUS "Lib Dir:               " ${LIB_DIR} )
+MESSAGE( STATUS "Include Dir:           " ${INCLUDE_DIR} )
+MESSAGE( STATUS "Debug build:           " ${ENABLE_DEBUG} )
+MESSAGE( STATUS "Backtrace:             " ${ENABLE_BACKTRACE} )
+MESSAGE( STATUS "Scoped Lock backtrace: " ${ENABLE_LOCK_BACKTRACE} )
+MESSAGE( STATUS "Coverage:              " ${ENABLE_COVERAGE} )
+MESSAGE( STATUS "Trace:                 " ${ENABLE_TRACE} )
+MESSAGE( STATUS "CXXFLAGS:              " ${CMAKE_CXX_FLAGS} )
+MESSAGE( STATUS "LDFLAGS:               " ${CMAKE_SHARED_LINKER_FLAGS_INIT}${CMAKE_SHARED_LINKER_FLAGS} )
diff --git a/build/tizen/Makefile.am b/build/tizen/Makefile.am
deleted file mode 100644 (file)
index e49738e..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (c) 2019 Samsung Electronics Co., Ltd.
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-SUBDIRS = dali-core
-
-pkgconfigdir = $(libdir)/pkgconfig
-
-pkgconfig_DATA = dali-core.pc
-
-MAINTAINERCLEANFILES = \
-    aclocal.m4 \
-    autom4te.cache \
-    config.guess \
-    config.sub \
-    configure \
-    depcomp \
-    install-sh \
-    ltmain.sh \
-    missing \
-    `find "$(srcdir)" -type f -name Makefile.in -print` \
-    `find . \( -name "*.gcov" -o -name "*.gcno" -o -name "*.gcda" \) -print`
-
-CLEANFILES = \
-    `find . \( -name "*.gcov" -o -name "*.gcno" -o -name "*.gcda" \) -print`
-
-COVERAGE_DIR=.cov
-COVERAGE_OUTPUT_DIR=doc/coverage
-
-# From lcov version 1.10 onwards, branch coverage is off by default and earlier versions do not support the rc option
-LCOV_OPTS=`if [ \`printf "\\\`lcov --version | cut -d' ' -f4\\\`\n1.10\n" | sort -V | head -n 1\` = 1.10 ] ; then echo "--rc lcov_branch_coverage=1" ; fi`
-
-rename_cov_data:
-       @test -z $(COVERAGE_DIR) || mkdir -p $(COVERAGE_DIR)
-       @rm -f $(COVERAGE_DIR)/*
-       @cp dali-core/.libs/*.gcda dali-core/.libs/*.gcno $(COVERAGE_DIR)
-       @for i in `find $(COVERAGE_DIR) -name "libdali*_la-*.gcda" -o -name "libdali*_la-*.gcno"` ;\
-               do mv $$i `echo $$i | sed s/libdali_.*_la-//` ; echo $$i ; done
-
-cov_data: rename_cov_data
-       @cd $(COVERAGE_DIR) ; lcov $(LCOV_OPTS) --base-directory . --directory . -c -o dali.info
-       @cd $(COVERAGE_DIR) ; lcov $(LCOV_OPTS) --remove dali.info "*/dali-env/*" "/usr/include/*" "public-api/shader-effects/*" "*/image-actor*" -o dali.info
-       @test -z $(COVERAGE_OUTPUT_DIR) || mkdir -p $(COVERAGE_OUTPUT_DIR)
-
-coverage: cov_data
-       @genhtml $(LCOV_OPTS) -o $(COVERAGE_OUTPUT_DIR) $(COVERAGE_DIR)/dali.info
-
-reset_coverage:
-       @lcov -z --directory `pwd`
diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
deleted file mode 100644 (file)
index 05a7465..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright (c) 2019 Samsung Electronics Co., Ltd.
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-m4_define([dali_version],[0.1.1])
-AC_INIT([dali], [dali_version])
-AM_INIT_AUTOMAKE([-Wall foreign])
-
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-AC_PROG_MKDIR_P
-
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-LT_INIT
-
-DALI_VERSION=dali_version
-AC_SUBST(DALI_VERSION)
-
-DALI_CFLAGS=-DPLATFORM_TIZEN
-
-# Use C++ 11
-DALI_CFLAGS="$DALI_CFLAGS -std=c++11 -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast -Werror -Wall -Wextra -Wno-unused-parameter -Wfloat-equal -Wconversion"
-
-AC_ARG_ENABLE(exportall,
-              [AC_HELP_STRING([--enable-exportall],
-                              [enables the exporting of all the symbols in the library])],
-              [enable_exportall=yes],
-              [enable_exportall=no])
-
-AC_ARG_ENABLE([debug],
-              [AC_HELP_STRING([--enable-debug],
-                              [Turns on debugging])],
-              [enable_debug=$enableval],
-              [enable_debug=no])
-
-AC_ARG_ENABLE([backtrace],
-              [AC_HELP_STRING([--enable-backtrace],
-                              [Backtrace for exceptions])],
-              [enable_backtrace=$enableval],
-              [enable_backtrace=yes])
-
-AC_ARG_ENABLE([lock_backtrace],
-              [AC_HELP_STRING([--enable-lock-backtrace],
-                              [Backtrace for when more than 1 lock is held on the same thread])],
-              [enable_lock_backtrace=$enableval],
-              [enable_lock_backtrace=no])
-
-AC_ARG_ENABLE([rename_so],
-              [AC_HELP_STRING([--enable-rename-so],
-                              [Specify whether so file is renamed or not])],
-              [enable_rename_so=$enableval],
-              [enable_rename_so=yes])
-
-AM_CONDITIONAL([ENABLE_RENAME_SO], [test x$enable_rename_so = xyes])
-
-if test "x$enable_debug" = "xyes"; then
-  DALI_CFLAGS="$DALI_CFLAGS -DDEBUG_ENABLED"
-fi
-
-if test "x$enable_trace" = "xyes"; then
-  DALI_CFLAGS="$DALI_CFLAGS -DTRACE_ENABLED"
-fi
-
-if test "x$enable_debug" = "xno" -a "x$enable_exportall" = "xno"; then
-  DALI_CFLAGS="$DALI_CFLAGS -fvisibility=hidden -DHIDE_DALI_INTERNALS"
-fi
-
-if test "x$enable_lock_backtrace" = "xyes"; then
-  DALI_CFLAGS="$DALI_CFLAGS -DLOCK_BACKTRACE_ENABLED"
-  enable_backtrace="yes"
-fi
-
-# Must come after locks backtrace feature test
-if test "x$enable_backtrace" = "xyes"; then
-  DALI_CFLAGS="$DALI_CFLAGS -DBACKTRACE_ENABLED"
-fi
-
-if test x$DALI_DATA_RW_DIR != x; then
-  dataReadWriteDir=$DALI_DATA_RW_DIR
-else
-  dataReadWriteDir=${prefix}/share/dali/
-fi
-
-if test x$DALI_DATA_RO_DIR != x; then
-  dataReadOnlyDir=$DALI_DATA_RO_DIR
-else
-  dataReadOnlyDir=${prefix}/share/dali/
-fi
-
-DALI_CFLAGS="$DALI_CFLAGS -I${includedir}"
-DALI_LDFLAGS="-L${libdir}"
-
-AC_SUBST(dataReadWriteDir)
-AC_SUBST(dataReadOnlyDir)
-AC_SUBST(DALI_CFLAGS)
-AC_SUBST(DALI_LDFLAGS)
-
-# Specify the include directory for development headers
-devincludepath=${includedir}
-AC_SUBST(devincludepath)
-
-AC_CONFIG_FILES([
-  Makefile
-  dali-core/Makefile
-  dali-core.pc
-])
-
-AC_OUTPUT
-
-echo "
-Configuration
--------------
-  Prefix:                           $prefix
-  Debug Build:                      $enable_debug
-  Trace Build:                      $enable_trace
-  Data Dir (Read/Write):            $dataReadWriteDir
-  Data Dir (Read Only):             $dataReadOnlyDir
-  Backtrace:                        $enable_backtrace
-  ScopedLock Backtrace:             $enable_lock_backtrace
-  Rename so file:                   $enable_rename_so
-"
index f04c7b68b131b375b420a582f1671cc0f4a5e82b..7bbcbfc8456e7f0828ab3f96b6c824be971c1148 100644 (file)
@@ -1,10 +1,10 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
 apiversion=@DALI_VERSION@
-libdir=@libdir@
-includedir=@devincludepath@
+libdir=@LIB_DIR@
+includedir=@DEV_INCLUDE_PATH@
 
-Name: Dali 3D engine
+Name: DALi 3D Engine
 Description: Cross platform 3D Engine
 Version: ${apiversion}
 Requires:
diff --git a/build/tizen/dali-core/Makefile.am b/build/tizen/dali-core/Makefile.am
deleted file mode 100644 (file)
index d66ff9f..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright (c) 2019 Samsung Electronics Co., Ltd.
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Parse each file.list
-# These files define <module>_src_files & <module>_header_files,
-# where <module> is the subdirectory from core_src_dir
-
-internal_src_dir = ../../../dali/internal
-include ../../../dali/internal/file.list
-
-public_api_src_dir = ../../../dali/public-api
-include ../../../dali/public-api/file.list
-
-devel_api_src_dir = ../../../dali/devel-api
-include ../../../dali/devel-api/file.list
-
-platform_abstraction_src_dir = ../../../dali/integration-api
-include ../../../dali/integration-api/file.list
-
-package_doxy_dir = ../../../doc
-include ../../../doc/file.list
-
-# Build the Dali libtool library
-
-DALI_CORE_LA_SOURCES = $(internal_src_files) \
-                       $(platform_abstraction_src_files) \
-                       $(public_api_src_files) \
-                       $(devel_api_src_files)
-
-DALI_CORE_LA_CXXFLAGS = -DDALI_COMPILATION \
-                        -DDALI_DATA_RW_DIR="\"${daliReadWriteDir}\"" \
-                        -DDALI_DATA_RO_DIR="\"${daliReadOnlyDir}\"" \
-                         $(cxx_flags) \
-                         $(dali_core_includes) \
-                         $(DALI_CFLAGS)
-
-DALI_CORE_LA_LIBADD = $(DALI_LDFLAGS) \
-                      -lpthread
-
-dali_core_includes = \
-        -I../../..
-
-lib_LTLIBRARIES = libdali-core-cxx11.la
-
-libdali_core_cxx11_la_SOURCES = $(DALI_CORE_LA_SOURCES)
-libdali_core_cxx11_la_CXXFLAGS = $(DALI_CORE_LA_CXXFLAGS)
-libdali_core_cxx11_la_LIBADD = $(DALI_CORE_LA_LIBADD)
-
-# Install headers under the correct subdirectories
-platformabstractiondir = $(includedir)/dali/integration-api
-platformabstractioneventsdir = $(includedir)/dali/integration-api/events
-
-platformabstraction_HEADERS = $(platform_abstraction_header_files)
-platformabstractionevents_HEADERS = $(platform_abstraction_events_header_files)
-
-#devel api (used by adaptor / toolkit
-develapidir = $(devincludepath)/dali/devel-api
-develapiactorsdir = $(develapidir)/actors
-develapianimationdir = $(develapidir)/animation
-develapicommondir = $(develapidir)/common
-develapieventsdir = $(develapidir)/events
-develapigeometrydir = $(develapidir)/geometry
-develapiimagesdir = $(develapidir)/images
-develapimodelingdir = $(develapidir)/modeling
-develapiobjectdir = $(develapidir)/object
-develapirenderingdir = $(develapidir)/rendering
-develapiscriptingdir = $(develapidir)/scripting
-develapisignalsdir = $(develapidir)/signals
-develapithreadingdir = $(develapidir)/threading
-develapiupdatedir = $(develapidir)/update
-
-develapi_HEADERS = $(devel_api_header_files)
-develapiactors_HEADERS = $(devel_api_core_actors_header_files)
-develapianimation_HEADERS = $(devel_api_core_animation_header_files)
-develapicommon_HEADERS = $(devel_api_core_common_header_files)
-develapievents_HEADERS = $(devel_api_core_events_header_files)
-develapiimages_HEADERS = $(devel_api_core_images_header_files)
-develapimodeling_HEADERS = $(devel_api_core_modeling_header_files)
-develapiobject_HEADERS = $(devel_api_core_object_header_files)
-develapirendering_HEADERS = $(devel_api_core_rendering_header_files)
-develapiscripting_HEADERS = $(devel_api_core_scripting_header_files)
-develapisignals_HEADERS = $(devel_api_core_signals_header_files)
-develapithreading_HEADERS = $(devel_api_core_threading_header_files)
-develapiupdate_HEADERS = $(devel_api_core_update_header_files)
-
-#public api
-publicapidir = $(devincludepath)/dali/public-api
-publicapiactorsdir = $(publicapidir)/actors
-publicapianimationdir = $(publicapidir)/animation
-publicapicommondir = $(publicapidir)/common
-publicapieventsdir = $(publicapidir)/events
-publicapiimagesdir = $(publicapidir)/images
-publicapimathdir = $(publicapidir)/math
-publicapiobjectdir = $(publicapidir)/object
-publicapirenderingdir = $(publicapidir)/rendering
-publicapirendertasksdir = $(publicapidir)/render-tasks
-publicapisignalsdir = $(publicapidir)/signals
-publicapisizenegotiationdir = $(publicapidir)/size-negotiation
-
-publicapi_HEADERS = $(public_api_header_files)
-publicapiactors_HEADERS = $(public_api_core_actors_header_files)
-publicapianimation_HEADERS = $(public_api_core_animation_header_files)
-publicapicommon_HEADERS = $(public_api_core_common_header_files)
-publicapievents_HEADERS = $(public_api_core_events_header_files)
-publicapiimages_HEADERS = $(public_api_core_images_header_files)
-publicapimath_HEADERS = $(public_api_core_math_header_files)
-publicapiobject_HEADERS = $(public_api_core_object_header_files)
-publicapirendering_HEADERS = $(public_api_core_rendering_header_files)
-publicapirendertasks_HEADERS = $(public_api_core_render_tasks_header_files)
-publicapisignals_HEADERS = $(public_api_core_signals_header_files)
-publicapisizenegotiation_HEADERS = $(public_api_core_size_negotiation_header_files)
-
-# package doxygen file (contains doxygen grouping information)
-packagedoxydir = $(devincludepath)/dali/doc
-packagedoxy_HEADERS = $(package_doxy_files)
-
-# linking test
-
-noinst_PROGRAMS = linker.test
-
-linker_test_SOURCES = linker-test.cpp  \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-application.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-render-controller.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-render-surface.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-gl-abstraction.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-gl-sync-abstraction.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-trace-call-stack.cpp
-
-linker_test_CXXFLAGS = \
-  $(cxx_flags) \
-  -I../../../automated-tests/src/dali/dali-test-suite-utils \
-  $(dali_core_includes) \
-  $(DALI_CFLAGS)
-
-linker_test_DEPENDENCIES = libdali-core-cxx11.la
-linker_test_LDADD = \
-  libdali-core-cxx11.la
-
-if ENABLE_RENAME_SO
-#rename
-install: install-am
-       rm -rf $(libdir)/libdali-core-cxx11.so
-       rm -rf $(libdir)/libdali-core.so
-       ln -s $(libdir)/libdali-core-cxx11.so.0.0.* $(libdir)/libdali-core.so
-endif
-
diff --git a/build/tizen/dali-core/linker-test.cpp b/build/tizen/dali-core/linker-test.cpp
deleted file mode 100644 (file)
index 274c0dc..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include "dali/public-api/dali-core.h"
-
-#include <cstdio>
-#include <stdarg.h>
-
-// Link with TET Test application, need to redefine TET functions
-void tet_infoline(const char* str)
-{
-  puts(str);
-}
-
-void tet_printf(const char* str, ...)
-{
-  va_list args;
-  va_start(args, str);
-  vprintf(str, args);
-  va_end(args);
-}
-
-
-#include "test-application.h"
-
-/*****************************************************************************
- * Test to see if dali is linking correctly.
- * Only really tests that the internal function/method definitions exist and
- * links to functions/methods in other libraries linked by Dali-Core.
- * If a definition of the Public or Integration API does not exist, then it
- * will not be checked here.
- * Also ensures TET Test Application is kept up-to-date.
- */
-
-int main(int argc, char **argv)
-{
-#ifndef _ARCH_ARM_
-  Dali::TestApplication application;
-#endif
-  return 0;
-}
diff --git a/build/tizen/linker-test.cpp b/build/tizen/linker-test.cpp
new file mode 100644 (file)
index 0000000..d6815c8
--- /dev/null
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include "dali/public-api/dali-core.h"
+
+#include <cstdio>
+#include <stdarg.h>
+
+// Link with TET Test application, need to redefine TET functions
+void tet_infoline(const char* str)
+{
+  puts(str);
+}
+
+void tet_printf(const char* str, ...)
+{
+  va_list args;
+  va_start(args, str);
+  vprintf(str, args);
+  va_end(args);
+}
+
+
+#include "test-application.h"
+
+/*****************************************************************************
+ * Test to see if dali is linking correctly.
+ * Only really tests that the internal function/method definitions exist and
+ * links to functions/methods in other libraries linked by Dali-Core.
+ * If a definition of the Public or Integration API does not exist, then it
+ * will not be checked here.
+ * Also ensures TET Test Application is kept up-to-date.
+ */
+
+int main(int argc, char **argv)
+{
+#ifndef _ARCH_ARM_
+  Dali::TestApplication application;
+#endif
+  return 0;
+}
diff --git a/build/tizen/rename-cov-data b/build/tizen/rename-cov-data
new file mode 100755 (executable)
index 0000000..a29f21b
--- /dev/null
@@ -0,0 +1,34 @@
+#!/bin/bash
+COVERAGE_DIR=.cov
+[[ -d ${COVERAGE_DIR} ]] || mkdir ${COVERAGE_DIR}
+rm -f ${COVERAGE_DIR}/*
+
+COVERAGE_EXTENSIONS="
+  gcda
+  gcno
+"
+
+SOURCE_EXTENSIONS="
+ c
+ cpp
+"
+
+for covExt in $COVERAGE_EXTENSIONS
+do
+  # Move into .cov directory
+  for file in `find -name *.${covExt}`
+  do
+    cp $file ${COVERAGE_DIR}
+  done
+
+  # strip source extensions liks .cpp as that's the format expected by patch-coverage.pl
+  for srcExt in $SOURCE_EXTENSIONS
+  do
+    for file in `find ${COVERAGE_DIR} -name *.${srcExt}.${covExt}`
+    do
+      name=`echo $file | sed "s/.${srcExt}.${covExt}//g"`
+      mv $file $name.${covExt}
+    done
+  done
+
+done
old mode 100755 (executable)
new mode 100644 (file)
index 42b3256..2ed30a5
+# Set the source directory
+SET( devel_api_src_dir ${ROOT_SRC_DIR}/dali/devel-api )
+
 # Add devel source files here for DALi internal developer files used by Adaptor & Toolkit
-devel_api_src_files = \
-  $(devel_api_src_dir)/actors/actor-devel.cpp \
-  $(devel_api_src_dir)/actors/custom-actor-devel.cpp \
-  $(devel_api_src_dir)/animation/animation-data.cpp \
-  $(devel_api_src_dir)/animation/animation-devel.cpp \
-  $(devel_api_src_dir)/animation/path-constrainer.cpp \
-  $(devel_api_src_dir)/common/hash.cpp \
-  $(devel_api_src_dir)/common/stage-devel.cpp \
-  $(devel_api_src_dir)/events/hit-test-algorithm.cpp \
-  $(devel_api_src_dir)/events/touch-data-devel.cpp \
-  $(devel_api_src_dir)/events/key-event-devel.cpp \
-  $(devel_api_src_dir)/images/distance-field.cpp \
-  $(devel_api_src_dir)/images/texture-set-image.cpp \
-  $(devel_api_src_dir)/images/nine-patch-image.cpp \
-  $(devel_api_src_dir)/images/pixel-data-devel.cpp \
-  $(devel_api_src_dir)/object/handle-devel.cpp \
-  $(devel_api_src_dir)/object/csharp-type-registry.cpp \
-  $(devel_api_src_dir)/scripting/scripting.cpp \
-  $(devel_api_src_dir)/signals/signal-delegate.cpp \
-  $(devel_api_src_dir)/threading/conditional-wait.cpp \
-  $(devel_api_src_dir)/threading/mutex.cpp \
-  $(devel_api_src_dir)/threading/thread.cpp \
-  $(devel_api_src_dir)/threading/thread-pool.cpp \
-  $(devel_api_src_dir)/update/frame-callback-interface.cpp \
-  $(devel_api_src_dir)/update/update-proxy.cpp
+SET( devel_api_src_files
+  ${devel_api_src_dir}/actors/actor-devel.cpp
+  ${devel_api_src_dir}/actors/custom-actor-devel.cpp
+  ${devel_api_src_dir}/animation/animation-data.cpp
+  ${devel_api_src_dir}/animation/animation-devel.cpp
+  ${devel_api_src_dir}/animation/path-constrainer.cpp
+  ${devel_api_src_dir}/common/hash.cpp
+  ${devel_api_src_dir}/common/stage-devel.cpp
+  ${devel_api_src_dir}/events/hit-test-algorithm.cpp
+  ${devel_api_src_dir}/events/touch-data-devel.cpp
+  ${devel_api_src_dir}/events/key-event-devel.cpp
+  ${devel_api_src_dir}/images/distance-field.cpp
+  ${devel_api_src_dir}/images/texture-set-image.cpp
+  ${devel_api_src_dir}/images/nine-patch-image.cpp
+  ${devel_api_src_dir}/images/pixel-data-devel.cpp
+  ${devel_api_src_dir}/object/handle-devel.cpp
+  ${devel_api_src_dir}/object/csharp-type-registry.cpp
+  ${devel_api_src_dir}/scripting/scripting.cpp
+  ${devel_api_src_dir}/signals/signal-delegate.cpp
+  ${devel_api_src_dir}/threading/conditional-wait.cpp
+  ${devel_api_src_dir}/threading/mutex.cpp
+  ${devel_api_src_dir}/threading/thread.cpp
+  ${devel_api_src_dir}/threading/thread-pool.cpp
+  ${devel_api_src_dir}/update/frame-callback-interface.cpp
+  ${devel_api_src_dir}/update/update-proxy.cpp
+)
 
 # Add devel header files here DALi internal developer files used by Adaptor & Toolkit
+SET( devel_api_core_actors_header_files
+  ${devel_api_src_dir}/actors/actor-devel.h
+  ${devel_api_src_dir}/actors/custom-actor-devel.h
+  ${devel_api_src_dir}/actors/layer-devel.h
+)
+
+
+SET( devel_api_core_animation_header_files
+  ${devel_api_src_dir}/animation/animation-data.h
+  ${devel_api_src_dir}/animation/path-constrainer.h
+  ${devel_api_src_dir}/animation/animation-devel.h
+)
+
+
+SET( devel_api_core_common_header_files
+  ${devel_api_src_dir}/common/bitwise-enum.h
+  ${devel_api_src_dir}/common/circular-queue.h
+  ${devel_api_src_dir}/common/hash.h
+  ${devel_api_src_dir}/common/map-wrapper.h
+  ${devel_api_src_dir}/common/owner-container.h
+  ${devel_api_src_dir}/common/ref-counted-dali-vector.h
+  ${devel_api_src_dir}/common/set-wrapper.h
+  ${devel_api_src_dir}/common/stage-devel.h
+)
+
+
+SET( devel_api_core_events_header_files
+  ${devel_api_src_dir}/events/hit-test-algorithm.h
+  ${devel_api_src_dir}/events/touch-data-devel.h
+  ${devel_api_src_dir}/events/key-event-devel.h
+)
+
+
+SET( devel_api_core_images_header_files
+  ${devel_api_src_dir}/images/distance-field.h
+  ${devel_api_src_dir}/images/native-image-interface-extension.h
+  ${devel_api_src_dir}/images/nine-patch-image.h
+  ${devel_api_src_dir}/images/texture-set-image.h
+  ${devel_api_src_dir}/images/pixel-data-devel.h
+)
+
+
+SET( devel_api_core_object_header_files
+  ${devel_api_src_dir}/object/csharp-type-info.h
+  ${devel_api_src_dir}/object/csharp-type-registry.h
+  ${devel_api_src_dir}/object/handle-devel.h
+  ${devel_api_src_dir}/object/property-helper-devel.h
+)
+
+
+SET( devel_api_core_rendering_header_files
+  ${devel_api_src_dir}/rendering/renderer-devel.h
+)
+
+
+SET( devel_api_core_signals_header_files
+  ${devel_api_src_dir}/signals/signal-delegate.h
+)
+
+
+SET( devel_api_core_scripting_header_files
+  ${devel_api_src_dir}/scripting/enum-helper.h
+  ${devel_api_src_dir}/scripting/scripting.h
+)
+
+
+SET( devel_api_core_threading_header_files
+  ${devel_api_src_dir}/threading/conditional-wait.h
+  ${devel_api_src_dir}/threading/mutex.h
+  ${devel_api_src_dir}/threading/thread.h
+  ${devel_api_src_dir}/threading/thread-pool.h
+)
+
+
+SET( devel_api_core_update_header_files
+  ${devel_api_src_dir}/update/frame-callback-interface.h
+  ${devel_api_src_dir}/update/update-proxy.h
+)
+
+
+SET( SOURCES ${SOURCES}
+  ${devel_api_src_files}
+)
 
-devel_api_core_actors_header_files = \
-  $(devel_api_src_dir)/actors/actor-devel.h \
-  $(devel_api_src_dir)/actors/custom-actor-devel.h \
-  $(devel_api_src_dir)/actors/layer-devel.h
-
-devel_api_core_animation_header_files = \
-  $(devel_api_src_dir)/animation/animation-data.h \
-  $(devel_api_src_dir)/animation/path-constrainer.h \
-  $(devel_api_src_dir)/animation/animation-devel.h
-
-devel_api_core_common_header_files = \
-  $(devel_api_src_dir)/common/bitwise-enum.h \
-  $(devel_api_src_dir)/common/circular-queue.h \
-  $(devel_api_src_dir)/common/hash.h \
-  $(devel_api_src_dir)/common/map-wrapper.h \
-  $(devel_api_src_dir)/common/owner-container.h \
-  $(devel_api_src_dir)/common/ref-counted-dali-vector.h \
-  $(devel_api_src_dir)/common/set-wrapper.h \
-  $(devel_api_src_dir)/common/stage-devel.h
-
-devel_api_core_events_header_files = \
-  $(devel_api_src_dir)/events/hit-test-algorithm.h \
-  $(devel_api_src_dir)/events/touch-data-devel.h \
-  $(devel_api_src_dir)/events/key-event-devel.h
-
-devel_api_core_images_header_files = \
-  $(devel_api_src_dir)/images/distance-field.h \
-  $(devel_api_src_dir)/images/native-image-interface-extension.h \
-  $(devel_api_src_dir)/images/nine-patch-image.h \
-  $(devel_api_src_dir)/images/texture-set-image.h \
-  $(devel_api_src_dir)/images/pixel-data-devel.h
-
-devel_api_core_object_header_files = \
-  $(devel_api_src_dir)/object/csharp-type-info.h \
-  $(devel_api_src_dir)/object/csharp-type-registry.h \
-  $(devel_api_src_dir)/object/handle-devel.h \
-  $(devel_api_src_dir)/object/property-helper-devel.h
-
-devel_api_core_rendering_header_files = \
-  $(devel_api_src_dir)/rendering/renderer-devel.h
-
-devel_api_core_signals_header_files = \
-  $(devel_api_src_dir)/signals/signal-delegate.h
-
-devel_api_core_scripting_header_files = \
-  $(devel_api_src_dir)/scripting/enum-helper.h \
-  $(devel_api_src_dir)/scripting/scripting.h
-
-devel_api_core_threading_header_files = \
-  $(devel_api_src_dir)/threading/conditional-wait.h \
-  $(devel_api_src_dir)/threading/mutex.h \
-  $(devel_api_src_dir)/threading/thread.h \
-  $(devel_api_src_dir)/threading/thread-pool.h
-
-devel_api_core_update_header_files = \
-  $(devel_api_src_dir)/update/frame-callback-interface.h \
-  $(devel_api_src_dir)/update/update-proxy.h
+SET( DEVEL_API_HEADERS ${DEVEL_API_HEADERS}
+  ${devel_api_core_actors_header_files}
+  ${devel_api_core_animation_header_files}
+  ${devel_api_core_common_header_files}
+  ${devel_api_core_events_header_files}
+  ${devel_api_core_images_header_files}
+  ${devel_api_core_object_header_files}
+  ${devel_api_core_rendering_header_files}
+  ${devel_api_core_signals_header_files}
+  ${devel_api_core_scripting_header_files}
+  ${devel_api_core_threading_header_files}
+  ${devel_api_core_update_header_files}
+)
index c4174fa265ec51ff4a8bba2382301e937acf0d7d..e03ced4a8b7be2a167531e2521cd72e67d2d334b 100644 (file)
@@ -1,53 +1,70 @@
+# Set the source directory
+SET( platform_abstraction_src_dir ${ROOT_SRC_DIR}/dali/integration-api )
+
 # Add platform abstraction headers here
+SET( platform_abstraction_src_files
+   ${platform_abstraction_src_dir}/bitmap.cpp
+   ${platform_abstraction_src_dir}/core.cpp
+   ${platform_abstraction_src_dir}/debug.cpp
+   ${platform_abstraction_src_dir}/trace.cpp
+   ${platform_abstraction_src_dir}/profiling.cpp
+   ${platform_abstraction_src_dir}/input-options.cpp
+   ${platform_abstraction_src_dir}/lockless-buffer.cpp
+   ${platform_abstraction_src_dir}/render-task-list-integ.cpp
+   ${platform_abstraction_src_dir}/scene.cpp
+   ${platform_abstraction_src_dir}/events/event.cpp
+   ${platform_abstraction_src_dir}/events/hover-event-integ.cpp
+   ${platform_abstraction_src_dir}/events/key-event-integ.cpp
+   ${platform_abstraction_src_dir}/events/wheel-event-integ.cpp
+   ${platform_abstraction_src_dir}/events/multi-point-event-integ.cpp
+   ${platform_abstraction_src_dir}/events/point.cpp
+   ${platform_abstraction_src_dir}/events/touch-event-combiner.cpp
+   ${platform_abstraction_src_dir}/events/touch-event-integ.cpp
+)
+
+
+SET( platform_abstraction_header_files
+   ${platform_abstraction_src_dir}/core.h
+   ${platform_abstraction_src_dir}/core-enumerations.h
+   ${platform_abstraction_src_dir}/context-notifier.h
+   ${platform_abstraction_src_dir}/debug.h
+   ${platform_abstraction_src_dir}/trace.h
+   ${platform_abstraction_src_dir}/profiling.h
+   ${platform_abstraction_src_dir}/input-options.h
+   ${platform_abstraction_src_dir}/bitmap.h
+   ${platform_abstraction_src_dir}/resource-policies.h
+   ${platform_abstraction_src_dir}/resource-types.h
+   ${platform_abstraction_src_dir}/gl-abstraction.h
+   ${platform_abstraction_src_dir}/gl-defines.h
+   ${platform_abstraction_src_dir}/gl-sync-abstraction.h
+   ${platform_abstraction_src_dir}/gl-context-helper-abstraction.h
+   ${platform_abstraction_src_dir}/render-controller.h
+   ${platform_abstraction_src_dir}/platform-abstraction.h
+   ${platform_abstraction_src_dir}/processor-interface.h
+   ${platform_abstraction_src_dir}/lockless-buffer.h
+   ${platform_abstraction_src_dir}/render-task-list-integ.h
+   ${platform_abstraction_src_dir}/scene.h
+   ${platform_abstraction_src_dir}/render-surface.h
+)
+
+
+SET( platform_abstraction_events_header_files
+   ${platform_abstraction_src_dir}/events/event.h
+   ${platform_abstraction_src_dir}/events/hover-event-integ.h
+   ${platform_abstraction_src_dir}/events/key-event-integ.h
+   ${platform_abstraction_src_dir}/events/wheel-event-integ.h
+   ${platform_abstraction_src_dir}/events/multi-point-event-integ.h
+   ${platform_abstraction_src_dir}/events/point.h
+   ${platform_abstraction_src_dir}/events/touch-event-combiner.h
+   ${platform_abstraction_src_dir}/events/touch-event-integ.h
+)
+
+
+SET( SOURCES ${SOURCES}
+  ${platform_abstraction_src_files}
+)
 
-platform_abstraction_src_files = \
-   $(platform_abstraction_src_dir)/bitmap.cpp \
-   $(platform_abstraction_src_dir)/core.cpp \
-   $(platform_abstraction_src_dir)/debug.cpp \
-   $(platform_abstraction_src_dir)/trace.cpp \
-   $(platform_abstraction_src_dir)/profiling.cpp \
-   $(platform_abstraction_src_dir)/input-options.cpp \
-   $(platform_abstraction_src_dir)/lockless-buffer.cpp \
-   $(platform_abstraction_src_dir)/render-task-list-integ.cpp \
-   $(platform_abstraction_src_dir)/scene.cpp \
-   $(platform_abstraction_src_dir)/events/event.cpp \
-   $(platform_abstraction_src_dir)/events/hover-event-integ.cpp \
-   $(platform_abstraction_src_dir)/events/key-event-integ.cpp \
-   $(platform_abstraction_src_dir)/events/wheel-event-integ.cpp \
-   $(platform_abstraction_src_dir)/events/multi-point-event-integ.cpp \
-   $(platform_abstraction_src_dir)/events/point.cpp \
-   $(platform_abstraction_src_dir)/events/touch-event-combiner.cpp \
-   $(platform_abstraction_src_dir)/events/touch-event-integ.cpp
-
-platform_abstraction_header_files = \
-   $(platform_abstraction_src_dir)/core.h \
-   $(platform_abstraction_src_dir)/core-enumerations.h \
-   $(platform_abstraction_src_dir)/context-notifier.h \
-   $(platform_abstraction_src_dir)/debug.h \
-   $(platform_abstraction_src_dir)/trace.h \
-   $(platform_abstraction_src_dir)/profiling.h \
-   $(platform_abstraction_src_dir)/input-options.h \
-   $(platform_abstraction_src_dir)/bitmap.h \
-   $(platform_abstraction_src_dir)/resource-policies.h \
-   $(platform_abstraction_src_dir)/resource-types.h \
-   $(platform_abstraction_src_dir)/gl-abstraction.h \
-   $(platform_abstraction_src_dir)/gl-defines.h \
-   $(platform_abstraction_src_dir)/gl-sync-abstraction.h \
-   $(platform_abstraction_src_dir)/gl-context-helper-abstraction.h \
-   $(platform_abstraction_src_dir)/render-controller.h \
-   $(platform_abstraction_src_dir)/platform-abstraction.h \
-   $(platform_abstraction_src_dir)/processor-interface.h \
-   $(platform_abstraction_src_dir)/lockless-buffer.h \
-   $(platform_abstraction_src_dir)/render-task-list-integ.h \
-   $(platform_abstraction_src_dir)/scene.h \
-   $(platform_abstraction_src_dir)/render-surface.h
-
-platform_abstraction_events_header_files = \
-   $(platform_abstraction_src_dir)/events/event.h \
-   $(platform_abstraction_src_dir)/events/hover-event-integ.h \
-   $(platform_abstraction_src_dir)/events/key-event-integ.h \
-   $(platform_abstraction_src_dir)/events/wheel-event-integ.h \
-   $(platform_abstraction_src_dir)/events/multi-point-event-integ.h \
-   $(platform_abstraction_src_dir)/events/point.h \
-   $(platform_abstraction_src_dir)/events/touch-event-combiner.h \
-   $(platform_abstraction_src_dir)/events/touch-event-integ.h
+SET( INTEGRATION_API_HEADERS ${INTEGRATION_API_HEADERS}
+  ${platform_abstraction_header_files}
+  ${platform_abstraction_events_header_files}
+)
index bd5f8ce22188e7cc69e035df28be0f2e395c28e3..1bca1096a9eaa97f390dfb9effc996640b03fda3 100644 (file)
+# Set the source directory
+SET( internal_src_dir ${ROOT_SRC_DIR}/dali/internal )
+
 # Add internal source files here
+SET( internal_src_files
+  ${internal_src_dir}/common/blending-options.cpp
+  ${internal_src_dir}/common/core-impl.cpp
+  ${internal_src_dir}/common/internal-constants.cpp
+  ${internal_src_dir}/common/math.cpp
+  ${internal_src_dir}/common/message-buffer.cpp
+  ${internal_src_dir}/common/mutex-trace.cpp
+  ${internal_src_dir}/common/image-sampler.cpp
+  ${internal_src_dir}/common/image-attributes.cpp
+  ${internal_src_dir}/common/fixed-size-memory-pool.cpp
+
+  ${internal_src_dir}/event/actors/actor-impl.cpp
+  ${internal_src_dir}/event/actors/custom-actor-internal.cpp
+  ${internal_src_dir}/event/actors/layer-impl.cpp
+  ${internal_src_dir}/event/actors/layer-list.cpp
+  ${internal_src_dir}/event/actors/camera-actor-impl.cpp
+  ${internal_src_dir}/event/animation/animation-impl.cpp
+  ${internal_src_dir}/event/animation/animation-playlist.cpp
+  ${internal_src_dir}/event/animation/constrainer.cpp
+  ${internal_src_dir}/event/animation/constraint-base.cpp
+  ${internal_src_dir}/event/animation/key-frames-impl.cpp
+  ${internal_src_dir}/event/animation/linear-constrainer-impl.cpp
+  ${internal_src_dir}/event/animation/path-impl.cpp
+  ${internal_src_dir}/event/animation/path-constrainer-impl.cpp
+  ${internal_src_dir}/event/common/demangler.cpp
+  ${internal_src_dir}/event/common/event-thread-services.cpp
+  ${internal_src_dir}/event/common/notification-manager.cpp
+  ${internal_src_dir}/event/common/object-impl.cpp
+  ${internal_src_dir}/event/common/object-registry-impl.cpp
+  ${internal_src_dir}/event/common/projection.cpp
+  ${internal_src_dir}/event/common/property-buffer-impl.cpp
+  ${internal_src_dir}/event/common/property-conditions-impl.cpp
+  ${internal_src_dir}/event/common/property-metadata.cpp
+  ${internal_src_dir}/event/common/property-notification-impl.cpp
+  ${internal_src_dir}/event/common/property-notification-manager.cpp
+  ${internal_src_dir}/event/common/property-helper.cpp
+  ${internal_src_dir}/event/common/scene-impl.cpp
+  ${internal_src_dir}/event/common/stage-impl.cpp
+  ${internal_src_dir}/event/common/thread-local-storage.cpp
+  ${internal_src_dir}/event/common/type-info-impl.cpp
+  ${internal_src_dir}/event/common/type-registry-impl.cpp
+  ${internal_src_dir}/event/effects/shader-factory.cpp
+  ${internal_src_dir}/event/events/actor-gesture-data.cpp
+  ${internal_src_dir}/event/events/actor-observer.cpp
+  ${internal_src_dir}/event/events/event-processor.cpp
+  ${internal_src_dir}/event/events/key-event-impl.cpp
+  ${internal_src_dir}/event/events/key-event-processor.cpp
+  ${internal_src_dir}/event/events/gesture-detector-impl.cpp
+  ${internal_src_dir}/event/events/gesture-event.cpp
+  ${internal_src_dir}/event/events/gesture-event-processor.cpp
+  ${internal_src_dir}/event/events/gesture-processor.cpp
+  ${internal_src_dir}/event/events/hit-test-algorithm-impl.cpp
+  ${internal_src_dir}/event/events/hover-event-processor.cpp
+  ${internal_src_dir}/event/events/long-press-gesture-detector-impl.cpp
+  ${internal_src_dir}/event/events/long-press-gesture-event.cpp
+  ${internal_src_dir}/event/events/long-press-gesture-processor.cpp
+  ${internal_src_dir}/event/events/long-press-gesture-recognizer.cpp
+  ${internal_src_dir}/event/events/wheel-event-processor.cpp
+  ${internal_src_dir}/event/events/multi-point-event-util.cpp
+  ${internal_src_dir}/event/events/pan-gesture-detector-impl.cpp
+  ${internal_src_dir}/event/events/pan-gesture-event.cpp
+  ${internal_src_dir}/event/events/pan-gesture-processor.cpp
+  ${internal_src_dir}/event/events/pan-gesture-recognizer.cpp
+  ${internal_src_dir}/event/events/pinch-gesture-detector-impl.cpp
+  ${internal_src_dir}/event/events/pinch-gesture-event.cpp
+  ${internal_src_dir}/event/events/pinch-gesture-processor.cpp
+  ${internal_src_dir}/event/events/pinch-gesture-recognizer.cpp
+  ${internal_src_dir}/event/events/tap-gesture-detector-impl.cpp
+  ${internal_src_dir}/event/events/tap-gesture-event.cpp
+  ${internal_src_dir}/event/events/tap-gesture-processor.cpp
+  ${internal_src_dir}/event/events/tap-gesture-recognizer.cpp
+  ${internal_src_dir}/event/events/touch-data-impl.cpp
+  ${internal_src_dir}/event/events/touch-event-processor.cpp
+  ${internal_src_dir}/event/images/bitmap-packed-pixel.cpp
+  ${internal_src_dir}/event/images/bitmap-compressed.cpp
+  ${internal_src_dir}/event/images/image-impl.cpp
+  ${internal_src_dir}/event/images/buffer-image-impl.cpp
+  ${internal_src_dir}/event/images/frame-buffer-image-impl.cpp
+  ${internal_src_dir}/event/images/encoded-buffer-image-impl.cpp
+  ${internal_src_dir}/event/images/nine-patch-image-impl.cpp
+  ${internal_src_dir}/event/images/resource-image-impl.cpp
+  ${internal_src_dir}/event/images/native-image-impl.cpp
+  ${internal_src_dir}/event/images/pixel-data-impl.cpp
+  ${internal_src_dir}/event/render-tasks/render-task-impl.cpp
+  ${internal_src_dir}/event/render-tasks/render-task-list-impl.cpp
+  ${internal_src_dir}/event/rendering/frame-buffer-impl.cpp
+  ${internal_src_dir}/event/rendering/geometry-impl.cpp
+  ${internal_src_dir}/event/rendering/texture-impl.cpp
+  ${internal_src_dir}/event/rendering/texture-set-impl.cpp
+  ${internal_src_dir}/event/rendering/renderer-impl.cpp
+  ${internal_src_dir}/event/rendering/sampler-impl.cpp
+  ${internal_src_dir}/event/rendering/shader-impl.cpp
+  ${internal_src_dir}/event/size-negotiation/memory-pool-relayout-container.cpp
+  ${internal_src_dir}/event/size-negotiation/relayout-controller-impl.cpp
+
+  ${internal_src_dir}/render/common/render-algorithms.cpp
+  ${internal_src_dir}/render/common/render-debug.cpp
+  ${internal_src_dir}/render/common/render-instruction.cpp
+  ${internal_src_dir}/render/common/render-instruction-container.cpp
+  ${internal_src_dir}/render/common/render-item.cpp
+  ${internal_src_dir}/render/common/render-tracker.cpp
+  ${internal_src_dir}/render/common/render-manager.cpp
+  ${internal_src_dir}/render/data-providers/render-data-provider.cpp
+  ${internal_src_dir}/render/gl-resources/context.cpp
+  ${internal_src_dir}/render/gl-resources/frame-buffer-state-cache.cpp
+  ${internal_src_dir}/render/gl-resources/gl-call-debug.cpp
+  ${internal_src_dir}/render/gl-resources/gpu-buffer.cpp
+  ${internal_src_dir}/render/queue/render-queue.cpp
+  ${internal_src_dir}/render/renderers/render-texture-frame-buffer.cpp
+  ${internal_src_dir}/render/renderers/render-surface-frame-buffer.cpp
+  ${internal_src_dir}/render/renderers/render-geometry.cpp
+  ${internal_src_dir}/render/renderers/render-property-buffer.cpp
+  ${internal_src_dir}/render/renderers/render-renderer.cpp
+  ${internal_src_dir}/render/renderers/render-texture.cpp
+  ${internal_src_dir}/render/shaders/program.cpp
+  ${internal_src_dir}/render/shaders/program-controller.cpp
+  ${internal_src_dir}/render/shaders/scene-graph-shader.cpp
+
+  ${internal_src_dir}/update/animation/scene-graph-animation.cpp
+  ${internal_src_dir}/update/animation/scene-graph-constraint-base.cpp
+  ${internal_src_dir}/update/common/discard-queue.cpp
+  ${internal_src_dir}/update/common/property-base.cpp
+  ${internal_src_dir}/update/common/property-owner-messages.cpp
+  ${internal_src_dir}/update/common/property-condition-functions.cpp
+  ${internal_src_dir}/update/common/property-condition-step-functions.cpp
+  ${internal_src_dir}/update/common/property-condition-variable-step-functions.cpp
+  ${internal_src_dir}/update/common/property-owner.cpp
+  ${internal_src_dir}/update/common/scene-graph-buffers.cpp
+  ${internal_src_dir}/update/common/scene-graph-connection-change-propagator.cpp
+  ${internal_src_dir}/update/common/scene-graph-property-notification.cpp
+  ${internal_src_dir}/update/common/uniform-map.cpp
+  ${internal_src_dir}/update/controllers/render-message-dispatcher.cpp
+  ${internal_src_dir}/update/controllers/scene-controller-impl.cpp
+  ${internal_src_dir}/update/gestures/pan-gesture-profiling.cpp
+  ${internal_src_dir}/update/gestures/scene-graph-pan-gesture.cpp
+  ${internal_src_dir}/update/queue/update-message-queue.cpp
+  ${internal_src_dir}/update/manager/frame-callback-processor.cpp
+  ${internal_src_dir}/update/manager/render-instruction-processor.cpp
+  ${internal_src_dir}/update/manager/render-task-processor.cpp
+  ${internal_src_dir}/update/manager/scene-graph-frame-callback.cpp
+  ${internal_src_dir}/update/manager/transform-manager.cpp
+  ${internal_src_dir}/update/manager/update-algorithms.cpp
+  ${internal_src_dir}/update/manager/update-manager.cpp
+  ${internal_src_dir}/update/manager/update-manager-debug.cpp
+  ${internal_src_dir}/update/manager/update-proxy-impl.cpp
+  ${internal_src_dir}/update/render-tasks/scene-graph-camera.cpp
+  ${internal_src_dir}/update/nodes/node.cpp
+  ${internal_src_dir}/update/nodes/node-messages.cpp
+  ${internal_src_dir}/update/nodes/scene-graph-layer.cpp
+  ${internal_src_dir}/update/render-tasks/scene-graph-render-task.cpp
+  ${internal_src_dir}/update/render-tasks/scene-graph-render-task-list.cpp
+  ${internal_src_dir}/update/rendering/scene-graph-texture-set.cpp
+  ${internal_src_dir}/update/rendering/scene-graph-renderer.cpp
+)
+
 
-internal_src_files = \
-  $(internal_src_dir)/common/blending-options.cpp \
-  $(internal_src_dir)/common/core-impl.cpp \
-  $(internal_src_dir)/common/internal-constants.cpp \
-  $(internal_src_dir)/common/math.cpp \
-  $(internal_src_dir)/common/message-buffer.cpp \
-  $(internal_src_dir)/common/mutex-trace.cpp \
-  $(internal_src_dir)/common/image-sampler.cpp \
-  $(internal_src_dir)/common/image-attributes.cpp \
-  $(internal_src_dir)/common/fixed-size-memory-pool.cpp \
-  \
-  $(internal_src_dir)/event/actors/actor-impl.cpp \
-  $(internal_src_dir)/event/actors/custom-actor-internal.cpp \
-  $(internal_src_dir)/event/actors/layer-impl.cpp \
-  $(internal_src_dir)/event/actors/layer-list.cpp \
-  $(internal_src_dir)/event/actors/camera-actor-impl.cpp \
-  $(internal_src_dir)/event/animation/animation-impl.cpp \
-  $(internal_src_dir)/event/animation/animation-playlist.cpp \
-  $(internal_src_dir)/event/animation/constrainer.cpp \
-  $(internal_src_dir)/event/animation/constraint-base.cpp \
-  $(internal_src_dir)/event/animation/key-frames-impl.cpp \
-  $(internal_src_dir)/event/animation/linear-constrainer-impl.cpp \
-  $(internal_src_dir)/event/animation/path-impl.cpp \
-  $(internal_src_dir)/event/animation/path-constrainer-impl.cpp \
-  $(internal_src_dir)/event/common/demangler.cpp \
-  $(internal_src_dir)/event/common/event-thread-services.cpp \
-  $(internal_src_dir)/event/common/notification-manager.cpp \
-  $(internal_src_dir)/event/common/object-impl.cpp \
-  $(internal_src_dir)/event/common/object-registry-impl.cpp \
-  $(internal_src_dir)/event/common/projection.cpp \
-  $(internal_src_dir)/event/common/property-buffer-impl.cpp  \
-  $(internal_src_dir)/event/common/property-conditions-impl.cpp  \
-  $(internal_src_dir)/event/common/property-metadata.cpp  \
-  $(internal_src_dir)/event/common/property-notification-impl.cpp  \
-  $(internal_src_dir)/event/common/property-notification-manager.cpp \
-  $(internal_src_dir)/event/common/property-helper.cpp \
-  $(internal_src_dir)/event/common/scene-impl.cpp \
-  $(internal_src_dir)/event/common/stage-impl.cpp \
-  $(internal_src_dir)/event/common/thread-local-storage.cpp \
-  $(internal_src_dir)/event/common/type-info-impl.cpp \
-  $(internal_src_dir)/event/common/type-registry-impl.cpp \
-  $(internal_src_dir)/event/effects/shader-factory.cpp \
-  $(internal_src_dir)/event/events/actor-gesture-data.cpp \
-  $(internal_src_dir)/event/events/actor-observer.cpp \
-  $(internal_src_dir)/event/events/event-processor.cpp \
-  $(internal_src_dir)/event/events/key-event-impl.cpp \
-  $(internal_src_dir)/event/events/key-event-processor.cpp \
-  $(internal_src_dir)/event/events/gesture-detector-impl.cpp \
-  $(internal_src_dir)/event/events/gesture-event.cpp \
-  $(internal_src_dir)/event/events/gesture-event-processor.cpp \
-  $(internal_src_dir)/event/events/gesture-processor.cpp \
-  $(internal_src_dir)/event/events/hit-test-algorithm-impl.cpp \
-  $(internal_src_dir)/event/events/hover-event-processor.cpp \
-  $(internal_src_dir)/event/events/long-press-gesture-detector-impl.cpp \
-  $(internal_src_dir)/event/events/long-press-gesture-event.cpp \
-  $(internal_src_dir)/event/events/long-press-gesture-processor.cpp \
-  $(internal_src_dir)/event/events/long-press-gesture-recognizer.cpp \
-  $(internal_src_dir)/event/events/wheel-event-processor.cpp \
-  $(internal_src_dir)/event/events/multi-point-event-util.cpp \
-  $(internal_src_dir)/event/events/pan-gesture-detector-impl.cpp \
-  $(internal_src_dir)/event/events/pan-gesture-event.cpp \
-  $(internal_src_dir)/event/events/pan-gesture-processor.cpp \
-  $(internal_src_dir)/event/events/pan-gesture-recognizer.cpp \
-  $(internal_src_dir)/event/events/pinch-gesture-detector-impl.cpp \
-  $(internal_src_dir)/event/events/pinch-gesture-event.cpp \
-  $(internal_src_dir)/event/events/pinch-gesture-processor.cpp \
-  $(internal_src_dir)/event/events/pinch-gesture-recognizer.cpp \
-  $(internal_src_dir)/event/events/tap-gesture-detector-impl.cpp \
-  $(internal_src_dir)/event/events/tap-gesture-event.cpp \
-  $(internal_src_dir)/event/events/tap-gesture-processor.cpp \
-  $(internal_src_dir)/event/events/tap-gesture-recognizer.cpp \
-  $(internal_src_dir)/event/events/touch-data-impl.cpp \
-  $(internal_src_dir)/event/events/touch-event-processor.cpp \
-  $(internal_src_dir)/event/images/bitmap-packed-pixel.cpp \
-  $(internal_src_dir)/event/images/bitmap-compressed.cpp \
-  $(internal_src_dir)/event/images/image-impl.cpp \
-  $(internal_src_dir)/event/images/buffer-image-impl.cpp \
-  $(internal_src_dir)/event/images/frame-buffer-image-impl.cpp \
-  $(internal_src_dir)/event/images/encoded-buffer-image-impl.cpp \
-  $(internal_src_dir)/event/images/nine-patch-image-impl.cpp \
-  $(internal_src_dir)/event/images/resource-image-impl.cpp \
-  $(internal_src_dir)/event/images/native-image-impl.cpp \
-  $(internal_src_dir)/event/images/pixel-data-impl.cpp \
-  $(internal_src_dir)/event/render-tasks/render-task-impl.cpp \
-  $(internal_src_dir)/event/render-tasks/render-task-list-impl.cpp \
-  $(internal_src_dir)/event/rendering/frame-buffer-impl.cpp \
-  $(internal_src_dir)/event/rendering/geometry-impl.cpp \
-  $(internal_src_dir)/event/rendering/texture-impl.cpp \
-  $(internal_src_dir)/event/rendering/texture-set-impl.cpp \
-  $(internal_src_dir)/event/rendering/renderer-impl.cpp \
-  $(internal_src_dir)/event/rendering/sampler-impl.cpp \
-  $(internal_src_dir)/event/rendering/shader-impl.cpp \
-  $(internal_src_dir)/event/size-negotiation/memory-pool-relayout-container.cpp \
-  $(internal_src_dir)/event/size-negotiation/relayout-controller-impl.cpp \
-  \
-  $(internal_src_dir)/render/common/render-algorithms.cpp \
-  $(internal_src_dir)/render/common/render-debug.cpp \
-  $(internal_src_dir)/render/common/render-instruction.cpp \
-  $(internal_src_dir)/render/common/render-instruction-container.cpp \
-  $(internal_src_dir)/render/common/render-item.cpp \
-  $(internal_src_dir)/render/common/render-tracker.cpp \
-  $(internal_src_dir)/render/common/render-manager.cpp \
-  $(internal_src_dir)/render/data-providers/render-data-provider.cpp \
-  $(internal_src_dir)/render/gl-resources/context.cpp \
-  $(internal_src_dir)/render/gl-resources/frame-buffer-state-cache.cpp \
-  $(internal_src_dir)/render/gl-resources/gl-call-debug.cpp \
-  $(internal_src_dir)/render/gl-resources/gpu-buffer.cpp \
-  $(internal_src_dir)/render/queue/render-queue.cpp \
-  $(internal_src_dir)/render/renderers/render-texture-frame-buffer.cpp \
-  $(internal_src_dir)/render/renderers/render-surface-frame-buffer.cpp \
-  $(internal_src_dir)/render/renderers/render-geometry.cpp \
-  $(internal_src_dir)/render/renderers/render-property-buffer.cpp \
-  $(internal_src_dir)/render/renderers/render-renderer.cpp \
-  $(internal_src_dir)/render/renderers/render-texture.cpp \
-  $(internal_src_dir)/render/shaders/program.cpp \
-  $(internal_src_dir)/render/shaders/program-controller.cpp \
-  $(internal_src_dir)/render/shaders/scene-graph-shader.cpp \
-  \
-  $(internal_src_dir)/update/animation/scene-graph-animation.cpp \
-  $(internal_src_dir)/update/animation/scene-graph-constraint-base.cpp \
-  $(internal_src_dir)/update/common/discard-queue.cpp \
-  $(internal_src_dir)/update/common/property-base.cpp \
-  $(internal_src_dir)/update/common/property-owner-messages.cpp \
-  $(internal_src_dir)/update/common/property-condition-functions.cpp \
-  $(internal_src_dir)/update/common/property-condition-step-functions.cpp \
-  $(internal_src_dir)/update/common/property-condition-variable-step-functions.cpp \
-  $(internal_src_dir)/update/common/property-owner.cpp \
-  $(internal_src_dir)/update/common/scene-graph-buffers.cpp \
-  $(internal_src_dir)/update/common/scene-graph-connection-change-propagator.cpp \
-  $(internal_src_dir)/update/common/scene-graph-property-notification.cpp \
-  $(internal_src_dir)/update/common/uniform-map.cpp \
-  $(internal_src_dir)/update/controllers/render-message-dispatcher.cpp \
-  $(internal_src_dir)/update/controllers/scene-controller-impl.cpp \
-  $(internal_src_dir)/update/gestures/pan-gesture-profiling.cpp \
-  $(internal_src_dir)/update/gestures/scene-graph-pan-gesture.cpp \
-  $(internal_src_dir)/update/queue/update-message-queue.cpp \
-  $(internal_src_dir)/update/manager/frame-callback-processor.cpp \
-  $(internal_src_dir)/update/manager/render-instruction-processor.cpp \
-  $(internal_src_dir)/update/manager/render-task-processor.cpp \
-  $(internal_src_dir)/update/manager/scene-graph-frame-callback.cpp \
-  $(internal_src_dir)/update/manager/transform-manager.cpp \
-  $(internal_src_dir)/update/manager/update-algorithms.cpp \
-  $(internal_src_dir)/update/manager/update-manager.cpp \
-  $(internal_src_dir)/update/manager/update-manager-debug.cpp \
-  $(internal_src_dir)/update/manager/update-proxy-impl.cpp \
-  $(internal_src_dir)/update/render-tasks/scene-graph-camera.cpp \
-  $(internal_src_dir)/update/nodes/node.cpp \
-  $(internal_src_dir)/update/nodes/node-messages.cpp \
-  $(internal_src_dir)/update/nodes/scene-graph-layer.cpp \
-  $(internal_src_dir)/update/render-tasks/scene-graph-render-task.cpp \
-  $(internal_src_dir)/update/render-tasks/scene-graph-render-task-list.cpp \
-  $(internal_src_dir)/update/rendering/scene-graph-texture-set.cpp \
-  $(internal_src_dir)/update/rendering/scene-graph-renderer.cpp
+SET( SOURCES ${SOURCES}
+  ${internal_src_files}
+)
index 1e0e4435930ad1208bb3e44afaaf9d4e3a77bfc8..01d7a7586a3e118d6d82c5fc99de66cbf3659df2 100644 (file)
+# Set the source directory
+SET( public_api_src_dir ${ROOT_SRC_DIR}/dali/public-api )
+
 #
-# Add public-api source files here
+SET( public_api_src_files
+  ${public_api_src_dir}/actors/actor.cpp
+  ${public_api_src_dir}/actors/camera-actor.cpp
+  ${public_api_src_dir}/actors/custom-actor.cpp
+  ${public_api_src_dir}/actors/custom-actor-impl.cpp
+  ${public_api_src_dir}/actors/layer.cpp
+  ${public_api_src_dir}/animation/animation.cpp
+  ${public_api_src_dir}/animation/alpha-function.cpp
+  ${public_api_src_dir}/animation/constraint.cpp
+  ${public_api_src_dir}/animation/constraint-source.cpp
+  ${public_api_src_dir}/animation/key-frames.cpp
+  ${public_api_src_dir}/animation/linear-constrainer.cpp
+  ${public_api_src_dir}/animation/path.cpp
+  ${public_api_src_dir}/animation/time-period.cpp
+  ${public_api_src_dir}/common/constants.cpp
+  ${public_api_src_dir}/common/dali-common.cpp
+  ${public_api_src_dir}/common/dali-vector.cpp
+  ${public_api_src_dir}/common/extents.cpp
+  ${public_api_src_dir}/common/stage.cpp
+  ${public_api_src_dir}/events/gesture.cpp
+  ${public_api_src_dir}/events/gesture-detector.cpp
+  ${public_api_src_dir}/events/hover-event.cpp
+  ${public_api_src_dir}/events/key-event.cpp
+  ${public_api_src_dir}/events/long-press-gesture.cpp
+  ${public_api_src_dir}/events/long-press-gesture-detector.cpp
+  ${public_api_src_dir}/events/wheel-event.cpp
+  ${public_api_src_dir}/events/pan-gesture.cpp
+  ${public_api_src_dir}/events/pan-gesture-detector.cpp
+  ${public_api_src_dir}/events/pinch-gesture.cpp
+  ${public_api_src_dir}/events/pinch-gesture-detector.cpp
+  ${public_api_src_dir}/events/tap-gesture.cpp
+  ${public_api_src_dir}/events/tap-gesture-detector.cpp
+  ${public_api_src_dir}/events/touch-point.cpp
+  ${public_api_src_dir}/events/touch-event.cpp
+  ${public_api_src_dir}/events/touch-data.cpp
+  ${public_api_src_dir}/images/image.cpp
+  ${public_api_src_dir}/images/pixel.cpp
+  ${public_api_src_dir}/images/pixel-data.cpp
+  ${public_api_src_dir}/images/buffer-image.cpp
+  ${public_api_src_dir}/images/frame-buffer-image.cpp
+  ${public_api_src_dir}/images/encoded-buffer-image.cpp
+  ${public_api_src_dir}/images/resource-image.cpp
+  ${public_api_src_dir}/images/native-image.cpp
+  ${public_api_src_dir}/math/compile-time-math.cpp
+  ${public_api_src_dir}/math/degree.cpp
+  ${public_api_src_dir}/math/matrix.cpp
+  ${public_api_src_dir}/math/matrix3.cpp
+  ${public_api_src_dir}/math/quaternion.cpp
+  ${public_api_src_dir}/math/vector2.cpp
+  ${public_api_src_dir}/math/vector3.cpp
+  ${public_api_src_dir}/math/vector4.cpp
+  ${public_api_src_dir}/object/any.cpp
+  ${public_api_src_dir}/object/base-handle.cpp
+  ${public_api_src_dir}/object/handle.cpp
+  ${public_api_src_dir}/object/base-object.cpp
+  ${public_api_src_dir}/object/object-registry.cpp
+  ${public_api_src_dir}/object/property.cpp
+  ${public_api_src_dir}/object/property-array.cpp
+  ${public_api_src_dir}/object/property-conditions.cpp
+  ${public_api_src_dir}/object/property-input.cpp
+  ${public_api_src_dir}/object/property-key.cpp
+  ${public_api_src_dir}/object/property-map.cpp
+  ${public_api_src_dir}/object/property-notification.cpp
+  ${public_api_src_dir}/object/property-types.cpp
+  ${public_api_src_dir}/object/property-value.cpp
+  ${public_api_src_dir}/object/ref-object.cpp
+  ${public_api_src_dir}/render-tasks/render-task.cpp
+  ${public_api_src_dir}/render-tasks/render-task-list.cpp
+  ${public_api_src_dir}/rendering/frame-buffer.cpp
+  ${public_api_src_dir}/rendering/geometry.cpp
+  ${public_api_src_dir}/rendering/property-buffer.cpp
+  ${public_api_src_dir}/rendering/texture.cpp
+  ${public_api_src_dir}/rendering/texture-set.cpp
+  ${public_api_src_dir}/rendering/renderer.cpp
+  ${public_api_src_dir}/rendering/sampler.cpp
+  ${public_api_src_dir}/rendering/shader.cpp
+  ${public_api_src_dir}/signals/callback.cpp
+  ${public_api_src_dir}/signals/connection-tracker.cpp
+  ${public_api_src_dir}/signals/connection-tracker-interface.cpp
+  ${public_api_src_dir}/signals/signal-slot-connections.cpp
+  ${public_api_src_dir}/signals/signal-slot-observers.cpp
+  ${public_api_src_dir}/signals/base-signal.cpp
+  ${public_api_src_dir}/signals/functor-delegate.cpp
+  ${public_api_src_dir}/object/type-info.cpp
+  ${public_api_src_dir}/object/type-registry.cpp
+  ${public_api_src_dir}/object/weak-handle.cpp
+  ${public_api_src_dir}/dali-core-version.cpp
+)
+
 #
+SET( public_api_header_files
+  ${public_api_src_dir}/dali-core.h
+  ${public_api_src_dir}/dali-core-version.h
+)
 
-public_api_src_files = \
-  $(public_api_src_dir)/actors/actor.cpp \
-  $(public_api_src_dir)/actors/camera-actor.cpp \
-  $(public_api_src_dir)/actors/custom-actor.cpp \
-  $(public_api_src_dir)/actors/custom-actor-impl.cpp \
-  $(public_api_src_dir)/actors/layer.cpp \
-  $(public_api_src_dir)/animation/animation.cpp \
-  $(public_api_src_dir)/animation/alpha-function.cpp \
-  $(public_api_src_dir)/animation/constraint.cpp \
-  $(public_api_src_dir)/animation/constraint-source.cpp \
-  $(public_api_src_dir)/animation/key-frames.cpp \
-  $(public_api_src_dir)/animation/linear-constrainer.cpp \
-  $(public_api_src_dir)/animation/path.cpp \
-  $(public_api_src_dir)/animation/time-period.cpp \
-  $(public_api_src_dir)/common/constants.cpp \
-  $(public_api_src_dir)/common/dali-common.cpp \
-  $(public_api_src_dir)/common/dali-vector.cpp \
-  $(public_api_src_dir)/common/extents.cpp \
-  $(public_api_src_dir)/common/stage.cpp \
-  $(public_api_src_dir)/events/gesture.cpp \
-  $(public_api_src_dir)/events/gesture-detector.cpp \
-  $(public_api_src_dir)/events/hover-event.cpp \
-  $(public_api_src_dir)/events/key-event.cpp \
-  $(public_api_src_dir)/events/long-press-gesture.cpp \
-  $(public_api_src_dir)/events/long-press-gesture-detector.cpp \
-  $(public_api_src_dir)/events/wheel-event.cpp \
-  $(public_api_src_dir)/events/pan-gesture.cpp \
-  $(public_api_src_dir)/events/pan-gesture-detector.cpp \
-  $(public_api_src_dir)/events/pinch-gesture.cpp \
-  $(public_api_src_dir)/events/pinch-gesture-detector.cpp \
-  $(public_api_src_dir)/events/tap-gesture.cpp \
-  $(public_api_src_dir)/events/tap-gesture-detector.cpp \
-  $(public_api_src_dir)/events/touch-point.cpp \
-  $(public_api_src_dir)/events/touch-event.cpp \
-  $(public_api_src_dir)/events/touch-data.cpp \
-  $(public_api_src_dir)/images/image.cpp \
-  $(public_api_src_dir)/images/pixel.cpp \
-  $(public_api_src_dir)/images/pixel-data.cpp \
-  $(public_api_src_dir)/images/buffer-image.cpp \
-  $(public_api_src_dir)/images/frame-buffer-image.cpp \
-  $(public_api_src_dir)/images/encoded-buffer-image.cpp \
-  $(public_api_src_dir)/images/resource-image.cpp \
-  $(public_api_src_dir)/images/native-image.cpp \
-  $(public_api_src_dir)/math/compile-time-math.cpp \
-  $(public_api_src_dir)/math/degree.cpp \
-  $(public_api_src_dir)/math/matrix.cpp \
-  $(public_api_src_dir)/math/matrix3.cpp \
-  $(public_api_src_dir)/math/quaternion.cpp \
-  $(public_api_src_dir)/math/vector2.cpp \
-  $(public_api_src_dir)/math/vector3.cpp \
-  $(public_api_src_dir)/math/vector4.cpp \
-  $(public_api_src_dir)/object/any.cpp \
-  $(public_api_src_dir)/object/base-handle.cpp \
-  $(public_api_src_dir)/object/handle.cpp \
-  $(public_api_src_dir)/object/base-object.cpp \
-  $(public_api_src_dir)/object/object-registry.cpp \
-  $(public_api_src_dir)/object/property.cpp \
-  $(public_api_src_dir)/object/property-array.cpp \
-  $(public_api_src_dir)/object/property-conditions.cpp \
-  $(public_api_src_dir)/object/property-input.cpp \
-  $(public_api_src_dir)/object/property-key.cpp \
-  $(public_api_src_dir)/object/property-map.cpp \
-  $(public_api_src_dir)/object/property-notification.cpp \
-  $(public_api_src_dir)/object/property-types.cpp \
-  $(public_api_src_dir)/object/property-value.cpp \
-  $(public_api_src_dir)/object/ref-object.cpp \
-  $(public_api_src_dir)/render-tasks/render-task.cpp \
-  $(public_api_src_dir)/render-tasks/render-task-list.cpp \
-  $(public_api_src_dir)/rendering/frame-buffer.cpp \
-  $(public_api_src_dir)/rendering/geometry.cpp \
-  $(public_api_src_dir)/rendering/property-buffer.cpp \
-  $(public_api_src_dir)/rendering/texture.cpp \
-  $(public_api_src_dir)/rendering/texture-set.cpp \
-  $(public_api_src_dir)/rendering/renderer.cpp \
-  $(public_api_src_dir)/rendering/sampler.cpp \
-  $(public_api_src_dir)/rendering/shader.cpp \
-  $(public_api_src_dir)/signals/callback.cpp \
-  $(public_api_src_dir)/signals/connection-tracker.cpp \
-  $(public_api_src_dir)/signals/connection-tracker-interface.cpp \
-  $(public_api_src_dir)/signals/signal-slot-connections.cpp \
-  $(public_api_src_dir)/signals/signal-slot-observers.cpp \
-  $(public_api_src_dir)/signals/base-signal.cpp \
-  $(public_api_src_dir)/signals/functor-delegate.cpp \
-  $(public_api_src_dir)/object/type-info.cpp \
-  $(public_api_src_dir)/object/type-registry.cpp \
-  $(public_api_src_dir)/object/weak-handle.cpp \
-  $(public_api_src_dir)/dali-core-version.cpp
 
+SET( public_api_core_actors_header_files
+  ${public_api_src_dir}/actors/actor.h
+  ${public_api_src_dir}/actors/actor-enumerations.h
+  ${public_api_src_dir}/actors/camera-actor.h
+  ${public_api_src_dir}/actors/custom-actor.h
+  ${public_api_src_dir}/actors/custom-actor-impl.h
+  ${public_api_src_dir}/actors/draw-mode.h
+  ${public_api_src_dir}/actors/layer.h
+  ${public_api_src_dir}/actors/sampling.h
+)
 
-#
-# Add public header files here
-#
 
-public_api_header_files = \
-  $(public_api_src_dir)/dali-core.h \
-  $(public_api_src_dir)/dali-core-version.h
-
-public_api_core_actors_header_files =  \
-  $(public_api_src_dir)/actors/actor.h \
-  $(public_api_src_dir)/actors/actor-enumerations.h \
-  $(public_api_src_dir)/actors/camera-actor.h \
-  $(public_api_src_dir)/actors/custom-actor.h \
-  $(public_api_src_dir)/actors/custom-actor-impl.h \
-  $(public_api_src_dir)/actors/draw-mode.h \
-  $(public_api_src_dir)/actors/layer.h \
-  $(public_api_src_dir)/actors/sampling.h
-
-public_api_core_animation_header_files = \
-  $(public_api_src_dir)/animation/alpha-function.h \
-  $(public_api_src_dir)/animation/animation.h \
-  $(public_api_src_dir)/animation/constraint.h \
-  $(public_api_src_dir)/animation/constraints.h \
-  $(public_api_src_dir)/animation/constraint-source.h \
-  $(public_api_src_dir)/animation/key-frames.h \
-  $(public_api_src_dir)/animation/linear-constrainer.h \
-  $(public_api_src_dir)/animation/path.h \
-  $(public_api_src_dir)/animation/time-period.h
-
-public_api_core_common_header_files = \
-  $(public_api_src_dir)/common/compile-time-assert.h \
-  $(public_api_src_dir)/common/constants.h \
-  $(public_api_src_dir)/common/dali-common.h \
-  $(public_api_src_dir)/common/dali-vector.h \
-  $(public_api_src_dir)/common/extents.h \
-  $(public_api_src_dir)/common/intrusive-ptr.h \
-  $(public_api_src_dir)/common/loading-state.h \
-  $(public_api_src_dir)/common/stage.h \
-  $(public_api_src_dir)/common/type-traits.h \
-  $(public_api_src_dir)/common/vector-wrapper.h \
-  $(public_api_src_dir)/common/view-mode.h
-
-public_api_core_events_header_files = \
-  $(public_api_src_dir)/events/device.h \
-  $(public_api_src_dir)/events/gesture.h \
-  $(public_api_src_dir)/events/gesture-detector.h \
-  $(public_api_src_dir)/events/hover-event.h \
-  $(public_api_src_dir)/events/key-event.h \
-  $(public_api_src_dir)/events/long-press-gesture.h \
-  $(public_api_src_dir)/events/long-press-gesture-detector.h \
-  $(public_api_src_dir)/events/wheel-event.h \
-  $(public_api_src_dir)/events/pan-gesture.h \
-  $(public_api_src_dir)/events/pan-gesture-detector.h \
-  $(public_api_src_dir)/events/pinch-gesture.h \
-  $(public_api_src_dir)/events/pinch-gesture-detector.h \
-  $(public_api_src_dir)/events/point-state.h \
-  $(public_api_src_dir)/events/tap-gesture.h \
-  $(public_api_src_dir)/events/tap-gesture-detector.h \
-  $(public_api_src_dir)/events/touch-point.h \
-  $(public_api_src_dir)/events/touch-event.h \
-  $(public_api_src_dir)/events/touch-data.h \
-  $(public_api_src_dir)/events/mouse-button.h
-
-public_api_core_images_header_files = \
-  $(public_api_src_dir)/images/buffer-image.h \
-  $(public_api_src_dir)/images/encoded-buffer-image.h \
-  $(public_api_src_dir)/images/frame-buffer-image.h \
-  $(public_api_src_dir)/images/image.h \
-  $(public_api_src_dir)/images/image-operations.h \
-  $(public_api_src_dir)/images/pixel.h \
-  $(public_api_src_dir)/images/pixel-data.h \
-  $(public_api_src_dir)/images/resource-image.h \
-  $(public_api_src_dir)/images/native-image.h \
-  $(public_api_src_dir)/images/native-image-interface.h
-
-public_api_core_math_header_files = \
-  $(public_api_src_dir)/math/angle-axis.h \
-  $(public_api_src_dir)/math/compile-time-math.h \
-  $(public_api_src_dir)/math/degree.h \
-  $(public_api_src_dir)/math/math-utils.h \
-  $(public_api_src_dir)/math/matrix.h \
-  $(public_api_src_dir)/math/matrix3.h \
-  $(public_api_src_dir)/math/quaternion.h \
-  $(public_api_src_dir)/math/radian.h \
-  $(public_api_src_dir)/math/random.h \
-  $(public_api_src_dir)/math/rect.h \
-  $(public_api_src_dir)/math/uint-16-pair.h \
-  $(public_api_src_dir)/math/vector2.h \
-  $(public_api_src_dir)/math/vector3.h \
-  $(public_api_src_dir)/math/vector4.h \
-  $(public_api_src_dir)/math/viewport.h
-
-public_api_core_object_header_files = \
-  $(public_api_src_dir)/object/any.h \
-  $(public_api_src_dir)/object/base-handle.h \
-  $(public_api_src_dir)/object/base-object.h \
-  $(public_api_src_dir)/object/handle.h \
-  $(public_api_src_dir)/object/object-registry.h \
-  $(public_api_src_dir)/object/property-array.h \
-  $(public_api_src_dir)/object/property-conditions.h \
-  $(public_api_src_dir)/object/property-index-ranges.h \
-  $(public_api_src_dir)/object/property-input.h \
-  $(public_api_src_dir)/object/property-key.h \
-  $(public_api_src_dir)/object/property-map.h \
-  $(public_api_src_dir)/object/property-notification-declarations.h \
-  $(public_api_src_dir)/object/property-notification.h \
-  $(public_api_src_dir)/object/property-types.h \
-  $(public_api_src_dir)/object/property-value.h \
-  $(public_api_src_dir)/object/property.h \
-  $(public_api_src_dir)/object/ref-object.h \
-  $(public_api_src_dir)/object/type-info.h \
-  $(public_api_src_dir)/object/type-registry.h \
-  $(public_api_src_dir)/object/type-registry-helper.h \
-  $(public_api_src_dir)/object/weak-handle.h
-
-public_api_core_render_tasks_header_files = \
-  $(public_api_src_dir)/render-tasks/render-task.h \
-  $(public_api_src_dir)/render-tasks/render-task-list.h
-
-public_api_core_rendering_header_files = \
-  $(public_api_src_dir)/rendering/frame-buffer.h \
-  $(public_api_src_dir)/rendering/geometry.h \
-  $(public_api_src_dir)/rendering/property-buffer.h \
-  $(public_api_src_dir)/rendering/texture.h \
-  $(public_api_src_dir)/rendering/texture-set.h \
-  $(public_api_src_dir)/rendering/renderer.h \
-  $(public_api_src_dir)/rendering/sampler.h \
-  $(public_api_src_dir)/rendering/shader.h
-
-public_api_core_size_negotiation_header_files = \
-  $(public_api_src_dir)/size-negotiation/relayout-container.h
-
-public_api_core_signals_header_files = \
-  $(public_api_src_dir)/signals/base-signal.h \
-  $(public_api_src_dir)/signals/callback.h \
-  $(public_api_src_dir)/signals/connection-tracker-interface.h \
-  $(public_api_src_dir)/signals/connection-tracker.h \
-  $(public_api_src_dir)/signals/dali-signal.h \
-  $(public_api_src_dir)/signals/functor-delegate.h \
-  $(public_api_src_dir)/signals/signal-slot-connections.h \
-  $(public_api_src_dir)/signals/signal-slot-observers.h \
-  $(public_api_src_dir)/signals/slot-delegate.h
+SET( public_api_core_animation_header_files
+  ${public_api_src_dir}/animation/alpha-function.h
+  ${public_api_src_dir}/animation/animation.h
+  ${public_api_src_dir}/animation/constraint.h
+  ${public_api_src_dir}/animation/constraints.h
+  ${public_api_src_dir}/animation/constraint-source.h
+  ${public_api_src_dir}/animation/key-frames.h
+  ${public_api_src_dir}/animation/linear-constrainer.h
+  ${public_api_src_dir}/animation/path.h
+  ${public_api_src_dir}/animation/time-period.h
+)
+
+
+SET( public_api_core_common_header_files
+  ${public_api_src_dir}/common/compile-time-assert.h
+  ${public_api_src_dir}/common/constants.h
+  ${public_api_src_dir}/common/dali-common.h
+  ${public_api_src_dir}/common/dali-vector.h
+  ${public_api_src_dir}/common/extents.h
+  ${public_api_src_dir}/common/intrusive-ptr.h
+  ${public_api_src_dir}/common/loading-state.h
+  ${public_api_src_dir}/common/stage.h
+  ${public_api_src_dir}/common/type-traits.h
+  ${public_api_src_dir}/common/vector-wrapper.h
+  ${public_api_src_dir}/common/view-mode.h
+)
+
+
+SET( public_api_core_events_header_files
+  ${public_api_src_dir}/events/device.h
+  ${public_api_src_dir}/events/gesture.h
+  ${public_api_src_dir}/events/gesture-detector.h
+  ${public_api_src_dir}/events/hover-event.h
+  ${public_api_src_dir}/events/key-event.h
+  ${public_api_src_dir}/events/long-press-gesture.h
+  ${public_api_src_dir}/events/long-press-gesture-detector.h
+  ${public_api_src_dir}/events/wheel-event.h
+  ${public_api_src_dir}/events/pan-gesture.h
+  ${public_api_src_dir}/events/pan-gesture-detector.h
+  ${public_api_src_dir}/events/pinch-gesture.h
+  ${public_api_src_dir}/events/pinch-gesture-detector.h
+  ${public_api_src_dir}/events/point-state.h
+  ${public_api_src_dir}/events/tap-gesture.h
+  ${public_api_src_dir}/events/tap-gesture-detector.h
+  ${public_api_src_dir}/events/touch-point.h
+  ${public_api_src_dir}/events/touch-event.h
+  ${public_api_src_dir}/events/touch-data.h
+  ${public_api_src_dir}/events/mouse-button.h
+)
+
+
+SET( public_api_core_images_header_files
+  ${public_api_src_dir}/images/buffer-image.h
+  ${public_api_src_dir}/images/encoded-buffer-image.h
+  ${public_api_src_dir}/images/frame-buffer-image.h
+  ${public_api_src_dir}/images/image.h
+  ${public_api_src_dir}/images/image-operations.h
+  ${public_api_src_dir}/images/pixel.h
+  ${public_api_src_dir}/images/pixel-data.h
+  ${public_api_src_dir}/images/resource-image.h
+  ${public_api_src_dir}/images/native-image.h
+  ${public_api_src_dir}/images/native-image-interface.h
+)
+
+
+SET( public_api_core_math_header_files
+  ${public_api_src_dir}/math/angle-axis.h
+  ${public_api_src_dir}/math/compile-time-math.h
+  ${public_api_src_dir}/math/degree.h
+  ${public_api_src_dir}/math/math-utils.h
+  ${public_api_src_dir}/math/matrix.h
+  ${public_api_src_dir}/math/matrix3.h
+  ${public_api_src_dir}/math/quaternion.h
+  ${public_api_src_dir}/math/radian.h
+  ${public_api_src_dir}/math/random.h
+  ${public_api_src_dir}/math/rect.h
+  ${public_api_src_dir}/math/uint-16-pair.h
+  ${public_api_src_dir}/math/vector2.h
+  ${public_api_src_dir}/math/vector3.h
+  ${public_api_src_dir}/math/vector4.h
+  ${public_api_src_dir}/math/viewport.h
+)
+
+
+SET( public_api_core_object_header_files
+  ${public_api_src_dir}/object/any.h
+  ${public_api_src_dir}/object/base-handle.h
+  ${public_api_src_dir}/object/base-object.h
+  ${public_api_src_dir}/object/handle.h
+  ${public_api_src_dir}/object/object-registry.h
+  ${public_api_src_dir}/object/property-array.h
+  ${public_api_src_dir}/object/property-conditions.h
+  ${public_api_src_dir}/object/property-index-ranges.h
+  ${public_api_src_dir}/object/property-input.h
+  ${public_api_src_dir}/object/property-key.h
+  ${public_api_src_dir}/object/property-map.h
+  ${public_api_src_dir}/object/property-notification-declarations.h
+  ${public_api_src_dir}/object/property-notification.h
+  ${public_api_src_dir}/object/property-types.h
+  ${public_api_src_dir}/object/property-value.h
+  ${public_api_src_dir}/object/property.h
+  ${public_api_src_dir}/object/ref-object.h
+  ${public_api_src_dir}/object/type-info.h
+  ${public_api_src_dir}/object/type-registry.h
+  ${public_api_src_dir}/object/type-registry-helper.h
+  ${public_api_src_dir}/object/weak-handle.h
+)
+
+
+SET( public_api_core_render_tasks_header_files
+  ${public_api_src_dir}/render-tasks/render-task.h
+  ${public_api_src_dir}/render-tasks/render-task-list.h
+)
+
+
+SET( public_api_core_rendering_header_files
+  ${public_api_src_dir}/rendering/frame-buffer.h
+  ${public_api_src_dir}/rendering/geometry.h
+  ${public_api_src_dir}/rendering/property-buffer.h
+  ${public_api_src_dir}/rendering/texture.h
+  ${public_api_src_dir}/rendering/texture-set.h
+  ${public_api_src_dir}/rendering/renderer.h
+  ${public_api_src_dir}/rendering/sampler.h
+  ${public_api_src_dir}/rendering/shader.h
+)
+
+
+SET( public_api_core_size_negotiation_header_files
+  ${public_api_src_dir}/size-negotiation/relayout-container.h
+)
+
+
+SET( public_api_core_signals_header_files
+  ${public_api_src_dir}/signals/base-signal.h
+  ${public_api_src_dir}/signals/callback.h
+  ${public_api_src_dir}/signals/connection-tracker-interface.h
+  ${public_api_src_dir}/signals/connection-tracker.h
+  ${public_api_src_dir}/signals/dali-signal.h
+  ${public_api_src_dir}/signals/functor-delegate.h
+  ${public_api_src_dir}/signals/signal-slot-connections.h
+  ${public_api_src_dir}/signals/signal-slot-observers.h
+  ${public_api_src_dir}/signals/slot-delegate.h
+)
+
+
+SET( SOURCES ${SOURCES}
+  ${public_api_src_files}
+)
+
+SET( PUBLIC_API_HEADERS ${PUBLIC_API_HEADERS}
+  ${public_api_header_files}
+  ${public_api_core_actors_header_files}
+  ${public_api_core_animation_header_files}
+  ${public_api_core_common_header_files}
+  ${public_api_core_events_header_files}
+  ${public_api_core_images_header_files}
+  ${public_api_core_math_header_files}
+  ${public_api_core_object_header_files}
+  ${public_api_core_render_tasks_header_files}
+  ${public_api_core_rendering_header_files}
+  ${public_api_core_size_negotiation_header_files}
+  ${public_api_core_signals_header_files}
+)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
deleted file mode 100644 (file)
index a3c79d5..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Add package doxy headers here
-#
-SET(PACKAGE_DOXY_HEADERS
-  ${CMAKE_CURRENT_SOURCE_DIR}/dali-core-doc.h
-  PARENT_SCOPE )
index e633229703bc00f27ce06634f276975a104e45bb..cb5d79c126c8fd7baa045e51a127c7246d599494 100644 (file)
@@ -1,5 +1,8 @@
-#
+# Set the source directory
+SET( package_doxy_dir ${ROOT_SRC_DIR}/doc )
+
 # Add package doxy headers here
-#
-package_doxy_files = \
-  $(package_doxy_dir)/dali-core-doc.h
+SET( PACKAGE_DOXY_HEADERS
+  ${package_doxy_dir}/dali-core-doc.h
+)
+
index 054d2e7a1a6a50453be89790e94d1c9ae77c1c56..3d3a9a773396437acabf1a6a7c4e13248b6b4799 100644 (file)
@@ -9,6 +9,8 @@ Source0:    %{name}-%{version}.tar.gz
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+BuildRequires:  cmake
+BuildRequires:  lcov
 BuildRequires:  pkgconfig
 BuildRequires:  gawk
 
@@ -48,16 +50,6 @@ Integration development package for DALi 3D Engine - headers for integrating wit
 %prep
 %setup -q
 
-#Use TZ_PATH when tizen version is 3.x
-
-%if "%{tizen_version_major}" == "2"
-%define dali_data_rw_dir /opt/usr/share/dali/
-%define dali_data_ro_dir /usr/share/dali/
-%else
-%define dali_data_rw_dir %TZ_SYS_SHARE/dali/
-%define dali_data_ro_dir %TZ_SYS_RO_SHARE/dali/
-%endif
-
 %define dev_include_path %{_includedir}
 
 ##############################
@@ -79,50 +71,22 @@ LDFLAGS+=" --coverage "
 
 libtoolize --force
 cd %{_builddir}/%{name}-%{version}/build/tizen
-autoreconf --install
-DALI_DATA_RW_DIR="%{dali_data_rw_dir}"
-DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
-export DALI_DATA_RW_DIR
-export DALI_DATA_RO_DIR
 
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS;
 CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS;
 LDFLAGS="${LDFLAGS:-%optflags}" ; export LDFLAGS;
 
-./configure \
-      --program-prefix=%{?_program_prefix} \
-      --prefix=%{_prefix} \
-      --exec-prefix=%{_exec_prefix} \
-      --bindir=%{_bindir} \
-      --sbindir=%{_sbindir} \
-      --sysconfdir=%{_sysconfdir} \
-      --datadir=%{_datadir} \
-      --includedir=%{_includedir} \
-      --libdir=%{_libdir} \
-      --libexecdir=%{_libexecdir} \
-      --localstatedir=%{_localstatedir} \
-      --sharedstatedir=%{_sharedstatedir} \
-      --mandir=%{_mandir} \
+cmake \
 %if 0%{?enable_debug}
-      --enable-debug \
+      -DCMAKE_BUILD_TYPE=Debug \
 %endif
 %if 0%{?enable_trace}
-      --enable-trace \
+      -DENABLE_TRACE=ON \
 %endif
-      --infodir=%{_infodir} \
-      --enable-rename-so=no
+      -DCMAKE_INSTALL_PREFIX=%{_prefix}
 
 make %{?jobs:-j%jobs}
 
-pushd %{_builddir}/%{name}-%{version}/build/tizen
-%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
-popd
-
-pushd %{buildroot}%{_libdir}
-for FILE in libdali-core-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done
-mv pkgconfig/dali-core.pc %{_builddir}/%{name}-%{version}/build/tizen/dali-core.pc
-popd
-
 ##############################
 # Installation
 ##############################
@@ -131,22 +95,15 @@ rm -rf %{buildroot}
 cd build/tizen
 
 pushd %{_builddir}/%{name}-%{version}/build/tizen
-%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
+%make_install
 
-for FILE in libdali-*.so*; do mv "$FILE" "%{buildroot}%{_libdir}/$FILE"; done
-mv dali-core.pc %{buildroot}%{_libdir}/pkgconfig/dali-core.pc
-popd
-
-#############################
-#rename
-#############################
+# Create links to ensure linking with cxx11 library is preserved
 pushd  %{buildroot}%{_libdir}
-rm -rf libdali-core.so
-rm -rf libdali-core-cxx11.so
-ln -s libdali-core-cxx11.so.0.0.* libdali-core.so
+ln -sf libdali-core.so libdali-core-cxx11.so
+ln -sf libdali-core.so libdali-core-cxx11.so.0
+ln -sf libdali-core.so libdali-core-cxx11.so.0.0.0
 popd
 
-
 ##############################
 # Post Install
 ##############################
@@ -172,8 +129,8 @@ exit 0
 %manifest dali.manifest
 %endif
 %defattr(-,root,root,-)
-%{_libdir}/libdali-core-cxx11.so.*
-%{_libdir}/libdali-core.so
+%{_libdir}/libdali-core-cxx11.so*
+%{_libdir}/libdali-core.so*
 %license LICENSE
 
 %files devel