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 --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index db397a2d2..6c625006d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,6 +147,11 @@ set(EVENT__DISABLE_TESTS YES CACHE BOOL "Disable LibEvent tests" set(EVENT__DISABLE_REGRESS YES CACHE BOOL "Disable LibEvent regression tests" FORCE) set(EVENT__DISABLE_SAMPLES YES CACHE BOOL "Disable LibEvent samples" FORCE) +# Set options for JsonCPP, disabling all of their tests +set(JSONCPP_WITH_TESTS OFF CACHE BOOL "Compile and (for jsoncpp_check) run JsonCpp test executables") +set(JSONCPP_WITH_POST_BUILD_UNITTEST OFF CACHE BOOL "Automatically run unit-tests as a post build step") +set(JSONCPP_WITH_PKGCONFIG_SUPPORT OFF CACHE BOOL "Generate and install .pc files") + # Check that the libraries are present: if (NOT EXISTS ${CMAKE_SOURCE_DIR}/lib/SQLiteCpp/CMakeLists.txt) message(FATAL_ERROR "SQLiteCpp is missing in folder lib/SQLiteCpp. Have you initialized the submodules / downloaded the extra libraries?") -- 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? --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c625006d..a02c9b4fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,9 +148,11 @@ set(EVENT__DISABLE_REGRESS YES CACHE BOOL "Disable LibEvent regression tests" set(EVENT__DISABLE_SAMPLES YES CACHE BOOL "Disable LibEvent samples" FORCE) # Set options for JsonCPP, disabling all of their tests +# Additionally, their library is output to a strange location; make sure the linker knows where to find it set(JSONCPP_WITH_TESTS OFF CACHE BOOL "Compile and (for jsoncpp_check) run JsonCpp test executables") set(JSONCPP_WITH_POST_BUILD_UNITTEST OFF CACHE BOOL "Automatically run unit-tests as a post build step") set(JSONCPP_WITH_PKGCONFIG_SUPPORT OFF CACHE BOOL "Generate and install .pc files") +link_directories(lib/jsoncpp/src/lib_json) # Check that the libraries are present: if (NOT EXISTS ${CMAKE_SOURCE_DIR}/lib/SQLiteCpp/CMakeLists.txt) @@ -183,6 +185,9 @@ set_property(TARGET SQLiteCpp PROPERTY INCLUDE_DIRECTORIES "${SQLITECPP_INCLUDES # Add proper includes for LibEvent's event-config.h header: include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS}) +# Prettify jsoncpp_lib_static name in VS solution explorer +set_property(TARGET jsoncpp_lib_static PROPERTY PROJECT_LABEL "jsoncpp") + if (WIN32) add_subdirectory(lib/luaproxy/) endif() @@ -208,7 +213,7 @@ if (MSVC) event_core event_extra expat - jsoncpp + jsoncpp_lib_static lua luaexpat mbedtls -- cgit v1.2.3