diff options
| -rw-r--r-- | client/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/ui-gadget-1.spec | 13 | ||||
| -rw-r--r-- | src/module.c | 7 | ||||
| -rw-r--r-- | ug-efl-engine/CMakeLists.txt | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index da22dbf..0290a48 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -26,7 +26,7 @@ SET_TARGET_PROPERTIES(${CLIENT} PROPERTIES COMPILE_FLAGS "${CLIENT_CFLAGS}") TARGET_LINK_LIBRARIES(${CLIENT} ${PROJECT_NAME} "${CLIENT_PKGS_LDFLAGS} -pie") ADD_CUSTOM_TARGET(ug-client.edj - COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/images + COMMAND EINA_CPU_FAKE=1 edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/images ${CMAKE_CURRENT_SOURCE_DIR}/ug-client.edc ${CMAKE_CURRENT_BINARY_DIR}/ug-client.edj DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ug-client.edc ) diff --git a/packaging/ui-gadget-1.spec b/packaging/ui-gadget-1.spec index 5b52650..0950f1d 100644 --- a/packaging/ui-gadget-1.spec +++ b/packaging/ui-gadget-1.spec @@ -1,6 +1,6 @@ Name: ui-gadget-1 Summary: UI Gadget Library -Version: 0.2.10 +Version: 0.2.12 Release: 1 Group: System/Libraries License: Apache-2.0 @@ -64,18 +64,15 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` make %{?jobs:-j%jobs} -%if 0%{?gcov:1} -mkdir -p gcov-obj -find . -name '*.gcno' -exec cp '{}' gcov-obj ';' -%endif - %install rm -rf %{buildroot} %make_install %if 0%{?gcov:1} -mkdir -p %{buildroot}%{_datadir}/gcov/obj -install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj +builddir=$(basename $PWD) +gcno_obj_dir=%{buildroot}%{_datadir}/gcov/obj/%{name}/"$builddir" +mkdir -p "$gcno_obj_dir" +find . -name '*.gcno' -exec cp --parents '{}' "$gcno_obj_dir" ';' %endif %post diff --git a/src/module.c b/src/module.c index 10450c2..b5d5306 100644 --- a/src/module.c +++ b/src/module.c @@ -184,10 +184,13 @@ static int __get_ug_info(const char *name, char **ug_file_path) pkgmgrinfo_appinfo_destroy_appinfo(appinfo); return -1; } - snprintf(ug_file, PATH_MAX, "%s/lib/ug/libug-%s.so", res_path, name); + snprintf(ug_file, PATH_MAX, "%slib/ug/libug-%s.so", res_path, name); if (!__file_exist(ug_file)) goto out_func; - snprintf(ug_file, PATH_MAX, "%s/lib/ug/lib-%s.so", res_path, name); + snprintf(ug_file, PATH_MAX, "%slib/ug/lib-%s.so", res_path, name); + if (!__file_exist(ug_file)) + goto out_func; + snprintf(ug_file, PATH_MAX, "%slib/ug/lib%s.so", res_path, name); if (!__file_exist(ug_file)) goto out_func; diff --git a/ug-efl-engine/CMakeLists.txt b/ug-efl-engine/CMakeLists.txt index 857ea77..c29360c 100644 --- a/ug-efl-engine/CMakeLists.txt +++ b/ug-efl-engine/CMakeLists.txt @@ -19,7 +19,7 @@ TARGET_LINK_LIBRARIES(${UG_EFL_ENGINE} ${PROJECT_NAME} ${UG_EFL_ENGINE_PKGS_LDFL INSTALL(TARGETS ${UG_EFL_ENGINE} DESTINATION ${LIB_INSTALL_DIR}) ADD_CUSTOM_TARGET(ug_effect.edj - COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND EINA_CPU_FAKE=1 edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/ug_effect.edc ${CMAKE_BINARY_DIR}/ug_effect.edj DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ug_effect.edc ) |