diff options
| author | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-07-12 14:46:33 +0200 |
|---|---|---|
| committer | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-07-12 14:46:33 +0200 |
| commit | 9b3b0470046bad345f6731d6327ed18ab8f933f2 (patch) | |
| tree | e38c2864ebaff225774f2abb287ffa9ff71f2502 /CMakeLists.txt | |
| parent | Merge pull request #2328 from SamJBarney/master (diff) | |
| parent | Added JsonCPP library location to search paths (diff) | |
| download | cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.gz cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.bz2 cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.lz cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.xz cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.zst cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.zip | |
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index db397a2d2..a02c9b4fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,6 +147,13 @@ 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 +# 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) message(FATAL_ERROR "SQLiteCpp is missing in folder lib/SQLiteCpp. Have you initialized the submodules / downloaded the extra libraries?") @@ -178,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() @@ -203,7 +213,7 @@ if (MSVC) event_core event_extra expat - jsoncpp + jsoncpp_lib_static lua luaexpat mbedtls |