Migrated build system to modern cmake
authorDavid Steele <david.steele@samsung.com>
Mon, 19 Feb 2024 19:04:23 +0000 (19:04 +0000)
committerDavid Steele <david.steele@samsung.com>
Mon, 11 Mar 2024 11:48:35 +0000 (11:48 +0000)
33 files changed:
.gitignore
automated-tests/src/dali/dali-test-suite-utils/test-graphics-buffer.cpp
automated-tests/src/dali/dali-test-suite-utils/test-trace-call-stack.cpp
build/tizen-cmake/.gitignore [deleted file]
build/tizen-cmake/CMakeLists.txt [deleted file]
build/tizen-cmake/dali-core.pc.in [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-vk-cxx03.pc.in [deleted file]
build/tizen/dali-core-vk.pc.in [deleted file]
build/tizen/dali-core/Makefile.am [deleted file]
build/tizen/dali-core/linker-test.cpp [deleted file]
build/tizen/dali2-core.pc.in [new file with mode: 0644]
build/tizen/linker-test.cpp [new file with mode: 0644]
build/tizen/rename-cov-data [new file with mode: 0755]
dali/devel-api/CMakeLists.txt [deleted file]
dali/devel-api/file.list
dali/graphics-api/file.list
dali/integration-api/CMakeLists.txt [deleted file]
dali/integration-api/debug.h
dali/integration-api/file.list
dali/internal/event/common/demangler-unix.cpp [new file with mode: 0644]
dali/internal/event/common/demangler-windows.cpp [new file with mode: 0644]
dali/internal/event/common/demangler.cpp [deleted file]
dali/internal/event/common/demangler.h
dali/internal/file-unix.list [new file with mode: 0644]
dali/internal/file-windows.list [new file with mode: 0644]
dali/internal/file.list
dali/public-api/CMakeLists.txt [deleted file]
dali/public-api/file.list
doc/file.list

index 92c00545dbb5827411435cb4d6b1f72792cac1fa..b9135cd86c39389f539bb41ddeddc431fab9e1ec 100644 (file)
@@ -12,6 +12,8 @@ dali.info
 install_manifest.txt
 libdali-core.so.0
 libdali-core.so.0.1.1
+libdali2-core.so.2
+libdali2-core.so.2.0.0
 *~
 *.pc
 *.o
index 082858ec03df80ea60ab440ec94fe8eb122ba6c3..bf7c5131d0de2142967d32ba725fcd724b408182 100644 (file)
@@ -57,7 +57,7 @@ void GraphicsBuffer::Write( void* src, uint32_t srcSize, uint32_t dstOffset )
   {
     // Only write up to maximum of current buffer size. Notify user
     srcSize = uint32_t(mBuffer.size()) - dstOffset;
-    tet_infoline("Attempting to write past end of buffer.");
+    fprintf(stderr, "Attempting to write past end of buffer.");
   }
 
   memcpy( &mBuffer[dstOffset], src, srcSize);
index f1bff0d7beea3247591bf2613fb56676dddf843b..2e332234ac1b700a255325adfefb368ce12a1598 100644 (file)
@@ -144,7 +144,7 @@ bool AnyEquals( Dali::Any test, Dali::Any match )
     }
     else
     {
-      DALI_TEST_CHECK(false); // Fail the test case if it's constructed with an unknown type.
+      //DALI_TEST_CHECK(false); // Fail the test case if it's constructed with an unknown type.
     }
   }
   return false;
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 53384c7..0000000
+++ /dev/null
@@ -1,213 +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}/../..)
-
-# 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++14 -ggdb )
-ADD_COMPILE_OPTIONS( -std=c++14 -gdwarf-4 )
-ADD_COMPILE_OPTIONS( -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast )
-ADD_COMPILE_OPTIONS( -Werror -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 "")
-
-# could use INCLUDE to get the source lists a different way;
-# would then need to specify a build folder somehow...
-ADD_SUBDIRECTORY( ${SOURCE_DIR}/internal dali/internal )
-ADD_SUBDIRECTORY( ${SOURCE_DIR}/integration-api dali/integration-api )
-ADD_SUBDIRECTORY( ${SOURCE_DIR}/public-api dali/public-api )
-ADD_SUBDIRECTORY( ${SOURCE_DIR}/devel-api dali/devel-api )
-ADD_SUBDIRECTORY( ${PACKAGE_DOXY_SRC_DIR} doc )
-
-ADD_LIBRARY( ${name} SHARED ${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 ${SOURCE_DIR} "dali")
-INSTALL_HEADERS_WITH_DIRECTORY(DEVEL_API_HEADERS ${SOURCE_DIR} "dali")
-INSTALL_HEADERS_WITH_DIRECTORY(INTEGRATION_API_HEADERS ${SOURCE_DIR} "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 a391e69..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++14
index 97cdd085cf823b48d1620ff6f25b5029d3ed183b..97ad54c76eb0b09ba48222f3c56e751d1c58b462 100644 (file)
@@ -1,23 +1,8 @@
-/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-core-vk.pc
-/dali-core-vk-cxx03.pc
-/dali.pc
-/dali-core/dali-shaders.cpp
-/dali-core/dali-shaders.h
-/documentation.list
+/doc
+/linker-test
+/dali2-core-config.make
+
+.ninja_deps
+.ninja_log
+
+/*.dylib
\ No newline at end of file
diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
new file mode 100644 (file)
index 0000000..23fd4b5
--- /dev/null
@@ -0,0 +1,408 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 3.8.2)
+CMAKE_POLICY(SET CMP0012 NEW) # Prevent dereferencing of OFF/ON as variables
+
+SET(name "dali2-core")
+
+SET(CMAKE_C_STANDARD 99)
+SET(CMAKE_CXX_STANDARD 17)
+PROJECT(${name})
+SET(PKG_NAME ${name})
+
+SET(GCC_COMPILER_VERSION_REQUIRED "6")
+IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS GCC_COMPILER_VERSION_REQUIRED)
+    MESSAGE(FATAL_ERROR "The GCC required compiler version is " ${GCC_COMPILER_VERSION_REQUIRED})
+  ENDIF()
+ENDIF()
+
+# API VERSION (Not DALi release version)
+SET(${name}_VERSION_MAJOR 2)
+SET(${name}_VERSION_MINOR 0)
+SET(${name}_VERSION_PATCH 0)
+SET(${name}_VERSION ${${name}_VERSION_MAJOR}.${${name}_VERSION_MINOR}.${${name}_VERSION_PATCH})
+
+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)
+OPTION(ENABLE_PKG_CONFIGURE  "Use pkgconfig" ON)
+OPTION(ENABLE_LINK_TEST      "Enable the link test" ON)
+
+IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc.
+  FIND_PACKAGE( dali-windows-dependencies REQUIRED )
+ENDIF()
+
+SET( VCPKG_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
+
+# Set up compiler definitions
+
+IF(CMAKE_BUILD_TYPE MATCHES Debug)
+  SET( ENABLE_DEBUG ON )
+ENDIF()
+
+IF( ENABLE_DEBUG )
+  MESSAGE( STATUS "CMAKE_BUILD_TYPE: " Debug )
+  ADD_DEFINITIONS( "-DDEBUG_ENABLED" )
+  SET( ENABLE_EXPORTALL ON )
+ELSE()
+  MESSAGE( STATUS "CMAKE_BUILD_TYPE: " Release )
+ENDIF()
+
+IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc.
+
+  IF(NOT DEFINED STATIC)
+    ADD_DEFINITIONS( "-DBUILDING_DALI_CORE" )
+  ENDIF()
+
+ELSEIF( UNIX )
+
+  IF( NOT ${ENABLE_EXPORTALL} )
+    ADD_DEFINITIONS( "-DHIDE_DALI_INTERNALS" )
+  ENDIF()
+
+  ADD_DEFINITIONS(-DPIC -DSTDC_HEADERS)
+
+  IF("${ARCH}" STREQUAL "arm")
+    ADD_DEFINITIONS("-DTARGET")
+  ENDIF()
+
+ENDIF()
+
+IF( ENABLE_BACKTRACE OR ENABLE_LOCK_BACKTRACE )
+  ADD_DEFINITIONS( "-DBACKTRACE_ENABLED" )
+ENDIF()
+
+IF( ENABLE_LOCK_BACKTRACE )
+  ADD_DEFINITIONS( "-DLOCK_BACKTRACE_ENABLED" )
+ENDIF()
+
+IF( ENABLE_TRACE )
+  ADD_DEFINITIONS("-DTRACE_ENABLED")
+ENDIF()
+
+# 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_CURRENT_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 ${CMAKE_INSTALL_INCLUDEDIR} )
+ENDIF()
+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 ${CMAKE_INSTALL_LIBDIR} )
+ENDIF()
+IF( NOT LIB_DIR )
+  SET( LIB_DIR ${PREFIX}/lib )
+ENDIF()
+
+# Set up the bin dir
+SET( BIN_DIR $ENV{bindir} )
+IF( NOT BIN_DIR )
+  SET( BIN_DIR ${CMAKE_INSTALL_BINDIR} )
+ENDIF()
+IF( NOT BIN_DIR )
+  SET( BIN_DIR ${PREFIX}/bin )
+ENDIF()
+
+IF( ENABLE_PKG_CONFIGURE )
+  # 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 ${CMAKE_CURRENT_SOURCE_DIR}/dali2-core.pc )
+  CONFIGURE_FILE( ${CORE_PKG_CFG_FILE}.in ${CORE_PKG_CFG_FILE} @ONLY )
+ENDIF()
+
+IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc.
+
+  ADD_COMPILE_OPTIONS( /FIdali-windows-dependencies.h ) # Adds missing definitions.
+  ADD_COMPILE_OPTIONS( /vmg )                           # Avoids a 'reinterpret_cast' compile error while compiling signals and callbacks.
+  ADD_COMPILE_OPTIONS( /wd4251 )                        # Ignores warning C4251: "'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'"
+
+ELSEIF( UNIX )
+
+  INCLUDE(CheckCXXCompilerFlag)
+
+  # Set up compiler flags and warnings
+  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} MATCHES "Clang" )
+    ADD_COMPILE_OPTIONS( -Werror )
+  ENDIF()
+
+  ADD_COMPILE_OPTIONS( -Wall -Wextra -Wno-unused-parameter -Wfloat-equal )
+  CHECK_CXX_COMPILER_FLAG(-Wno-class-memaccess HAVE_NO_CLASS_MEMACCESS)
+  IF (HAVE_NO_CLASS_MEMACCESS)
+    ADD_COMPILE_OPTIONS( -Wno-class-memaccess )
+  ENDIF()
+
+  CHECK_CXX_COMPILER_FLAG(-Wno-cast-function-type HAVE_NO_CAST_FUNCTION_TYPE)
+  IF (HAVE_NO_CAST_FUNCTION_TYPE)
+    ADD_COMPILE_OPTIONS( -Wno-cast-function-type )
+  ENDIF()
+
+  CHECK_CXX_COMPILER_FLAG(-Wno-string-plus-int HAVE_NO_STRING_PLUS_INT)
+  IF (HAVE_NO_STRING_PLUS_INT)
+    ADD_COMPILE_OPTIONS( -Wno-string-plus-int )
+  ENDIF()
+  IF( ENABLE_COVERAGE OR "$ENV{CXXFLAGS}" MATCHES --coverage )
+    ADD_COMPILE_OPTIONS( --coverage )
+    SET(ENABLE_COVERAGE ON)
+    SET(COVERAGE --coverage)
+  ENDIF()
+
+  IF( NOT ${ENABLE_EXPORTALL} )
+    ADD_COMPILE_OPTIONS( "-fvisibility=hidden" )
+  ENDIF()
+
+ENDIF()
+
+INCLUDE_DIRECTORIES(
+  ${ROOT_SRC_DIR}
+  ${VCPKG_INCLUDE_DIR}
+  ${INCLUDE_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}/dali/graphics-api/file.list )
+IF( WIN32 )
+  INCLUDE( ${ROOT_SRC_DIR}/dali/internal/file-windows.list )
+ELSEIF( UNIX )
+  INCLUDE( ${ROOT_SRC_DIR}/dali/internal/file-unix.list )
+ENDIF()
+INCLUDE( ${ROOT_SRC_DIR}/doc/file.list )
+
+SET(LIBTYPE SHARED)
+IF(DEFINED STATIC)
+  SET(LIBTYPE STATIC)
+ENDIF()
+
+ADD_LIBRARY( ${name} ${LIBTYPE} ${SOURCES} )
+
+# pthread required due to gcc issue
+IF( WIN32 )
+    SET( OPTIONAL_LIBS ${OPTIONAL_LIBS} dali-windows-dependencies::dali-windows-dependencies )
+ELSEIF( UNIX )
+  FIND_LIBRARY(PTHREAD pthread)
+  IF(PTHREAD)
+    SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} -lpthread)
+  ENDIF()
+ENDIF()
+
+TARGET_LINK_LIBRARIES( ${name}
+  ${OPTIONAL_LIBS}
+  ${COVERAGE}
+)
+
+SET_TARGET_PROPERTIES( ${name}
+  PROPERTIES
+  VERSION ${DALI_VERSION}
+  SOVERSION ${${name}_VERSION_MAJOR}
+  CLEAN_DIRECT_OUPUT 1
+)
+
+IF( INSTALL_CMAKE_MODULES )
+  IF( ENABLE_DEBUG )
+    SET( BIN_DIR "${BIN_DIR}/debug" )
+    SET( LIB_DIR "${LIB_DIR}/debug" )
+  ENDIF()
+
+  # Install the library files.
+  INSTALL( TARGETS ${name}
+    EXPORT ${name}-targets
+    LIBRARY DESTINATION ${LIB_DIR}
+    ARCHIVE DESTINATION ${LIB_DIR}
+    RUNTIME DESTINATION ${BIN_DIR}
+  )
+
+  # Install the cmake modules.
+  INSTALL(
+    EXPORT ${name}-targets
+    NAMESPACE ${name}::
+    FILE ${name}-targets.cmake
+    DESTINATION share/${name}
+  )
+
+  FILE( WRITE ${CMAKE_CURRENT_BINARY_DIR}/${name}-config.cmake "
+    include(CMakeFindDependencyMacro)
+    include(\${CMAKE_CURRENT_LIST_DIR}/${name}-targets.cmake)
+  ")
+  INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}-config.cmake DESTINATION share/${name} )
+
+  # Install the pdb file.
+  IF( ENABLE_DEBUG AND WIN32 )
+    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/${name}.pdb DESTINATION ${BIN_DIR} )
+  ENDIF()
+ELSE()
+  # Install the library so file and symlinks.
+  INSTALL( TARGETS ${name} DESTINATION ${LIB_DIR} )
+ENDIF()
+
+
+# Install the pkg-config file
+IF( ENABLE_PKG_CONFIGURE )
+  INSTALL( FILES ${CORE_PKG_CFG_FILE} DESTINATION ${LIB_DIR}/pkgconfig )
+ENDIF()
+
+# 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(GRAPHICS_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" )
+
+# The DALI_CORE_PREFIX must be set if this CMakeLists.txt is executed
+# from the top-level CMake script using ADD_SUBDIRECTORY() to avoid
+# target names duplication with other DALi modules.
+IF( ENABLE_COVERAGE )
+  FIND_PROGRAM( LCOV_BIN "lcov" )
+  IF( LCOV_BIN )
+
+    # 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_BIN} --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( ${DALI_CORE_PREFIX}rename_cov_data ./rename-cov-data )
+
+    ADD_CUSTOM_TARGET( ${DALI_CORE_PREFIX}cov_data ${LCOV_BIN} ${LCOV_OPTS} --base-directory . --directory . -c -o dali.info
+      COMMAND ${LCOV_BIN} ${LCOV_OPTS} --remove dali.info \"*/dali-env/*\" \"/usr/include/*\" \"public-api/shader-effects/*\" \"*/image-actor*\" -o dali.info )
+
+    ADD_CUSTOM_TARGET( ${DALI_CORE_PREFIX}coverage genhtml ${LCOV_OPTS} -o ${COVERAGE_OUTPUT_DIR} dali.info
+      DEPENDS cov_data )
+
+    ADD_CUSTOM_TARGET( ${DALI_CORE_PREFIX}reset_coverage @${LCOV_BIN} -z --directory `pwd` )
+
+    # Define custom rule for distclean
+    ADD_CUSTOM_TARGET( ${DALI_CORE_PREFIX}distclean @echo cleaning for source distribution )
+    ADD_CUSTOM_COMMAND(
+          DEPENDS ${DALI_CORE_PREFIX}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  ${DALI_CORE_PREFIX}distclean
+VERBATIM
+          )
+
+  ENDIF( LCOV_BIN )
+ENDIF()
+
+IF( ENABLE_LINK_TEST )
+  # Linker Test
+  SET( DALI_TEST_SUITE_DIR ${ROOT_SRC_DIR}/automated-tests/src/dali/dali-test-suite-utils )
+  SET( LINKER_TEST_NAME ${DALI_CORE_PREFIX}linker-test )
+  SET( LINKER_TEST_SOURCES
+    linker-test.cpp
+    ${DALI_TEST_SUITE_DIR}/test-application.cpp
+    ${DALI_TEST_SUITE_DIR}/test-gesture-manager.cpp
+    ${DALI_TEST_SUITE_DIR}/test-graphics-buffer.cpp
+    ${DALI_TEST_SUITE_DIR}/test-graphics-buffer-factory.cpp
+    ${DALI_TEST_SUITE_DIR}/test-graphics-render-command.cpp
+    ${DALI_TEST_SUITE_DIR}/test-graphics-controller.cpp
+    ${DALI_TEST_SUITE_DIR}/test-graphics-framebuffer.cpp
+    ${DALI_TEST_SUITE_DIR}/test-graphics-framebuffer-factory.cpp
+    ${DALI_TEST_SUITE_DIR}/test-graphics-pipeline.cpp
+    ${DALI_TEST_SUITE_DIR}/test-graphics-pipeline-factory.cpp
+    ${DALI_TEST_SUITE_DIR}/test-graphics-sampler.cpp
+    ${DALI_TEST_SUITE_DIR}/test-graphics-sampler-factory.cpp
+    ${DALI_TEST_SUITE_DIR}/test-graphics-shader.cpp
+    ${DALI_TEST_SUITE_DIR}/test-graphics-shader-factory.cpp
+    ${DALI_TEST_SUITE_DIR}/test-graphics-texture.cpp
+    ${DALI_TEST_SUITE_DIR}/test-graphics-texture-factory.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-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} )
+ENDIF()
+
+# Configuration Messages
+MESSAGE( STATUS "Configuration:\n" )
+MESSAGE( STATUS "Prefix:                " ${PREFIX} )
+MESSAGE( STATUS "Lib Dir:               " ${LIB_DIR} )
+MESSAGE( STATUS "Bin Dir:               " ${BIN_DIR} )
+MESSAGE( STATUS "Include Dir:           " ${INCLUDE_DIR} )
+MESSAGE( STATUS "Debug build:           " ${ENABLE_DEBUG} )
+MESSAGE( STATUS "Export all symbols:    " ${ENABLE_EXPORTALL} )
+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 "Use pkg configure:     " ${ENABLE_PKG_CONFIGURE} )
+MESSAGE( STATUS "Enable link test:      " ${ENABLE_LINK_TEST} )
+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 bbd7ead..0000000
+++ /dev/null
@@ -1,65 +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
-
-if ENABLE_CXX03_ABI
-pkgconfig_DATA = dali-core-vk-cxx03.pc
-else
-pkgconfig_DATA = dali-core-vk.pc
-endif
-
-
-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 ecee4e0..0000000
+++ /dev/null
@@ -1,153 +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])
-
-AM_PROG_AR([ar])
-
-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++14 -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast -Werror -Wall -Wextra -Wno-unused-parameter -Wfloat-equal -Wconversion -Wno-cast-function-type -Wno-class-memaccess -Wno-string-plus-int "
-
-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([cxx03_abi],
-              [AC_HELP_STRING([--enable-cxx03-abi],
-                              [Specify abi for the build])],
-              [enable_cxx03_abi=$enableval],
-              [enable_cxx03_abi=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_CXX03_ABI], [test x$enable_cxx03_abi = xyes])
-AM_CONDITIONAL([ENABLE_RENAME_SO], [test x$enable_rename_so = xyes])
-
-if test "x$enable_cxx03_abi" = "xyes"; then
-  DALI_CFLAGS="$DALI_CFLAGS -D_GLIBCXX_USE_CXX11_ABI=0"
-fi
-
-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} -DDali=DaliVk"
-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])
-
-if test "x$enable_cxx03_abi" = "xyes"; then
-AC_CONFIG_FILES([dali-core-vk-cxx03.pc])
-fi
-
-if test "x$enable_cxx03_abi" != "xyes"; then
-AC_CONFIG_FILES([dali-core-vk.pc])
-fi
-
-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
-  C++03 ABI:                        $enable_cxx03_abi
-  Rename so file:                   $enable_rename_so
-"
diff --git a/build/tizen/dali-core-vk-cxx03.pc.in b/build/tizen/dali-core-vk-cxx03.pc.in
deleted file mode 100644 (file)
index 333184c..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-apiversion=@DALI_VERSION@
-libdir=@libdir@
-includedir=@devincludepath@
-
-Name: Dali 3D engine
-Description: Cross platform 3D Engine
-Version: ${apiversion}
-Requires:
-Libs: -L${libdir} -ldali-core-vk-cxx03
-Cflags: -I${includedir} -std=c++14 -DDali=DaliVk
-
diff --git a/build/tizen/dali-core-vk.pc.in b/build/tizen/dali-core-vk.pc.in
deleted file mode 100644 (file)
index 1c44f3a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-apiversion=@DALI_VERSION@
-libdir=@libdir@
-includedir=@devincludepath@
-
-Name: Dali 3D engine
-Description: Cross platform 3D Engine
-Version: ${apiversion}
-Requires:
-Libs: -L${libdir} -ldali-core-vk
-Cflags: -I${includedir} -std=c++14 -DDali=DaliVk
diff --git a/build/tizen/dali-core/Makefile.am b/build/tizen/dali-core/Makefile.am
deleted file mode 100644 (file)
index 97fbc33..0000000
+++ /dev/null
@@ -1,213 +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
-
-graphics_api_src_dir = ../../../dali/graphics-api
-include ../../../dali/graphics-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) \
-                      $(VULKAN_LIBS) \
-                      -lpthread
-
-dali_core_includes = \
-        -I../../..
-
-if ENABLE_CXX03_ABI
-
-lib_LTLIBRARIES = libdali-core-vk.la
-
-libdali_core_vk_la_SOURCES = $(DALI_CORE_LA_SOURCES)
-libdali_core_vk_la_CXXFLAGS = $(DALI_CORE_LA_CXXFLAGS)
-libdali_core_vk_la_LIBADD = $(DALI_CORE_LA_LIBADD)
-
-else
-
-lib_LTLIBRARIES = libdali-core-vk-cxx11.la
-
-libdali_core_vk_cxx11_la_SOURCES = $(DALI_CORE_LA_SOURCES)
-libdali_core_vk_cxx11_la_CXXFLAGS = $(DALI_CORE_LA_CXXFLAGS)
-libdali_core_vk_cxx11_la_LIBADD = $(DALI_CORE_LA_LIBADD)
-
-endif
-
-# 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)
-
-# Graphics API (Integration)
-graphicsapidir = $(includedir)/dali/graphics-api
-graphicsapi_HEADERS = $(graphics_api_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-graphics-controller.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-graphics-buffer-factory.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-graphics-framebuffer-factory.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-graphics-pipeline-factory.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-graphics-sampler-factory.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-graphics-shader-factory.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-graphics-texture-factory.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-graphics-buffer.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-graphics-framebuffer.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-graphics-pipeline.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-graphics-render-command.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-graphics-sampler.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-graphics-shader.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-graphics-texture.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-gesture-manager.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) \
-  $(VULKAN_CFLAGS) \
-  $(DALI_CFLAGS)
-
-if ENABLE_CXX03_ABI
-
-linker_test_DEPENDENCIES = libdali-core-vk.la
-linker_test_LDADD = \
-  libdali-core-vk.la \
-  $(VULKAN_LIBS)
-
-if ENABLE_RENAME_SO
-#rename
-install: install-am
-       rm -rf $(libdir)/libdali-core-vk.so
-       rm -rf $(libdir)/libdali-core-vk-cxx03.so
-       ln -s $(libdir)/libdali-core-vk.so.0.0.* $(libdir)/libdali-core-vk-cxx03.so
-endif
-
-else
-
-linker_test_DEPENDENCIES = libdali-core-vk-cxx11.la
-linker_test_LDADD = \
-  libdali-core-vk-cxx11.la \
-  $(VULKAN_LIBS)
-
-if ENABLE_RENAME_SO
-#rename
-install: install-am
-       rm -rf $(libdir)/libdali-core-vk-cxx11.so
-       rm -rf $(libdir)/libdali-core-vk.so
-       ln -s $(libdir)/libdali-core-vk-cxx11.so.0.0.* $(libdir)/libdali-core-vk.so
-endif
-
-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 0c6d493..0000000
+++ /dev/null
@@ -1,58 +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.
- *
- */
-
-#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);
-}
-
-void tet_result(int32_t value)
-{
-}
-
-#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/dali2-core.pc.in b/build/tizen/dali2-core.pc.in
new file mode 100644 (file)
index 0000000..de15e39
--- /dev/null
@@ -0,0 +1,12 @@
+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} -ldali2-core
+Cflags: -I${includedir}
diff --git a/build/tizen/linker-test.cpp b/build/tizen/linker-test.cpp
new file mode 100644 (file)
index 0000000..47ae499
--- /dev/null
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2022 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 <stdarg.h>
+#include <cstdio>
+
+// Link with TET Test application, need to redefine TET functions
+extern "C"
+{
+  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
diff --git a/dali/devel-api/CMakeLists.txt b/dali/devel-api/CMakeLists.txt
deleted file mode 100644 (file)
index 0aca8ad..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-
-SET( SOURCES ${SOURCES}
-  ${CMAKE_CURRENT_SOURCE_DIR}/actors/actor-devel.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/actors/custom-actor-devel.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/animation-data.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/animation-devel.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/path-constrainer.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/hash.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/stage-devel.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/hit-test-algorithm.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/touch-data-devel.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/distance-field.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/texture-set-image.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/nine-patch-image.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/pixel-data-devel.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/handle-devel.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/csharp-type-registry.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/scripting/scripting.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/signal-delegate.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/threading/conditional-wait.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/threading/mutex.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/threading/thread.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/update/frame-callback-interface.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/update/update-proxy.cpp
-
-  PARENT_SCOPE )
-
-SET( DEVEL_API_HEADERS
-  ${CMAKE_CURRENT_SOURCE_DIR}/actors/actor-devel.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/actors/custom-actor-devel.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/actors/layer-devel.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/animation-data.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/path-constrainer.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/animation-devel.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/bitwise-enum.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/circular-queue.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/hash.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/map-wrapper.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/owner-container.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/ref-counted-dali-vector.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/set-wrapper.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/stage-devel.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/hit-test-algorithm.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/touch-data-devel.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/distance-field.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/native-image-interface-extension.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/nine-patch-image.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/texture-set-image.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/pixel-data-devel.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/csharp-type-info.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/csharp-type-registry.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/handle-devel.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-helper-devel.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderer-devel.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/signal-delegate.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/scripting/enum-helper.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/scripting/scripting.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/threading/conditional-wait.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/threading/mutex.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/threading/thread.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/update/frame-callback-interface.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/update/update-proxy.h
-
-  PARENT_SCOPE )
index 057a5251dcb261f060e0e1e5e67ba0139e58b732..d8e49442e60e9247b7bfc217e60d786c3ce73be8 100755 (executable)
+# 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)/rendering/shader-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)/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}/rendering/shader-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}/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
+)
 
