From a72d73fa3bde20ff5b5a44ec605f1dac2f07bf6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Wed, 14 Jun 2017 14:34:02 +0300 Subject: [PATCH] Always build Jansson The library is now built even if the system has some version of Jansson. --- CMakeLists.txt | 7 +------ cmake/BuildJansson.cmake | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 85e9f8229..d2bc816d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,6 @@ find_package(Git) find_package(CURL) find_package(RabbitMQ) find_package(LibUUID) -find_package(Jansson) find_package(Avro) find_package(GSSAPI) find_package(SQLite) @@ -62,11 +61,7 @@ else() message(STATUS "Using system Connector-C") endif() -if(NOT JANSSON_FOUND) - message(STATUS "Building Jansson from source.") - include(cmake/BuildJansson.cmake) -endif() - +include(cmake/BuildJansson.cmake) include(cmake/BuildMicroHttpd.cmake) include_directories(${JANSSON_INCLUDE_DIR}) diff --git a/cmake/BuildJansson.cmake b/cmake/BuildJansson.cmake index 91fa99799..78e038a01 100644 --- a/cmake/BuildJansson.cmake +++ b/cmake/BuildJansson.cmake @@ -8,7 +8,7 @@ set(JANSSON_TAG "v2.9" CACHE STRING "Jansson Git tag") ExternalProject_Add(jansson GIT_REPOSITORY ${JANSSON_REPO} GIT_TAG ${JANSSON_TAG} - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/jansson/install -DCMAKE_C_FLAGS=-fPIC + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/jansson/install -DCMAKE_C_FLAGS=-fPIC -DJANSSON_BUILD_DOCS=OFF BINARY_DIR ${CMAKE_BINARY_DIR}/jansson INSTALL_DIR ${CMAKE_BINARY_DIR}/jansson/install UPDATE_COMMAND "")