Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable compiling on Ubuntu 14.04. #271

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/Modules/FindJSONC.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
# JSONC_INCLUDE_DIR - The JSON-C include directory.
# JSONC_LIBRARY - The JSON-C library to link against.

FIND_PATH(JSONC_INCLUDE_DIR json/json.h)
FIND_LIBRARY(JSONC_LIBRARY NAMES json)
FIND_PATH(JSONC_INCLUDE_DIR json.h PATH_SUFFIXES json json-c)
FIND_LIBRARY(JSONC_LIBRARY NAMES json json-c)

IF (JSONC_INCLUDE_DIR AND JSONC_LIBRARY)
SET(JSONC_FOUND TRUE)
Expand Down
1 change: 1 addition & 0 deletions libgrive/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ include_directories(
${libgrive_SOURCE_DIR}/src
${libgrive_SOURCE_DIR}/test
${GDBM_INCLUDE_DIR}
${JSONC_INCLUDE_DIR}
${OPT_INCS}
)

Expand Down
4 changes: 2 additions & 2 deletions libgrive/src/protocol/Json.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
#pragma warning(push)
#pragma warning(disable: 4005)
#endif
#include <json/json_tokener.h>
#include <json/linkhash.h>
#include <json_tokener.h>
#include <linkhash.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
Expand Down