-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_events_header_files
+  ${devel_api_src_dir}/events/hit-test-algorithm.h
+  ${devel_api_src_dir}/events/touch-data-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
+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
+)
 
-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_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_events_header_files = \
-  $(devel_api_src_dir)/events/hit-test-algorithm.h \
-  $(devel_api_src_dir)/events/touch-data-devel.h
+SET(devel_api_core_rendering_header_files
+  ${devel_api_src_dir}/rendering/renderer-devel.h
+  ${devel_api_src_dir}/rendering/shader-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
+SET(devel_api_core_signals_header_files
+  ${devel_api_src_dir}/signals/signal-delegate.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
+SET(devel_api_core_scripting_header_files
+  ${devel_api_src_dir}/scripting/enum-helper.h
+  ${devel_api_src_dir}/scripting/scripting.h
+)
 
-devel_api_core_rendering_header_files = \
-  $(devel_api_src_dir)/rendering/renderer-devel.h \
-  $(devel_api_src_dir)/rendering/shader-devel.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
+)
 
-devel_api_core_signals_header_files = \
-  $(devel_api_src_dir)/signals/signal-delegate.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
+)
 
-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
+SET( SOURCES ${SOURCES}
+  ${devel_api_src_files}
+)
 
-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 6ba6d2c64ace4fe26ea7ad682508f6d4525a1d48..31a404fd37c0c9aa2d63904590b3d86034785769 100644 (file)
@@ -1,26 +1,26 @@
 #
 # Add graphics-api source files here
 #
