Skip to content

Commit 4faac1a

Browse files
author
Mohammad Rezaei
committed
second attempt at fixing osx build
1 parent 1afea11 commit 4faac1a

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
cmake_minimum_required(VERSION 3.13.0)
22

3+
if(POLICY CMP0167)
4+
cmake_policy(SET CMP0167 NEW)
5+
endif()
6+
37
set(ETH_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}/cmake" CACHE PATH "The path to the cmake directory")
48
list(APPEND CMAKE_MODULE_PATH ${ETH_CMAKE_DIR})
59

cmake/EthCompilerSettings.cmake

+2
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
110110
message(FATAL_ERROR "${PROJECT_NAME} requires clang++ 14.0 or greater.")
111111
endif ()
112112

113+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --system-header-prefix=/usr/local/include")
114+
113115
# use std::invoke_result, superseding std::result_of which has been removed in c++20
114116
add_compile_definitions(BOOST_ASIO_HAS_STD_INVOKE_RESULT)
115117
if ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")

scripts/install_obsolete_jsoncpp_1_7_4.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ set -eu
44
TEMPDIR=$(mktemp -d)
55
(
66
cd "$TEMPDIR"
7-
jsoncpp_version="1.7.4"
7+
jsoncpp_version="1.9.6"
88
jsoncpp_package="jsoncpp-${jsoncpp_version}.tar.gz"
9-
jsoncpp_sha256=10dcd0677e80727e572a1e462193e51a5fde3e023b99e144b2ee1a469835f769
9+
jsoncpp_sha256=f93b6dd7ce796b13d02c108bc9f79812245a82e577581c4c9aabe57075c90ea2
1010
wget -O "$jsoncpp_package" https://github.com/open-source-parsers/jsoncpp/archive/${jsoncpp_version}.tar.gz
1111
if ! [ "$(sha256sum "$jsoncpp_package")" = "${jsoncpp_sha256} ${jsoncpp_package}" ]
1212
then

0 commit comments

Comments
 (0)