diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2016-05-24 16:01:47 +0200 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2016-05-24 16:01:47 +0200 |
| commit | 8fd6083ae84d3da225596287f5c12f87b5fad7eb (patch) | |
| tree | 608f0535f11b1eb086686cb51f35d97fc6315cd0 | |
| parent | 8cabf18f972606cd039db9a84366ef338446d12e (diff) | |
don't export PLUGIN_INSTALL_DIR anywhere
Change-Id: I32689b3de32f5c85b461edcb63ef4d0117ff9ecb
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | afb-daemon.pc.in | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fcd376c8..d3b7a32d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,8 +63,6 @@ SET(link_libraries SET(plugin_install_dir ${CMAKE_INSTALL_FULL_LIBDIR}/afb) -ADD_DEFINITIONS(-DPLUGIN_INSTALL_DIR="${plugin_install_dir}") - ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(plugins) diff --git a/afb-daemon.pc.in b/afb-daemon.pc.in index 196324ab..23075eb9 100644 --- a/afb-daemon.pc.in +++ b/afb-daemon.pc.in @@ -26,5 +26,5 @@ Version: @PROJECT_VERSION@ URL: @PROJECT_URL@ Requires: json-c -Cflags: -DPLUGIN_INSTALL_DIR=\"${plugin_install_dir}\" -I${includedir} +Cflags: -I${includedir} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 94ed5a56..3b3c6fd4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,8 @@ INCLUDE(FindPkgConfig) +ADD_DEFINITIONS(-DPLUGIN_INSTALL_DIR="${plugin_install_dir}") + CHECK_INCLUDE_FILES(magic.h HAVE_MAGIC_H) CHECK_LIBRARY_EXISTS(magic magic_load "" HAVE_LIBMAGIC_SO) IF(HAVE_MAGIC_H) |