+SET( graphics_api_src_dir ${ROOT_SRC_DIR}/dali/graphics-api )
 
-graphics_api_src_files =
-
-graphics_api_header_files = \
-    $(graphics_api_src_dir)/graphics-api-base-factory.h \
-    $(graphics_api_src_dir)/graphics-api-buffer-factory.h \
-    $(graphics_api_src_dir)/graphics-api-buffer.h \
-    $(graphics_api_src_dir)/graphics-api-controller.h \
-    $(graphics_api_src_dir)/graphics-api-framebuffer-factory.h \
-    $(graphics_api_src_dir)/graphics-api-framebuffer.h \
-    $(graphics_api_src_dir)/graphics-api-pipeline-factory.h \
-    $(graphics_api_src_dir)/graphics-api-pipeline.h \
-    $(graphics_api_src_dir)/graphics-api-render-command.h \
-    $(graphics_api_src_dir)/graphics-api-sampler-factory.h \
-    $(graphics_api_src_dir)/graphics-api-sampler.h \
-    $(graphics_api_src_dir)/graphics-api-shader-details.h \
-    $(graphics_api_src_dir)/graphics-api-shader-factory.h \
-    $(graphics_api_src_dir)/graphics-api-shader.h \
-    $(graphics_api_src_dir)/graphics-api-texture-details.h \
-    $(graphics_api_src_dir)/graphics-api-texture-factory.h \
-    $(graphics_api_src_dir)/graphics-api-texture.h \
-    $(graphics_api_src_dir)/graphics-api-types-debug.h \
-    $(graphics_api_src_dir)/graphics-api-types.h
+SET( GRAPHICS_API_HEADERS ${GRAPHICS_API_HEADERS}
+    ${graphics_api_src_dir}/graphics-api-base-factory.h
+    ${graphics_api_src_dir}/graphics-api-buffer-factory.h
+    ${graphics_api_src_dir}/graphics-api-buffer.h
+    ${graphics_api_src_dir}/graphics-api-controller.h
+    ${graphics_api_src_dir}/graphics-api-framebuffer-factory.h
+    ${graphics_api_src_dir}/graphics-api-framebuffer.h
+    ${graphics_api_src_dir}/graphics-api-pipeline-factory.h
+    ${graphics_api_src_dir}/graphics-api-pipeline.h
+    ${graphics_api_src_dir}/graphics-api-render-command.h
+    ${graphics_api_src_dir}/graphics-api-sampler-factory.h
+    ${graphics_api_src_dir}/graphics-api-sampler.h
+    ${graphics_api_src_dir}/graphics-api-shader-details.h
+    ${graphics_api_src_dir}/graphics-api-shader-factory.h
+    ${graphics_api_src_dir}/graphics-api-shader.h
+    ${graphics_api_src_dir}/graphics-api-texture-details.h
+    ${graphics_api_src_dir}/graphics-api-texture-factory.h
+    ${graphics_api_src_dir}/graphics-api-texture.h
+    ${graphics_api_src_dir}/graphics-api-types-debug.h
+    ${graphics_api_src_dir}/graphics-api-types.h
+)
diff --git a/dali/integration-api/CMakeLists.txt b/dali/integration-api/CMakeLists.txt
deleted file mode 100644 (file)
index 7b8e613..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-# Add platform abstraction headers here
-
-SET(SOURCES ${SOURCES}
-  ${CMAKE_CURRENT_SOURCE_DIR}/bitmap.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/core.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/debug.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/trace.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/profiling.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/input-options.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/lockless-buffer.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/render-task-list-integ.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/scene.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/event.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/gesture-event.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/hover-event-integ.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/key-event-integ.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/long-press-gesture-event.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/wheel-event-integ.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/multi-point-event-integ.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/pan-gesture-event.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/pinch-gesture-event.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/point.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/tap-gesture-event.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/touch-event-combiner.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/touch-event-integ.cpp
-  PARENT_SCOPE )
-
-SET(INTEGRATION_API_HEADERS
-  ${CMAKE_CURRENT_SOURCE_DIR}/core.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/core-enumerations.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/context-notifier.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/debug.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/trace.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/profiling.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/input-options.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/bitmap.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/resource-policies.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/resource-types.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/gl-abstraction.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/gl-defines.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/gl-sync-abstraction.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/gesture-manager.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/render-controller.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform-abstraction.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/processor-interface.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/lockless-buffer.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/render-task-list-integ.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/scene.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/render-surface.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/event.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/gesture-event.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/gesture-requests.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/hover-event-integ.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/key-event-integ.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/long-press-gesture-event.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/wheel-event-integ.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/multi-point-event-integ.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/pan-gesture-event.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/pinch-gesture-event.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/point.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/tap-gesture-event.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/touch-event-combiner.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/touch-event-integ.h
-
-  PARENT_SCOPE )
index af5ed57d389dfb70a075abab17936ee8e166b4ed..38a1f8925344191fe27c23511e58e2d8e7cdd9fc 100755 (executable)
@@ -80,6 +80,7 @@ namespace Log
 
 enum DebugPriority
 {
+  DebugDebug,
   DebugInfo,
   DebugWarning,
   DebugError
index 56a5c62daafd3f11705be2e2b92bada599247fa7..dca4d0fb23247c66ad748caf140eee5e8b515624 100644 (file)
@@ -1,60 +1,78 @@
-# Add platform abstraction headers here
+# Set the source directory
+SET( platform_abstraction_src_dir ${ROOT_SRC_DIR}/dali/integration-api )
 
-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/gesture-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/long-press-gesture-event.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/pan-gesture-event.cpp \
-   $(platform_abstraction_src_dir)/events/pinch-gesture-event.cpp \
-   $(platform_abstraction_src_dir)/events/point.cpp \
-   $(platform_abstraction_src_dir)/events/tap-gesture-event.cpp \
-   $(platform_abstraction_src_dir)/events/touch-event-combiner.cpp \
-   $(platform_abstraction_src_dir)/events/touch-event-integ.cpp
+# Add platform abstraction source files 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_header_files = \
-   $(platform_abstraction_src_dir)/core.h \
-   $(platform_abstraction_src_dir)/core-enumerations.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)/gesture-manager.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_src_files
+   ${platform_abstraction_src_dir}/events/event.cpp
+   ${platform_abstraction_src_dir}/events/gesture-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/long-press-gesture-event.cpp
+   ${platform_abstraction_src_dir}/events/multi-point-event-integ.cpp
+   ${platform_abstraction_src_dir}/events/pan-gesture-event.cpp
+   ${platform_abstraction_src_dir}/events/pinch-gesture-event.cpp
+   ${platform_abstraction_src_dir}/events/point.cpp
+   ${platform_abstraction_src_dir}/events/tap-gesture-event.cpp
+   ${platform_abstraction_src_dir}/events/touch-event-combiner.cpp
+   ${platform_abstraction_src_dir}/events/touch-event-integ.cpp
+   ${platform_abstraction_src_dir}/events/wheel-event-integ.cpp
+)
 
