Fix the cmake options for loading libraries

Change-Id: I069dc20ed07f77354b4c9b8b89a07d7ea4d6d118

diff --git a/packaging/ug-setting-manage-applications-efl.spec b/packaging/ug-setting-manage-applications-efl.spec
index a2359b2..6070e9b 100644 (file)
--- a/packaging/ug-setting-manage-applications-efl.spec
+++ b/packaging/ug-setting-manage-applications-efl.spec
@@ -36,6 +36,11 @@ Description: Manage Application package
 %build
 mkdir -p cmake_build_tmp && cd cmake_build_tmp
 
+CFLAGS+=" -fvisibility=hidden"; export CFLAGS
+CXXFLAGS+=" -fvisibility=hidden"; export CXXFLAGS
+FFLAGS+=" -fvisibility=hidden"; export FFLAGS
+LDFLAGS+=" -Wl,--hash-style=both -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,-zdefs"; export LDFLAGS
+
 cmake .. -DCMAKE_INSTALL_PREFIX="%{_ugdir}" -DCMAKE_BUILD_TYPE="Release" -DPKGNAME="ug-setting-manage-applications-efl" -DTYPE=""
 
 make

diff --git a/ug-setting-manage-applications-efl.manifest b/ug-setting-manage-applications-efl.manifest
index 41a9320..e456bc9 100644 (file)
--- a/ug-setting-manage-applications-efl.manifest
+++ b/ug-setting-manage-applications-efl.manifest
@@ -1,6 +1,11 @@
 <manifest>
-    <request>
-        <domain name="_"/>
-    </request>
+       <define>
+               <domain name="ug-setting-manage-applications-efl"/>
+       </define>
+       <assign>
+               <filesystem path="/usr/ug/res/images/ug-setting-manage-applications-efl/ManageApplications.png" label="_"/>
+               <filesystem path="/usr/ug/lib/*" label="_"/>
+               <filesystem path="/usr/ug/res/*" label="_"/>
+               <filesystem path="/usr/ug/bin/*" label="_" exec_label="_"/>
+       </assign>
 </manifest>
-

diff --git a/ug/CMakeLists.txt b/ug/CMakeLists.txt
index 81ce7aa..09663c9 100755 (executable)
--- a/ug/CMakeLists.txt
+++ b/ug/CMakeLists.txt
@@ -28,7 +28,9 @@ FOREACH(flag ${pkgs_CFLAGS})
 ENDFOREACH(flag)
 
 #SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp -Wa,-mimplicit-it=thumb")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fpie")
+SET(CMAKE_LDFLAGS "-Wl,-zdefs -Wl,-rpath=${LIBDIR}")
+SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed -pie")
 #SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 #SET(CMAKE_C_FLAGS_RELEASE "-O2")
 
@@ -42,9 +44,8 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DSLP_DEBUG")
 
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
-
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0.1.0)
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${CMAKE_LDFLAGS} ${pkgs_LDFLAGS})
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/ug/lib)