Check EFL module version in build time

EFL module path depend on its version. This commit makes it possible
to read EFL module version and generate EFL module path in build time.

Change-Id: I8bcf33dc814878bd0e8900b7c29105a07c2208d9

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7d515c..7fbbd02 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,4 +17,9 @@ ADD_DEFINITIONS("-DLAUNCHPAD_LOG")
 ADD_DEFINITIONS("-DPRELOAD_ACTIVATE")
 ADD_DEFINITIONS("-DPREEXEC_ACTIVATE")
 
+EXEC_PROGRAM(pkg-config
+    ARGS --variable=module_arch ecore
+    OUTPUT_VARIABLE EFL_MODULE_VERSION
+)
+
 ADD_SUBDIRECTORY(src)

diff --git a/packaging/default.loader.in b/packaging/default.loader.in
index a910c96..3e076ce 100644 (file)
--- a/packaging/default.loader.in
+++ b/packaging/default.loader.in
@@ -10,12 +10,12 @@ EXTRA_ARRAY         preload
 EXTRA_ARRAY_VAL                @LIB_INSTALL_DIR@/libappcore-efl.so.1
 EXTRA_ARRAY_VAL                @LIB_INSTALL_DIR@/libappcore-common.so.1
 EXTRA_ARRAY_VAL                @LIB_INSTALL_DIR@/libcapi-appfw-application.so.0
-EXTRA_ARRAY_VAL                @LIB_INSTALL_DIR@/ecore_imf/modules/wayland/v-1.23/module.so
+EXTRA_ARRAY_VAL                @LIB_INSTALL_DIR@/ecore_imf/modules/wayland/@EFL_MODULE_VERSION@/module.so
 EXTRA_ARRAY_VAL                @LIB_INSTALL_DIR@/libdali-toolkit.so
 EXTRA_ARRAY_VAL                @LIB_INSTALL_DIR@/libcairo.so.2
 EXTRA_ARRAY_VAL                @LIB_INSTALL_DIR@/libcapi-media-player.so.0
 EXTRA_ARRAY_VAL                @LIB_INSTALL_DIR@/libcapi-media-camera.so.0
-EXTRA_ARRAY_VAL                @LIB_INSTALL_DIR@/ecore_evas/engines/extn/v-1.23/module.so
+EXTRA_ARRAY_VAL                @LIB_INSTALL_DIR@/ecore_evas/engines/extn/@EFL_MODULE_VERSION@/module.so
 ALTERNATIVE_LOADER     common-loader1
 
 [LOADER]
@@ -29,8 +29,8 @@ EXTRA_ARRAY           preload
 EXTRA_ARRAY_VAL                @LIB_INSTALL_DIR@/libappcore-efl.so.1
 EXTRA_ARRAY_VAL                @LIB_INSTALL_DIR@/libappcore-common.so.1
 EXTRA_ARRAY_VAL                @LIB_INSTALL_DIR@/libcapi-appfw-application.so.0
-EXTRA_ARRAY_VAL                @LIB_INSTALL_DIR@/ecore_imf/modules/wayland/v-1.23/module.so
-EXTRA_ARRAY_VAL                @LIB_INSTALL_DIR@/ecore_evas/engines/extn/v-1.23/module.so
+EXTRA_ARRAY_VAL                @LIB_INSTALL_DIR@/ecore_imf/modules/wayland/@EFL_MODULE_VERSION@/module.so
+EXTRA_ARRAY_VAL                @LIB_INSTALL_DIR@/ecore_evas/engines/extn/@EFL_MODULE_VERSION@/module.so