From 6952ac6269ea9dbc26d2cf93421771591349d019 Mon Sep 17 00:00:00 2001 From: Baptiste DURAND Date: Wed, 29 May 2013 14:46:58 +0200 Subject: [PATCH] Fix compatibility for x64 arch fix hardcoded path --- server/CMakeLists.txt | 1 + server/ServerResource.cpp | 2 +- server/ServerSEService.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 2b338c9..8f9d778 100644 --- 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 e55365a..31b1ce8 100644 --- 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 9df5b29..534fb95 100644 --- 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() { -- 2.7.4