Ensure environment variable DALI_APPLICATION_PACKAGE get set regardless of desktop...

This is required for older Tizen builds.

Change-Id: Ia81e14360ce657c2b8f1a0809c36649ed17f51a8

diff --git a/build/tizen/builder/CMakeLists.txt b/build/tizen/builder/CMakeLists.txt
index d7d72e9..5cbdfa6 100644 (file)
--- a/build/tizen/builder/CMakeLists.txt
+++ b/build/tizen/builder/CMakeLists.txt
@@ -1,6 +1,7 @@
 SET(BUILDER_SRC_DIR ${ROOT_SRC_DIR}/builder)
 
 SET(DALI_BUILDER_SRCS ${BUILDER_SRC_DIR}/dali-builder.cpp)
+SET(DALI_BUILDER_SRCS ${DALI_BUILDER_SRCS} "${ROOT_SRC_DIR}/shared/resources-location.cpp")
 ADD_EXECUTABLE(dali-builder ${DALI_BUILDER_SRCS})
 TARGET_LINK_LIBRARIES(dali-builder ${REQUIRED_PKGS_LDFLAGS})
 INSTALL(TARGETS dali-builder DESTINATION ${BINDIR})

diff --git a/build/tizen/demo/CMakeLists.txt b/build/tizen/demo/CMakeLists.txt
index 6aaf032..205f3a1 100644 (file)
--- a/build/tizen/demo/CMakeLists.txt
+++ b/build/tizen/demo/CMakeLists.txt
@@ -2,11 +2,7 @@ SET(DEMO_SRC_DIR ${ROOT_SRC_DIR}/demo)
 
 AUX_SOURCE_DIRECTORY(${DEMO_SRC_DIR} DEMO_SRCS)
 
-
-IF(NOT DEFINED DALI_APP_RES_DIR)
-  message([STATUS] "Setting application resource path from resource-location file")
-  SET( DEMO_SRCS ${DEMO_SRCS} "${ROOT_SRC_DIR}/shared/resources-location.cpp")
-ENDIF()
+SET(DEMO_SRCS ${DEMO_SRCS} "${ROOT_SRC_DIR}/shared/resources-location.cpp")
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${DEMO_SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${REQUIRED_PKGS_LDFLAGS} -pie)

diff --git a/build/tizen/examples/CMakeLists.txt b/build/tizen/examples/CMakeLists.txt
index d83f427..ee0d04f 100644 (file)
--- a/build/tizen/examples/CMakeLists.txt
+++ b/build/tizen/examples/CMakeLists.txt
@@ -15,10 +15,7 @@ SUBDIRLIST(SUBDIRS ${EXAMPLES_SRC_DIR})
 
 FOREACH(EXAMPLE ${SUBDIRS})
   FILE(GLOB SRCS "${EXAMPLES_SRC_DIR}/${EXAMPLE}/*.cpp")
-  IF(NOT DEFINED DALI_APP_RES_DIR)
-    SET( SRCS ${SRCS} "${ROOT_SRC_DIR}/shared/resources-location.cpp")
-
-  ENDIF()
+  SET(SRCS ${SRCS} "${ROOT_SRC_DIR}/shared/resources-location.cpp")
   ADD_EXECUTABLE(${EXAMPLE}.example ${SRCS})
   TARGET_LINK_LIBRARIES(${EXAMPLE}.example ${REQUIRED_PKGS_LDFLAGS} -pie)
   INSTALL(TARGETS ${EXAMPLE}.example DESTINATION ${BINDIR})

diff --git a/build/tizen/resources-location.in b/build/tizen/resources-location.in
index 89b0b87..6474abb 100644 (file)
--- a/build/tizen/resources-location.in
+++ b/build/tizen/resources-location.in
@@ -1,6 +1,6 @@
 /**
- * This file defines the location dali-demo resources
-   It is used exclusively for Ubuntu builds where an application resource directory is explicity defined.
+ * This file defines the location dali-demo resources.
+ * It is used for builds where an application resource directory is NOT explicity defined.
  */
 
 #include <cstdlib>