diff options
| -rw-r--r-- | plugins/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | plugins/xkit/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | plugins/xkit/uca-xkit-camera.cc | 4 |
3 files changed, 9 insertions, 13 deletions
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 9fb5cb9..b630171 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -6,10 +6,7 @@ add_subdirectory(pco) add_subdirectory(pylon) add_subdirectory(ufo) add_subdirectory(dexela) - -if (CMAKE_CXX_COMPILER) - add_subdirectory(xkit) -endif() +add_subdirectory(xkit) message("-- Building the following plugins:") set(_plugins "mock;pf;pco;pylon;ufo;dexela;xkit") diff --git a/plugins/xkit/CMakeLists.txt b/plugins/xkit/CMakeLists.txt index b16025b..6441c46 100644 --- a/plugins/xkit/CMakeLists.txt +++ b/plugins/xkit/CMakeLists.txt @@ -6,17 +6,16 @@ set(PLUGIN_VERSION "0.1.0") set(PLUGIN_REVISION "1") set(PLUGIN_REQUIRES "libuca >= 1.2.0") -find_path (XKIT_INCLUDE_DIR - NAMES dll_api.h mpxhw.h) +find_package(PkgConfig) +pkg_check_modules(XKIT xkit>=0.1.0) -find_library (XKIT_LIBRARIES - NAMES xKIT) - -if (XKIT_INCLUDE_DIR AND XKIT_LIBRARIES) +if (XKIT_FOUND) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in ${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh) - include_directories(${XKIT_INCLUDE_DIR} + message("includedir: ${XKIT_LIBRARIES}") + + include_directories(${XKIT_INCLUDEDIR} ${UCA_CONFIGDIR}) # We have to compile with g++ because the included header files have C++ diff --git a/plugins/xkit/uca-xkit-camera.cc b/plugins/xkit/uca-xkit-camera.cc index 9b163c3..17d52d4 100644 --- a/plugins/xkit/uca-xkit-camera.cc +++ b/plugins/xkit/uca-xkit-camera.cc @@ -15,14 +15,14 @@ with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA */ -#include <dll_api.h> +#include <stdlib.h> +#include <xkit/dll_api.h> #undef FALSE #undef TRUE #include <gio/gio.h> #include <gmodule.h> -#include <stdlib.h> #include <stdio.h> #include <string.h> #include <errno.h> |