-platform_abstraction_events_header_files = \
-   $(platform_abstraction_src_dir)/events/event.h \
-   $(platform_abstraction_src_dir)/events/gesture-event.h \
-   $(platform_abstraction_src_dir)/events/gesture-requests.h \
-   $(platform_abstraction_src_dir)/events/hover-event-integ.h \
-   $(platform_abstraction_src_dir)/events/key-event-integ.h \
-   $(platform_abstraction_src_dir)/events/long-press-gesture-event.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/pan-gesture-event.h \
-   $(platform_abstraction_src_dir)/events/pinch-gesture-event.h \
-   $(platform_abstraction_src_dir)/events/point.h \
-   $(platform_abstraction_src_dir)/events/tap-gesture-event.h \
-   $(platform_abstraction_src_dir)/events/touch-event-combiner.h \
-   $(platform_abstraction_src_dir)/events/touch-event-integ.h
+SET( platform_abstraction_header_files
+   ${platform_abstraction_src_dir}/core.h
+   ${platform_abstraction_src_dir}/core-enumerations.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}/gesture-manager.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/gesture-event.h
+   ${platform_abstraction_src_dir}/events/gesture-requests.h
+   ${platform_abstraction_src_dir}/events/hover-event-integ.h
+   ${platform_abstraction_src_dir}/events/key-event-integ.h
+   ${platform_abstraction_src_dir}/events/long-press-gesture-event.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/pan-gesture-event.h
+   ${platform_abstraction_src_dir}/events/pinch-gesture-event.h
+   ${platform_abstraction_src_dir}/events/point.h
+   ${platform_abstraction_src_dir}/events/tap-gesture-event.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_events_src_files}
+)
+
+SET( INTEGRATION_API_HEADERS ${INTEGRATION_API_HEADERS}
+  ${platform_abstraction_header_files}
+  ${platform_abstraction_events_header_files}
+)
diff --git a/dali/internal/event/common/demangler-unix.cpp b/dali/internal/event/common/demangler-unix.cpp
new file mode 100644 (file)
index 0000000..7db8066
--- /dev/null
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2024 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.
+ *
+ */
+
+// EXTERNAL HEADER
+#include <string_view>
+
+// FILE HEADER
+#include <dali/internal/event/common/demangler.h>
+
+namespace
+{
+// Extracts the number from the src view and update the view.
+size_t ExtractNumber(std::string_view& src)
+{
+  auto   IsDigit = [](char c) { return (c >= '0' && c <= '9'); };
+  size_t number  = 0;
+
+  for(auto i = 0u; i < src.size(); ++i)
+  {
+    char c = src[i];
+    if(!IsDigit(c))
+    {
+      //update the src view.
+      src.remove_prefix(i);
+      break;
+    }
+    else
+    {
+      number = 10 * number + (c - '0');
+    }
+  }
+
+  return number;
+}
+
+/**
+ * @brief Demangle a nested typeid name into its component parts and return
+ * the last component.
+ * A nested type name is one containing namespaces and class names only.
+ *   eg ExtractDemangleNestedName(typeid(Dali::Actor).name());
+ * @param[in] typeIdName The type id name string to demangle.
+ * @returns the last component "Actor" or an empty string_view
+ */
+std::string_view ExtractDemangleNestedName(std::string_view mangledName)
+{
+  if(mangledName.empty())
+  {
+    return {};
+  }
+
+  // classes nested inside a namespace starts with 'N' and ends with 'E'
+  // so trim those
+  if(mangledName.front() == 'N' && mangledName.back() == 'E')
+  {
+    mangledName.remove_prefix(1);
+    mangledName.remove_suffix(1);
+  }
+
+  std::string_view result;
+  while(!mangledName.empty())
+  {
+    auto length = ExtractNumber(mangledName);
+    result      = {mangledName.data(), length};
+    mangledName.remove_prefix(length);
+  }
+
+  return result;
+}
+
+} // namespace
+
+namespace Dali
+{
+namespace Internal
+{
+std::string DemangleClassName(const char* typeIdName)
+{
+  return std::string(ExtractDemangleNestedName(typeIdName));
+}
+
+} // namespace Internal
+
+} // namespace Dali
diff --git a/dali/internal/event/common/demangler-windows.cpp b/dali/internal/event/common/demangler-windows.cpp
new file mode 100644 (file)
index 0000000..5d0f24b
--- /dev/null
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2024 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.
+ *
+ */
+
+// FILE HEADER
+#include <dali/internal/event/common/demangler.h>
+
+namespace Dali
+{
+namespace Internal
+{
+std::string DemangleClassName(const char* typeIdName)
+{
+  std::string name  = typeIdName;
+  int         index = name.find_last_of(' ');
+
+  if(0 <= index)
+  {
+    name = name.substr(index + 1, name.size() - index);
+  }
+
+  index = name.find_last_of(':');
+
+  if(0 <= index)
+  {
+    name = name.substr(index + 1, name.size() - index);
+  }
+
+  return name;
+}
+
+} // namespace Internal
+
+} // namespace Dali
diff --git a/dali/internal/event/common/demangler.cpp b/dali/internal/event/common/demangler.cpp
deleted file mode 100644 (file)
index 5a2caed..0000000
+++ /dev/null
@@ -1,166 +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.
- *
- */
-
-//
-// gcc and clang minimal demangling
-// Both follow Itanium C++ ABI
-//
-// We only decode namespaces and class typeid names for simplicity as its all we need.
-//
-// From http://mentorembedded.github.io/cxx-abi/abi.html#mangling-structure
-//
-// <nested-name> ::= N [<CV-qualifiers>] <prefix> <unqualified-name> E
-//     ::= N [<CV-qualifiers>] <template-prefix> <template-args> E
-//
-// <prefix> ::= <prefix> <unqualified-name>
-//     ::= <template-prefix> <template-args>
-//          ::= <template-param>
-//          ::= <decltype>
-//     ::= # empty
-//     ::= <substitution>
-//          ::= <prefix> <data-member-prefix>
-//
-// <template-prefix> ::= <prefix> <template unqualified-name>
-//                   ::= <template-param>
-//                   ::= <substitution>
-// <unqualified-name> ::= <operator-name>
-//                    ::= <ctor-dtor-name>
-//                    ::= <source-name>
-//                    ::= <unnamed-type-name>
-//
-// <source-name> ::= <positive length number> <identifier>
-// <number> ::= [n] <non-negative decimal integer>
-// <identifier> ::= <unqualified source code identifier>
-//
-// So for example
-//
-// Dali::Internal::Actor would be
-//
-//   N4Dali8Internal5ActorE
-//
-
-// CLASS HEADER
-#include <dali/internal/event/common/demangler.h>
-
-namespace
-{
-
-// true if character represent a digit
-inline bool IsDigit(char c)
-{
-  return (c >= '0' && c <= '9');
-}
-
-// Gets the number of characters (number is in string)
-//   start The start position to look for a number
-//   result The number as an integer
-//   returns the number of characters used to define the number ie '12' is 2
-size_t GetNumberOfCharacters(const std::string& s, const size_t& start, int& result)
-{
-  size_t size = s.size();
-
-  size_t i = start;
-
-  int number = 0;
-
-  for( ; i < size; ++i )
-  {
-    char c = s.at(i);
-    if( !IsDigit( c ) )
-    {
-      break;
-    }
-    else
-    {
-      number = 10 * number + (c - '0');
-    }
-  }
-
-  if( i - start )
-  {
-    result = number;
-  }
-
-  return i - start;
-}
-
-} // anon namespace
-
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-#if defined(__clang__) || defined(__GNUC__)
-
-// Demangle class name mangled according to the Itanium C++ ABI
-// Returns demangled names ie "N4Dali8Internal5ActorE" is ["Dali","Internal","Actor"]
-std::vector<std::string> DemangleNestedNames(const char *typeIdName)
-{
-  std::vector<std::string> ret;
-
-  const std::string mangledName(typeIdName);
-
-
-  size_t size = mangledName.size();
-
-  if( size >= 2 )
-  {
-    int number = 0;
-    size_t start = 0;
-
-    // If the class isnt nested in a namespace then it just starts with the
-    // number of characters
-    if(mangledName[0] == 'N' && mangledName[size-1]  == 'E')
-    {
-      start = 1;
-    }
-
-    while( size_t chars = GetNumberOfCharacters(mangledName, start, number) )
-    {
-      ret.push_back( mangledName.substr( start + chars, number ) );
-
-      start += chars + number;
-    }
-  }
-
-  return ret;
-}
-
-#else
-# error Unsupported Compiler
-#endif
-
-
-const std::string DemangleClassName(const char *typeIdName)
-{
-  std::string name;
-  std::vector<std::string> names = DemangleNestedNames(typeIdName);
-
-  if( names.size() )
-  {
-    name = names[ names.size() - 1 ];
-  }
-
-  return name;
-}
-
-} // namespace Internal
-
-} // namespace Dali
index 97940999bc0f7933fb22eb4a335bf8f43d3ef4a2..7d3b3fc2e91595521ef23257c8296925e67061e2 100644 (file)
@@ -30,21 +30,12 @@ namespace Dali
 namespace Internal
 {
 
-/**
- * Demangle a nested typeid name into its component parts.
- * A nested type name is one containing namespaces and class names only.
- *   eg DemangleNestedNames(typeid(Dali::Actor).name());
- * @param[in] typeIdName The type id name string to demangle.
- * @returns the demangled list of names ie ["Dali","Actor"] or an empty list
- */
-std::vector<std::string> DemangleNestedNames(const char *typeIdName);
-
 /**
  * Demangle a nested typeid name to its class name.
  * @param[in] typeIdName The type id name string to demangle.
  * @returns the class name ie "Actor" or an empty string
  */
-const std::string DemangleClassName(const char *typeIdName);
+std::string DemangleClassName(const char *typeIdName);
 
 }
 
