Fix compatibility for x64 arch

fix hardcoded path

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 2b338c9b2ea033fe0cb6418a56a7184dd0846c74..8f9d778bc8170065b93faddccaf909182a4c2d1f 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -47,6 +47,7 @@ ENDIF()
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DLOG_TAG=\"SMARTCARD_SERVICE_SERVER\"")
+ADD_DEFINITIONS("-DLIBPATH=\"${CMAKE_INSTALL_LIB}\"")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 

diff --git a/server/ServerResource.cpp b/server/ServerResource.cpp
index e55365a2b9ed1af4c487f3cdcbfef9a94a74439f..31b1ce8c41b8d514d0785d33ad0e8a1e16a5d0ad 100644 (file)
--- a/server/ServerResource.cpp
+++ b/server/ServerResource.cpp
@@ -76,7 +76,7 @@ namespace smartcard_service_api
                }
        }
 
-#define OMAPI_SE_PATH "/usr/lib/se"
+#define OMAPI_SE_PATH LIBPATH"/se"
 
        ServerResource::ServerResource()
                : mainLoop(NULL), seLoaded(false)

diff --git a/server/ServerSEService.cpp b/server/ServerSEService.cpp
index 9df5b29a257e48a30c946bc0e701aed5046e1b7f..534fb955c05f9c5cdc7da9d5b259af073a58798d 100644 (file)
--- a/server/ServerSEService.cpp
+++ b/server/ServerSEService.cpp
@@ -33,7 +33,7 @@
 
 namespace smartcard_service_api
 {
-#define OMAPI_SE_PATH "/usr/lib/se"
+#define OMAPI_SE_PATH LIBPATH"/se"
 
        ServerSEService::ServerSEService():SEServiceHelper()
        {