diff --git a/DOCKER_VERSION b/DOCKER_VERSION index 4e61aeef..e91f1044 100644 --- a/DOCKER_VERSION +++ b/DOCKER_VERSION @@ -1 +1 @@ -7.4.4 +7.4.5 diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 7a9eaab4..f9b02754 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog All notable changes to this project will be documented in this file. +## [7.4.5] - 2019-12-03 + +- (ws) #125 / fix build problem when jsoncpp is not installed locally + ## [7.4.4] - 2019-12-03 - (ws) #125 / cmake detects an already installed jsoncpp and will try to use this one if present diff --git a/ixcobra/CMakeLists.txt b/ixcobra/CMakeLists.txt index 72dfdecf..ca033e03 100644 --- a/ixcobra/CMakeLists.txt +++ b/ixcobra/CMakeLists.txt @@ -20,10 +20,16 @@ add_library(ixcobra STATIC ${IXCOBRA_HEADERS} ) +find_package(JsonCpp) +if (NOT JSONCPP_FOUND) + set(JSONCPP_INCLUDE_DIRS ../third_party/jsoncpp) +endif() + set(IXCOBRA_INCLUDE_DIRS . .. ../ixcore - ../ixcrypto) + ../ixcrypto + ${JSONCPP_INCLUDE_DIRS}) target_include_directories( ixcobra PUBLIC ${IXCOBRA_INCLUDE_DIRS} ) diff --git a/ixsentry/CMakeLists.txt b/ixsentry/CMakeLists.txt index 86893860..7a430d79 100644 --- a/ixsentry/CMakeLists.txt +++ b/ixsentry/CMakeLists.txt @@ -16,9 +16,15 @@ add_library(ixsentry STATIC ${IXSENTRY_HEADERS} ) +find_package(JsonCpp) +if (NOT JSONCPP_FOUND) + set(JSONCPP_INCLUDE_DIRS ../third_party/jsoncpp) +endif() + set(IXSENTRY_INCLUDE_DIRS . .. - ../ixcore) + ../ixcore + ${JSONCPP_INCLUDE_DIRS}) target_include_directories( ixsentry PUBLIC ${IXSENTRY_INCLUDE_DIRS} ) diff --git a/ixwebsocket/IXWebSocketVersion.h b/ixwebsocket/IXWebSocketVersion.h index 8309752f..7c6ea33f 100644 --- a/ixwebsocket/IXWebSocketVersion.h +++ b/ixwebsocket/IXWebSocketVersion.h @@ -6,4 +6,4 @@ #pragma once -#define IX_WEBSOCKET_VERSION "7.4.4" +#define IX_WEBSOCKET_VERSION "7.4.5"