diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2014-02-12 12:31:47 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2014-02-12 12:31:47 +0100 |
| commit | 94a0978cf757b36db77642b698e6bc8660545c45 (patch) | |
| tree | e550354b4276749fc1d3dd2d45c74ac2a400d2f3 | |
| parent | 7b00070d5621acdb4dfbee5840bd8babb1e7073f (diff) | |
| download | libuca-94a0978cf757b36db77642b698e6bc8660545c45.tar.gz libuca-94a0978cf757b36db77642b698e6bc8660545c45.tar.bz2 libuca-94a0978cf757b36db77642b698e6bc8660545c45.tar.xz libuca-94a0978cf757b36db77642b698e6bc8660545c45.zip | |
Add configured install path to plugin search path
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/config.h.in | 1 | ||||
| -rw-r--r-- | src/uca-plugin-manager.c | 6 |
3 files changed, 3 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d1966c..e690527 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,6 @@ include(ConfigurePaths) configure_paths(UCA) set(UCA_PLUGINDIR "${UCA_LIBDIR}/uca") -set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/package.sh.in ${CMAKE_CURRENT_BINARY_DIR}/package.sh) diff --git a/src/config.h.in b/src/config.h.in index 28f4ffb..a98cb00 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -5,3 +5,4 @@ #cmakedefine HAVE_PYLON_CAMERA #cmakedefine HAVE_DEXELA_CL #cmakedefine HAVE_MOCK_CAMERA +#cmakedefine UCA_PLUGINDIR "${UCA_PLUGINDIR}" diff --git a/src/uca-plugin-manager.c b/src/uca-plugin-manager.c index 7cb65b4..9db932a 100644 --- a/src/uca-plugin-manager.c +++ b/src/uca-plugin-manager.c @@ -35,6 +35,7 @@ #include <gio/gio.h> #include <gmodule.h> #include "uca-plugin-manager.h" +#include "config.h" G_DEFINE_TYPE (UcaPluginManager, uca_plugin_manager, G_TYPE_OBJECT) @@ -397,8 +398,5 @@ uca_plugin_manager_init (UcaPluginManager *manager) if (uca_camera_path != NULL) uca_plugin_manager_add_path (manager, uca_camera_path); - uca_plugin_manager_add_path (manager, "/usr/lib/uca"); - uca_plugin_manager_add_path (manager, "/usr/lib64/uca"); - uca_plugin_manager_add_path (manager, "/usr/local/lib/uca"); - uca_plugin_manager_add_path (manager, "/usr/local/lib64/uca"); + uca_plugin_manager_add_path (manager, UCA_PLUGINDIR); } |