Fixed Cmake build

- Added all the files that need to be built & installed
- Ensure an empty string is not printed out in a release build if
  nothing specified
- Ensure dali-core.pc is generated properly by setting the include and
  lib dir variables
- Ensure ENABLE_COVERAGE and ENABLE_DEBUG vars are turned out when other
  factors switch them on

Change-Id: Ibc41fbde699e4432bca5fa613e8b3c377d1a6bb7

diff --git a/build/tizen-cmake/CMakeLists.txt b/build/tizen-cmake/CMakeLists.txt
index baf23b0..ab90d54 100644 (file)
--- a/build/tizen-cmake/CMakeLists.txt
+++ b/build/tizen-cmake/CMakeLists.txt
@@ -25,12 +25,19 @@ SET(GLES_VERSION 20 CACHE INTEGER "Gles Version")
 
 # 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(-DDALI_GLES_VERSION=${GLES_VERSION})
 ADD_DEFINITIONS(-DPIC -DSTDC_HEADERS)
 
 IF("${ARCH}" STREQUAL "arm")
-    ADD_DEFINITIONS("-DTARGET")
+  ADD_DEFINITIONS("-DTARGET")
 ENDIF("${ARCH}" STREQUAL "arm")
 
 IF( NOT ${ENABLE_EXPORTALL} AND NOT ${ENABLE_DEBUG} )
@@ -56,19 +63,25 @@ SET( EXEC_PREFIX ${CMAKE_INSTALL_PREFIX})
 # from root/build/tizen, get back to root
 SET(ROOT_SRC_DIR ${CMAKE_SOURCE_DIR}/../..)
 
-# Requires the following variables to be setup
-# @PREFIX@ @EXEC_PREFIX@ @DALI_VERSION@ @LIBDIR@ @DEV_INCLUDE_PATH@
-SET(INCLUDE_DIR $ENV{includedir})
-SET(DEV_INCLUDE_PATH ${INCLUDE_DIR})
-SET(LIB_DIR $ENV{libdir})
-CONFIGURE_FILE( dali-core.pc.in dali-core.pc )
-
-MESSAGE( STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE} )
-if(CMAKE_BUILD_TYPE MATCHES Debug)
-    MESSAGE("Setting variable: DEBUG_ENABLED")
-    SET(DEBUG_ENABLED "1")
+# Set up the include dir
+SET( INCLUDE_DIR $ENV{includedir} )
+IF( NOT INCLUDE_DIR )
+  SET( INCLUDE_DIR ${PREFIX}/include )
+ENDIF()
+
+# Set up the lib dir
+SET( LIB_DIR $ENV{libdir} )
+IF( NOT LIB_DIR )
+  SET( LIB_DIR ${PREFIX}/lib )
 ENDIF()
 
+# Configure the pkg-config file
+# Requires the following variables to be setup:
+# @PREFIX@ @EXEC_PREFIX@ @DALI_VERSION@ @LIB_DIR@ @DEV_INCLUDE_PATH@
+SET( DEV_INCLUDE_PATH ${INCLUDE_DIR} )
+SET( CORE_PKG_CFG_FILE dali-core.pc )
+CONFIGURE_FILE( ${CORE_PKG_CFG_FILE}.in ${CORE_PKG_CFG_FILE} @ONLY )
+
 # Set up compiler flags and warnings
 #ADD_COMPILE_OPTIONS( -std=c++11 -ggdb )
 ADD_COMPILE_OPTIONS( -std=c++11 -gdwarf-4 )
@@ -81,8 +94,9 @@ ELSE( ENABLE_DEBUG )
   ADD_COMPILE_OPTIONS( -Os )
 ENDIF( ENABLE_DEBUG )
 
-IF( ENABLE_COVERAGE OR CXXFLAGS MATCHES --coverage)
+IF( ENABLE_COVERAGE OR $ENV{CXXFLAGS} MATCHES --coverage )
   ADD_COMPILE_OPTIONS( --coverage )
+  SET(ENABLE_COVERAGE ON)
   SET(COVERAGE --coverage)
 ENDIF()
 
@@ -91,6 +105,7 @@ INCLUDE_DIRECTORIES(
 )
 
 SET(SOURCE_DIR "${ROOT_SRC_DIR}/dali")
+SET(PACKAGE_DOXY_SRC_DIR "${ROOT_SRC_DIR}/doc")
 
 SET(SOURCES "")
 
