hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always build Jansson

Browse Source 
The library is now built even if the system has some version of Jansson.
This commit is contained in:
Markus Mäkelä
2017-06-14 14:34:02 +03:00
parent 17c0bf7dec
commit a72d73fa3b
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -41,7 +41,6 @@ find_package(Git)
find_package(CURL) find_package(CURL)
find_package(RabbitMQ) find_package(RabbitMQ)
find_package(LibUUID) find_package(LibUUID)
find_package(Jansson)
find_package(Avro) find_package(Avro)
find_package(GSSAPI) find_package(GSSAPI)
find_package(SQLite) find_package(SQLite)
@ -62,11 +61,7 @@ else()
message(STATUS "Using system Connector-C") message(STATUS "Using system Connector-C")
endif() endif()
if(NOT JANSSON_FOUND) include(cmake/BuildJansson.cmake)
message(STATUS "Building Jansson from source.")
include(cmake/BuildJansson.cmake)
endif()
include(cmake/BuildMicroHttpd.cmake) include(cmake/BuildMicroHttpd.cmake)
include_directories(${JANSSON_INCLUDE_DIR}) include_directories(${JANSSON_INCLUDE_DIR})

2
cmake/BuildJansson.cmake
View File

@ -8,7 +8,7 @@ set(JANSSON_TAG "v2.9" CACHE STRING "Jansson Git tag")
ExternalProject_Add(jansson ExternalProject_Add(jansson
GIT_REPOSITORY ${JANSSON_REPO} GIT_REPOSITORY ${JANSSON_REPO}
GIT_TAG ${JANSSON_TAG} 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 BINARY_DIR ${CMAKE_BINARY_DIR}/jansson
INSTALL_DIR ${CMAKE_BINARY_DIR}/jansson/install INSTALL_DIR ${CMAKE_BINARY_DIR}/jansson/install
UPDATE_COMMAND "") UPDATE_COMMAND "")