kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(ws) #125 / fix build problem when jsoncpp is not installed locally

Browse Source
This commit is contained in:
Benjamin Sergeant
2019-12-03 17:18:16 -08:00
parent c75959fcb5
commit 5d75a3aac3
5 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DOCKER_VERSION
View File

@@ -1 +1 @@
7.4.4 7.4.5

4
docs/CHANGELOG.md
View File

@@ -1,6 +1,10 @@
# Changelog # Changelog
All notable changes to this project will be documented in this file. 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 ## [7.4.4] - 2019-12-03
- (ws) #125 / cmake detects an already installed jsoncpp and will try to use this one if present - (ws) #125 / cmake detects an already installed jsoncpp and will try to use this one if present

8
ixcobra/CMakeLists.txt
View File

@@ -20,10 +20,16 @@ add_library(ixcobra STATIC
${IXCOBRA_HEADERS} ${IXCOBRA_HEADERS}
) )
find_package(JsonCpp)
if (NOT JSONCPP_FOUND)
set(JSONCPP_INCLUDE_DIRS ../third_party/jsoncpp)
endif()
set(IXCOBRA_INCLUDE_DIRS set(IXCOBRA_INCLUDE_DIRS
. .
.. ..
../ixcore ../ixcore
../ixcrypto) ../ixcrypto
${JSONCPP_INCLUDE_DIRS})
target_include_directories( ixcobra PUBLIC ${IXCOBRA_INCLUDE_DIRS} ) target_include_directories( ixcobra PUBLIC ${IXCOBRA_INCLUDE_DIRS} )

8
ixsentry/CMakeLists.txt
View File

@@ -16,9 +16,15 @@ add_library(ixsentry STATIC
${IXSENTRY_HEADERS} ${IXSENTRY_HEADERS}
) )
find_package(JsonCpp)
if (NOT JSONCPP_FOUND)
set(JSONCPP_INCLUDE_DIRS ../third_party/jsoncpp)
endif()
set(IXSENTRY_INCLUDE_DIRS set(IXSENTRY_INCLUDE_DIRS
. .
.. ..
../ixcore) ../ixcore
${JSONCPP_INCLUDE_DIRS})
target_include_directories( ixsentry PUBLIC ${IXSENTRY_INCLUDE_DIRS} ) target_include_directories( ixsentry PUBLIC ${IXSENTRY_INCLUDE_DIRS} )

2
ixwebsocket/IXWebSocketVersion.h
View File

@@ -6,4 +6,4 @@
#pragma once #pragma once
#define IX_WEBSOCKET_VERSION "7.4.4" #define IX_WEBSOCKET_VERSION "7.4.5"