@@ -100,6 +115,7 @@ 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} )
 
@@ -116,7 +132,10 @@ SET_TARGET_PROPERTIES( ${name}
 )
 
 # Install the library so file and symlinks
-INSTALL( TARGETS ${name} DESTINATION ${PREFIX}/lib )
+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)
@@ -125,7 +144,7 @@ MACRO(INSTALL_HEADERS_WITH_DIRECTORY HEADER_LIST STRIP_PREFIX REPLACE_PREFIX)
   FOREACH(HEADER ${${HEADER_LIST}})
     STRING(REGEX MATCH "(.*)[/]" DIR ${HEADER})
     STRING(REPLACE ${SPREFIX} ${REPLACE_PREFIX} NEWDIR ${DIR})
-    INSTALL(FILES ${HEADER} DESTINATION ${PREFIX}/include/${NEWDIR})
+    INSTALL(FILES ${HEADER} DESTINATION ${INCLUDE_DIR}/${NEWDIR})
   ENDFOREACH(HEADER)
 ENDMACRO(INSTALL_HEADERS_WITH_DIRECTORY)
 
@@ -133,6 +152,7 @@ ENDMACRO(INSTALL_HEADERS_WITH_DIRECTORY)
 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
@@ -191,6 +211,8 @@ 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} )

diff --git a/build/tizen-cmake/dali-core.pc.in b/build/tizen-cmake/dali-core.pc.in
index b6ff02d..7bbcbfc 100644 (file)
--- a/build/tizen-cmake/dali-core.pc.in
+++ b/build/tizen-cmake/dali-core.pc.in
@@ -1,7 +1,7 @@
 prefix=@PREFIX@
 exec_prefix=@EXEC_PREFIX@
 apiversion=@DALI_VERSION@
-libdir=@LIBDIR@
+libdir=@LIB_DIR@
 includedir=@DEV_INCLUDE_PATH@
 
 Name: DALi 3D Engine

diff --git a/dali/devel-api/CMakeLists.txt b/dali/devel-api/CMakeLists.txt
index 5572eeb..0aca8ad 100644 (file)
--- a/dali/devel-api/CMakeLists.txt
+++ b/dali/devel-api/CMakeLists.txt
@@ -8,6 +8,7 @@ SET( SOURCES ${SOURCES}
   ${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
@@ -33,6 +34,7 @@ SET( DEVEL_API_HEADERS
   ${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
@@ -42,6 +44,7 @@ SET( DEVEL_API_HEADERS
   ${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

diff --git a/dali/integration-api/CMakeLists.txt b/dali/integration-api/CMakeLists.txt
index a856c3b..7b8e613 100644 (file)
--- a/dali/integration-api/CMakeLists.txt
+++ b/dali/integration-api/CMakeLists.txt
@@ -4,6 +4,7 @@ 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
@@ -29,6 +30,7 @@ SET(INTEGRATION_API_HEADERS
   ${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
@@ -40,10 +42,11 @@ SET(INTEGRATION_API_HEADERS
   ${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

diff --git a/dali/internal/CMakeLists.txt b/dali/internal/CMakeLists.txt
index 89baf65..17ce42a 100644 (file)
--- a/dali/internal/CMakeLists.txt
+++ b/dali/internal/CMakeLists.txt
@@ -127,8 +127,10 @@ SET(SOURCES ${SOURCES}
   ${CMAKE_CURRENT_SOURCE_DIR}/update/gestures/pan-gesture-profiling.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/update/gestures/scene-graph-pan-gesture.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/update/queue/update-message-queue.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/update/manager/frame-callback-processor.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/update/manager/render-instruction-processor.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/update/manager/render-task-processor.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/update/manager/scene-graph-frame-callback.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/update/manager/transform-manager.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/update/manager/update-algorithms.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/update/manager/update-manager.cpp

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a3c79d5
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1,6 @@
+#
+# Add package doxy headers here
+#
+SET(PACKAGE_DOXY_HEADERS
+  ${CMAKE_CURRENT_SOURCE_DIR}/dali-core-doc.h
+  PARENT_SCOPE )

diff --git a/doc/file.list b/doc/file.list
index b0fc9e5..e633229 100644 (file)
--- a/doc/file.list
+++ b/doc/file.list
@@ -1,2 +1,5 @@
+#
+# Add package doxy headers here
+#
 package_doxy_files = \
   $(package_doxy_dir)/dali-core-doc.h