From ccfe04a0a2b64c2bdfd10c4a0aadf61847001eae Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 9 May 2015 01:22:33 +0100 Subject: Updated and submodularised JsonCPP Conflicts: lib/jsoncpp --- src/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fcafdbe87..d8a72a360 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -376,4 +376,5 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") add_flags_lnk(-L/usr/local/lib) endif() -target_link_libraries(${EXECUTABLE} luaexpat jsoncpp mbedtls zlib sqlite lua SQLiteCpp event_core event_extra) +find_library(JSONCPP_LIBRARY jsoncpp ../lib/jsoncpp/src/lib_json) +target_link_libraries(${EXECUTABLE} luaexpat ${JSONCPP_LIBRARY} mbedtls zlib sqlite lua SQLiteCpp event_core event_extra) -- cgit v1.2.3 From e69d4536abba0df83a5aef68b5290dc61501ac42 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Thu, 9 Jul 2015 23:43:23 +0100 Subject: Added JsonCPP library location to search paths * Fixed '-dirty' submodule changes Probably fixes an issue somewhere too? --- src/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d8a72a360..6c8fe7d0c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -376,5 +376,4 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") add_flags_lnk(-L/usr/local/lib) endif() -find_library(JSONCPP_LIBRARY jsoncpp ../lib/jsoncpp/src/lib_json) -target_link_libraries(${EXECUTABLE} luaexpat ${JSONCPP_LIBRARY} mbedtls zlib sqlite lua SQLiteCpp event_core event_extra) +target_link_libraries(${EXECUTABLE} luaexpat jsoncpp_lib_static mbedtls zlib sqlite lua SQLiteCpp event_core event_extra) -- cgit v1.2.3