Repository: incubator-htrace Updated Branches: refs/heads/master 6d5b91b59 -> a0c1f0134
HTRACE-218. Fix issues with finding json-c includes and librt in the native library (cmccabe) Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/a0c1f013 Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/a0c1f013 Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/a0c1f013 Branch: refs/heads/master Commit: a0c1f013463395c11c482048ff862108c946d016 Parents: 6d5b91b Author: Colin Patrick Mccabe <[email protected]> Authored: Tue Jul 21 17:55:16 2015 -0700 Committer: Colin Patrick Mccabe <[email protected]> Committed: Wed Jul 22 15:29:59 2015 -0700 ---------------------------------------------------------------------- htrace-c/src/CMakeLists.txt | 6 +++++- htrace-c/src/test/mini_htraced.c | 4 ++-- htrace-c/src/test/span_util.c | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/a0c1f013/htrace-c/src/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/htrace-c/src/CMakeLists.txt b/htrace-c/src/CMakeLists.txt index 4240f32..57558a5 100644 --- a/htrace-c/src/CMakeLists.txt +++ b/htrace-c/src/CMakeLists.txt @@ -60,7 +60,8 @@ ELSE(JSON_C_INCLUDE_DIR AND JSON_C_LIBRARY) ENDIF(JSON_C_INCLUDE_DIR AND JSON_C_LIBRARY) include_directories(${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}) + ${CMAKE_SOURCE_DIR} + ${JSON_C_INCLUDE_DIR}) if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") set(RAND_SRC "util/rand_linux.c") @@ -94,6 +95,9 @@ set(SRC_ALL ) set(DEPS_ALL pthread) +IF (CMAKE_SYSTEM_NAME MATCHES "Linux") + set(DEPS_ALL ${DEPS_ALL} rt) +ENDIF() # The unit test version of the library, which exposes all symbols. add_library(htrace_test STATIC http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/a0c1f013/htrace-c/src/test/mini_htraced.c ---------------------------------------------------------------------- diff --git a/htrace-c/src/test/mini_htraced.c b/htrace-c/src/test/mini_htraced.c index ab9eb08..9a042fe 100644 --- a/htrace-c/src/test/mini_htraced.c +++ b/htrace-c/src/test/mini_htraced.c @@ -28,8 +28,8 @@ #include <errno.h> #include <fcntl.h> #include <inttypes.h> -#include <json/json_object.h> -#include <json/json_tokener.h> +#include <json_object.h> +#include <json_tokener.h> #include <signal.h> #include <stdio.h> #include <stdlib.h> http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/a0c1f013/htrace-c/src/test/span_util.c ---------------------------------------------------------------------- diff --git a/htrace-c/src/test/span_util.c b/htrace-c/src/test/span_util.c index 8a615b1..2069cdc 100644 --- a/htrace-c/src/test/span_util.c +++ b/htrace-c/src/test/span_util.c @@ -22,8 +22,8 @@ #include "util/log.h" #include <errno.h> -#include <json/json_object.h> -#include <json/json_tokener.h> +#include <json_object.h> +#include <json_tokener.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h>
