Fix for 64 bit compatibility.

- Fix hardcoding path.
- Use %cmake to set default paths.

Change-Id: If50a96a954386af6873e9365921b2b423c8a040d

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 020dace..a8fe1c6 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,8 @@ ADD_SUBDIRECTORY(utilities)
 ##########################################################
 
 CONFIGURE_FILE(email-service.pc.in email-service.pc @ONLY)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/email-service.pc DESTINATION lib/pkgconfig) 
+
+INSTALL(FILES ${CMAKE_BINARY_DIR}/email-service.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 # LICENSE file
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.BSD DESTINATION /usr/share/license/email-service/LICENSE)

diff --git a/email-api/CMakeLists.txt b/email-api/CMakeLists.txt
index 6af6cf7..e2296f1 100755 (executable)
--- a/email-api/CMakeLists.txt
+++ b/email-api/CMakeLists.txt
@@ -60,7 +60,7 @@ TARGET_LINK_LIBRARIES(${API-LIB} ${api_pkgs_LDFLAGS} email-ipc email-storage ema
 SET_TARGET_PROPERTIES(${API-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${API-LIB} PROPERTIES VERSION ${VERSION})
 
-INSTALL(TARGETS ${API-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${API-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 
 SET(EMAIL-API-HEADERS
        ${CMAKE_SOURCE_DIR}/email-api/include/email-api.h

diff --git a/email-common-use/CMakeLists.txt b/email-common-use/CMakeLists.txt
index 0244b78..1602e50 100755 (executable)
--- a/email-common-use/CMakeLists.txt
+++ b/email-common-use/CMakeLists.txt
@@ -46,5 +46,5 @@ TARGET_LINK_LIBRARIES(${COMMON-USE-LIB} ${common_pkgs_LDFLAGS})
 SET_TARGET_PROPERTIES(${COMMON-USE-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${COMMON-USE-LIB} PROPERTIES VERSION ${VERSION})
 
-INSTALL(TARGETS ${COMMON-USE-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${COMMON-USE-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 

diff --git a/email-core/CMakeLists.txt b/email-core/CMakeLists.txt
index 0d32b1f..5cc2fc6 100755 (executable)
--- a/email-core/CMakeLists.txt
+++ b/email-core/CMakeLists.txt
@@ -51,7 +51,7 @@ TARGET_LINK_LIBRARIES(${DEVICE-LIB} ${device_LDFLAGS} ${BASE-LIB})
 SET_TARGET_PROPERTIES(${DEVICE-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${DEVICE-LIB} PROPERTIES VERSION ${VERSION})
 
-INSTALL(TARGETS ${DEVICE-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${DEVICE-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 
 
 ##########################################################
@@ -92,7 +92,7 @@ TARGET_LINK_LIBRARIES(${STORAGE-LIB} ${storage_LDFLAGS} ${BASE-LIB} ss-client)
 SET_TARGET_PROPERTIES(${STORAGE-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${STORAGE-LIB} PROPERTIES VERSION ${VERSION})
 
-INSTALL(TARGETS ${STORAGE-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${STORAGE-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 
 
 ##########################################################
@@ -129,7 +129,7 @@ TARGET_LINK_LIBRARIES(${NETWORK-LIB} ${network_pkgs_LDFLAGS} ${BASE-LIB} ${STORA
 SET_TARGET_PROPERTIES(${NETWORK-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${NETWORK-LIB} PROPERTIES VERSION ${VERSION})
 
-INSTALL(TARGETS ${NETWORK-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${NETWORK-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 
 ##########################################################
 # Define Core lib
@@ -207,6 +207,6 @@ TARGET_LINK_LIBRARIES(${CORE-LIB} ${core_pkgs_LDFLAGS} ${STORAGE-LIB} ${NETWORK-
 SET_TARGET_PROPERTIES(${CORE-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${CORE-LIB} PROPERTIES VERSION ${VERSION})
 
-INSTALL(TARGETS ${CORE-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${CORE-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 
 

diff --git a/email-ipc/CMakeLists.txt b/email-ipc/CMakeLists.txt
index 2747b14..2baadd4 100755 (executable)
--- a/email-ipc/CMakeLists.txt
+++ b/email-ipc/CMakeLists.txt
@@ -73,6 +73,6 @@ SET_TARGET_PROPERTIES(${IPC-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${IPC-LIB} PROPERTIES VERSION ${VERSION})
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/email-activation/email-service.service DESTINATION share/dbus-1/services)
-INSTALL(TARGETS ${IPC-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${IPC-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 
 

diff --git a/email-service.pc.in b/email-service.pc.in
index 45af536..5c6d6f4 100755 (executable)
--- a/email-service.pc.in
+++ b/email-service.pc.in
@@ -1,5 +1,5 @@
 prefix=/usr\r
-libdir=${prefix}/lib\r
+libdir=@LIB_INSTALL_DIR@\r
 includedir=${prefix}/include\r
  \r
 Name: email-service library\r

diff --git a/packaging/email-service.spec b/packaging/email-service.spec
index b64d334..ae37398 100755 (executable)
--- a/packaging/email-service.spec
+++ b/packaging/email-service.spec
@@ -45,7 +45,6 @@ BuildRequires:  pkgconfig(badge)
 BuildRequires:  pkgconfig(feedback)
 
 
-
 %description
 E-mail Framework Middleware Library/Binary package
 
@@ -66,9 +65,9 @@ E-mail Framework Middleware Development package
 
 export CFLAGS="${CFLAGS} -fPIC -Wall -g -fvisibility=hidden"
 export CXXFLAGS="${CXXFLAGS} -fPIC -Wall -g -fvisibility=hidden"
-export LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
+export LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--rpath=%{_libdir} -Wl,--as-needed"
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+%cmake .
 
 make %{?_smp_mflags}
 
@@ -76,9 +75,9 @@ make %{?_smp_mflags}
 mkdir -p %{buildroot}/usr/share/license
 %make_install
 
-mkdir -p %{buildroot}%{_libdir}/systemd/user/tizen-middleware.target.wants
-install -m 0644 %SOURCE1 %{buildroot}%{_libdir}/systemd/user/
-ln -sf ../email.service %{buildroot}%{_libdir}/systemd/user/tizen-middleware.target.wants/
+mkdir -p %{buildroot}/usr/lib/systemd/user/tizen-middleware.target.wants
+install -m 0644 %SOURCE1 %{buildroot}/usr/lib/systemd/user/
+ln -sf ../email.service %{buildroot}/usr/lib/systemd/user/tizen-middleware.target.wants/
 
 
 %post
@@ -431,8 +430,8 @@ systemctl daemon-reload
 %{_bindir}/email-service
 /opt/usr/data/email/res/*
 %{_libdir}/lib*.so.*
-%{_libdir}/systemd/user/email.service
-%{_libdir}/systemd/user/tizen-middleware.target.wants/email.service
+/usr/lib/systemd/user/email.service
+/usr/lib/systemd/user/tizen-middleware.target.wants/email.service
 /usr/share/dbus-1/services/email-service.service
 /usr/share/license/email-service/LICENSE
 

diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt
index fc4e1a5..945d38f 100755 (executable)
--- a/utilities/CMakeLists.txt
+++ b/utilities/CMakeLists.txt
@@ -12,7 +12,8 @@ MESSAGE(">>> current directory: ${CMAKE_CURRENT_SOURCE_DIR}")
 MESSAGE(">>> Build type: ${CMAKE_BUILD_TYPE}")
 
 SET(VISIBILITY "-DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\"")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VISIBILITY} -fvisibility=hidden")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VISIBILITY} -fvisibility=hidden ")
+ADD_DEFINITIONS("-DLIBPATH=\"${LIB_INSTALL_DIR}\"")
 
 ##########################################################
 # Define Test App

diff --git a/utilities/test-application/testapp-others.c b/utilities/test-application/testapp-others.c
index 92f8e5a..6ad03fa 100755 (executable)
--- a/utilities/test-application/testapp-others.c
+++ b/utilities/test-application/testapp-others.c
@@ -247,7 +247,7 @@ FINISH_OFF:
        return error;
 }
 
-#define LIB_EMAIL_SERVICE_PATH "/usr/lib/libemail-api.so"
+#define LIB_EMAIL_SERVICE_PATH LIBPATH "libemail-api.so"
 
 int (*Datastore_FI_EMTB)(char **);
 int (*Datastore_FI_EMSB)(char **);