diff --git a/dali/internal/file-unix.list b/dali/internal/file-unix.list
new file mode 100644 (file)
index 0000000..82a0b83
--- /dev/null
@@ -0,0 +1,11 @@
+# Set the source directory
+SET( internal_src_dir ${ROOT_SRC_DIR}/dali/internal )
+
+# Add internal unix source files here
+SET( internal_unix_src_files
+  ${internal_src_dir}/event/common/demangler-unix.cpp
+)
+
+SET( SOURCES ${SOURCES}
+  ${internal_unix_src_files}
+)
diff --git a/dali/internal/file-windows.list b/dali/internal/file-windows.list
new file mode 100644 (file)
index 0000000..457babd
--- /dev/null
@@ -0,0 +1,11 @@
+# Set the source directory
+SET( internal_src_dir ${ROOT_SRC_DIR}/dali/internal )
+
+# Add internal unix source files here
+SET( internal_windows_src_files
+  ${internal_src_dir}/event/common/demangler-windows.cpp
+)
+
+SET( SOURCES ${SOURCES}
+  ${internal_windows_src_files}
+)
index 677922499936a004a3387d0d311c1491dc626468..eff514e867b38ea0b0ad4ac5ac27bea395a42ffd 100644 (file)
 # Add internal source files here
+SET( internal_src_dir ${ROOT_SRC_DIR}/dali/internal )
 
