(AutomatedTests) Ensure local headers are included before installed

Change-Id: I375e2acf7e856a8f08385b532ea01f5f267b0360

diff --git a/automated-tests/src/dali-adaptor-internal/CMakeLists.txt b/automated-tests/src/dali-adaptor-internal/CMakeLists.txt
index a670a19..fc8854c 100644 (file)
--- a/automated-tests/src/dali-adaptor-internal/CMakeLists.txt
+++ b/automated-tests/src/dali-adaptor-internal/CMakeLists.txt
@@ -47,8 +47,7 @@ ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
 
 # Adaptor directories are included in order of most-specific to least specific:
 INCLUDE_DIRECTORIES(
-    ${${CAPI_LIB}_INCLUDE_DIRS}
-    ../dali-adaptor/dali-test-suite-utils
+    ../../../
     ../../../adaptors/mobile
     ../../../adaptors/x11
     ../../../adaptors/common
@@ -59,7 +58,8 @@ INCLUDE_DIRECTORIES(
     ../../../adaptors/public-api/adaptor-framework
     ../../../adaptors/tizen
     ../../../adaptors/ubuntu
-    ../../../
+    ${${CAPI_LIB}_INCLUDE_DIRS}
+    ../dali-adaptor/dali-test-suite-utils
 )
 
 ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})

diff --git a/automated-tests/src/dali-adaptor/CMakeLists.txt b/automated-tests/src/dali-adaptor/CMakeLists.txt
index 89be323..1c19898 100644 (file)
--- a/automated-tests/src/dali-adaptor/CMakeLists.txt
+++ b/automated-tests/src/dali-adaptor/CMakeLists.txt
@@ -38,6 +38,7 @@ FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
 ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
 
 INCLUDE_DIRECTORIES(
+    ../../../
     ${${CAPI_LIB}_INCLUDE_DIRS}
     dali-test-suite-utils
 )

diff --git a/automated-tests/src/dali-platform-abstraction/CMakeLists.txt b/automated-tests/src/dali-platform-abstraction/CMakeLists.txt
index 69d02a6..df6910e 100644 (file)
--- a/automated-tests/src/dali-platform-abstraction/CMakeLists.txt
+++ b/automated-tests/src/dali-platform-abstraction/CMakeLists.txt
@@ -36,11 +36,11 @@ FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
 ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
 
 INCLUDE_DIRECTORIES(
-    ${${CAPI_LIB}_INCLUDE_DIRS}
-    ../dali-adaptor/dali-test-suite-utils
+    ../../../
     ../../../adaptors/tizen
     ../../../platform-abstractions/tizen
-    ../../../
+    ${${CAPI_LIB}_INCLUDE_DIRS}
+    ../dali-adaptor/dali-test-suite-utils
     /usr/include/freetype2
 )