Update default plugin directory search path to match CMAKE_INSTALL_PREFIX

Currently default plugin directory is hard coded to /usr/lib in several places. This patch takes into consideration the installation directory specified with cmake.
IpcModuleLoader.cpp has also been slightly modified to avoid compiler warnings

diff --git a/LayerManagerPlugins/IpcModules/IpcModuleLoader/CMakeLists.txt b/LayerManagerPlugins/IpcModules/IpcModuleLoader/CMakeLists.txt
index 8982460..e5a5ed9 100644 (file)
--- a/LayerManagerPlugins/IpcModules/IpcModuleLoader/CMakeLists.txt
+++ b/LayerManagerPlugins/IpcModules/IpcModuleLoader/CMakeLists.txt
@@ -21,6 +21,8 @@ cmake_minimum_required (VERSION 2.6)
 
 include_directories(
     "include"
+    "${PROJECT_SOURCE_DIR}/config"
+    "${PROJECT_SOURCE_DIR}/LayerManagerUtils/include"
     "${CMAKE_SOURCE_DIR}/LayerManagerClient/ilmClient/include"
     "${CMAKE_SOURCE_DIR}/LayerManagerPlugins/IpcModules/IpcModuleLoader/include"
 )
@@ -50,4 +52,4 @@ if (WITH_TESTS)
 #    add_executable(IpcModuleLoader_Test tests/IlmCommandTest.cpp)
 #    target_link_libraries(IpcModuleLoader_Test IpcModuleLoader ${LIBS} gtest)
 #    add_test(IpcModuleLoader IpcModuleLoader_Test )
-endif(WITH_TESTS) 
\ No newline at end of file
+endif(WITH_TESTS) 

diff --git a/LayerManagerPlugins/IpcModules/IpcModuleLoader/src/IpcModuleLoader.c b/LayerManagerPlugins/IpcModules/IpcModuleLoader/src/IpcModuleLoader.c
index d4b3685..32bd824 100644 (file)
--- a/LayerManagerPlugins/IpcModules/IpcModuleLoader/src/IpcModuleLoader.c
+++ b/LayerManagerPlugins/IpcModules/IpcModuleLoader/src/IpcModuleLoader.c
@@ -18,6 +18,7 @@
  ****************************************************************************/
 #include "IpcModuleLoader.h"
 #include "IpcModule.h"
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <dlfcn.h>
@@ -35,7 +36,7 @@
 //=============================================================================
 // global variables
 //=============================================================================
-const char* gDefaultPluginLookupPath = "/usr/lib/layermanager";
+const char* gDefaultPluginLookupPath = CMAKE_INSTALL_PREFIX"/lib/layermanager";
 const char* gCommunicatorPluginDirectory = "/ipcmodules";
 
 
@@ -82,8 +83,8 @@ t_ilm_bool loadSymbolTable(struct IpcModule* ipcModule, char* path, char* file)
         { "getUintArray",    (void**)&ipcModule->getUintArray }
     };
 
-    const int apiFunctionCount = sizeof (ApiFunctionTable) / sizeof(struct ApiFunction);
-    int symbolCount = 0;
+    const unsigned int apiFunctionCount = sizeof (ApiFunctionTable) / sizeof(struct ApiFunction);
+    unsigned int symbolCount = 0;
 
     strcat(fullFilePath, path);
     strcat(fullFilePath, "/");

diff --git a/LayerManagerService/src/main.cpp b/LayerManagerService/src/main.cpp
index b0c325c..6d38832 100644 (file)
--- a/LayerManagerService/src/main.cpp
+++ b/LayerManagerService/src/main.cpp
@@ -45,7 +45,7 @@ typedef list<string>::iterator tFileListIterator;
 
 
 const char* displayName = ":0";
-const char* gPluginLookupPath = "/usr/lib/layermanager";
+const char* gPluginLookupPath = CMAKE_INSTALL_PREFIX"/lib/layermanager";
 int displayWidth = 1280; // default value, override with -w argument
 int displayHeight = 480; // default value, override with -h argument