-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-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-processor.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-processor.cpp \
-  $(internal_src_dir)/event/events/pinch-gesture-detector-impl.cpp \
-  $(internal_src_dir)/event/events/pinch-gesture-processor.cpp \
-  $(internal_src_dir)/event/events/tap-gesture-detector-impl.cpp \
-  $(internal_src_dir)/event/events/tap-gesture-processor.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)/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/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/graphics/graphics-algorithms.cpp \
-  $(internal_src_dir)/update/graphics/graphics-buffer-manager.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/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-camera.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/render-instruction-container.cpp \
-  $(internal_src_dir)/update/rendering/render-instruction.cpp \
-  $(internal_src_dir)/update/rendering/render-item.cpp \
-  $(internal_src_dir)/update/rendering/scene-graph-frame-buffer.cpp \
-  $(internal_src_dir)/update/rendering/scene-graph-geometry.cpp \
-  $(internal_src_dir)/update/rendering/scene-graph-property-buffer.cpp \
-  $(internal_src_dir)/update/rendering/scene-graph-texture.cpp \
-  $(internal_src_dir)/update/rendering/scene-graph-shader.cpp \
-  $(internal_src_dir)/update/rendering/scene-graph-texture-set.cpp \
-  $(internal_src_dir)/update/rendering/scene-graph-renderer.cpp \
-  $(internal_src_dir)/update/rendering/shader-cache.cpp
+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/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-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-processor.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-processor.cpp
+  ${internal_src_dir}/event/events/pinch-gesture-detector-impl.cpp
+  ${internal_src_dir}/event/events/pinch-gesture-processor.cpp
+  ${internal_src_dir}/event/events/tap-gesture-detector-impl.cpp
+  ${internal_src_dir}/event/events/tap-gesture-processor.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}/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/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/graphics/graphics-algorithms.cpp
+  ${internal_src_dir}/update/graphics/graphics-buffer-manager.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/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-camera.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/render-instruction-container.cpp
+  ${internal_src_dir}/update/rendering/render-instruction.cpp
+  ${internal_src_dir}/update/rendering/render-item.cpp
+  ${internal_src_dir}/update/rendering/scene-graph-frame-buffer.cpp
+  ${internal_src_dir}/update/rendering/scene-graph-geometry.cpp
+  ${internal_src_dir}/update/rendering/scene-graph-property-buffer.cpp
+  ${internal_src_dir}/update/rendering/scene-graph-texture.cpp
+  ${internal_src_dir}/update/rendering/scene-graph-shader.cpp
+  ${internal_src_dir}/update/rendering/scene-graph-texture-set.cpp
+  ${internal_src_dir}/update/rendering/scene-graph-renderer.cpp
+  ${internal_src_dir}/update/rendering/shader-cache.cpp
+)
+
+SET( SOURCES ${SOURCES}
+  ${internal_src_files}
+)
diff --git a/dali/public-api/CMakeLists.txt b/dali/public-api/CMakeLists.txt
deleted file mode 100644 (file)
index ebd2cbe..0000000
+++ /dev/null
@@ -1,225 +0,0 @@
-#
-# Add public-api source files here
-#
-SET(SOURCES ${SOURCES}
-  ${CMAKE_CURRENT_SOURCE_DIR}/actors/actor.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/actors/camera-actor.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/actors/custom-actor.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/actors/custom-actor-impl.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/actors/layer.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/animation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/alpha-function.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/constraint.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/constraint-source.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/key-frames.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/linear-constrainer.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/path.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/time-period.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/constants.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/dali-common.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/dali-vector.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/extents.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/stage.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/gesture.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/gesture-detector.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/hover-event.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/key-event.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/long-press-gesture.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/long-press-gesture-detector.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/wheel-event.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/pan-gesture.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/pan-gesture-detector.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/pinch-gesture.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/pinch-gesture-detector.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/tap-gesture.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/tap-gesture-detector.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/touch-point.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/touch-event.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/touch-data.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/image.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/pixel.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/pixel-data.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/buffer-image.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/frame-buffer-image.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/encoded-buffer-image.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/resource-image.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/native-image.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/compile-time-math.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/degree.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/matrix.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/matrix3.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/quaternion.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/vector2.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/vector3.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/vector4.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/any.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/base-handle.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/handle.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/base-object.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/object-registry.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-array.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-conditions.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-input.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-key.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-map.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-notification.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-types.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-value.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/ref-object.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/render-tasks/render-task.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/render-tasks/render-task-list.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/frame-buffer.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/geometry.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/property-buffer.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/texture.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/texture-set.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderer.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/sampler.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/shader.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/callback.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/connection-tracker.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/connection-tracker-interface.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/signal-slot-connections.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/signal-slot-observers.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/base-signal.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/functor-delegate.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/type-info.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/type-registry.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/weak-handle.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/dali-core-version.cpp
-
-  PARENT_SCOPE )
-
-#
-# Add public header files here
-#
-SET(PUBLIC_API_HEADERS
-  ${CMAKE_CURRENT_SOURCE_DIR}/dali-core.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/dali-core-version.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/actors/actor.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/actors/actor-enumerations.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/actors/camera-actor.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/actors/custom-actor.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/actors/custom-actor-impl.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/actors/draw-mode.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/actors/layer.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/actors/sampling.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/alpha-function.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/animation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/constraint.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/constraints.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/constraint-source.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/key-frames.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/linear-constrainer.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/path.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/animation/time-period.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/compile-time-assert.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/constants.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/dali-common.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/dali-vector.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/extents.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/intrusive-ptr.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/loading-state.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/stage.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/type-traits.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/vector-wrapper.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/view-mode.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/device.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/gesture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/gesture-detector.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/hover-event.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/key-event.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/long-press-gesture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/long-press-gesture-detector.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/wheel-event.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/pan-gesture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/pan-gesture-detector.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/pinch-gesture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/pinch-gesture-detector.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/point-state.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/tap-gesture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/tap-gesture-detector.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/touch-point.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/touch-event.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/touch-data.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/events/mouse-button.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/buffer-image.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/encoded-buffer-image.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/frame-buffer-image.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/image.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/image-operations.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/pixel.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/pixel-data.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/resource-image.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/native-image.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/images/native-image-interface.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/angle-axis.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/compile-time-math.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/degree.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/math-utils.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/matrix.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/matrix3.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/quaternion.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/radian.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/random.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/rect.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/uint-16-pair.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/vector2.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/vector3.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/vector4.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/math/viewport.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/any.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/base-handle.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/base-object.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/handle.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/object-registry.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-array.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-conditions.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-index-ranges.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-input.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-key.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-map.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-notification-declarations.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-notification.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-types.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property-value.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/property.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/ref-object.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/type-info.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/type-registry.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/type-registry-helper.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/object/weak-handle.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/render-tasks/render-task.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/render-tasks/render-task-list.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/frame-buffer.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/geometry.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/property-buffer.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/texture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/texture-set.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderer.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/sampler.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/shader.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/size-negotiation/relayout-container.h
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/base-signal.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/callback.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/connection-tracker-interface.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/connection-tracker.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/dali-signal.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/functor-delegate.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/signal-slot-connections.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/signal-slot-observers.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/slot-delegate.h
-
-  PARENT_SCOPE )
index 1e0e4435930ad1208bb3e44afaaf9d4e3a77bfc8..2c2526163ca9552bfd829edbec59004f3fe24d8e 100644 (file)
-#
-# Add public-api source files here
-#
-
-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 the source directory
+SET( public_api_src_dir ${ROOT_SRC_DIR}/dali/public-api )
 
+#
+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
+)
 
 #
 # 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_header_files
+  ${public_api_src_dir}/dali-core.h
+  ${public_api_src_dir}/dali-core-version.h
+)
+
+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
+)
+
+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}
+)
index e633229703bc00f27ce06634f276975a104e45bb..d462839a45097d0479a4ae5a063fd7d67bd85fba 100644 (file)
@@ -1,5 +1,8 @@
 #
 # Add package doxy headers here
+
+SET(package_doxy_dir ${ROOT_SRC_DIR}/doc)
 #
-package_doxy_files = \
-  $(package_doxy_dir)/dali-core-doc.h
+SET(package_doxy_files
+  ${package_doxy_dir}/dali-core-doc.h
+)