From c40946c74109ab7eecb9f8df327fd32d4e5204ab Mon Sep 17 00:00:00 2001 From: wheremyfoodat Date: Tue, 14 Mar 2023 00:12:40 +0200 Subject: [PATCH 1/3] Update MacOS_Build.yml --- .github/workflows/MacOS_Build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/MacOS_Build.yml b/.github/workflows/MacOS_Build.yml index 99fd1b21..4007e0e9 100644 --- a/.github/workflows/MacOS_Build.yml +++ b/.github/workflows/MacOS_Build.yml @@ -19,6 +19,7 @@ jobs: runs-on: macos-latest steps: + - uses: actions/checkout@v2 - name: Fetch submodules run: git submodule update --init --recursive From 85d486a84fb51e0bd596f4bf01f54592cce45fe3 Mon Sep 17 00:00:00 2001 From: wheremyfoodat Date: Tue, 14 Mar 2023 00:35:43 +0200 Subject: [PATCH 2/3] Disable cryptopp tests --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a159f19c..91aeee75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,6 +34,7 @@ set(Boost_NO_SYSTEM_PATHS ON) add_library(boost INTERFACE) target_include_directories(boost SYSTEM INTERFACE ${Boost_INCLUDE_DIR}) +set(CRYPTOPP_BUILD_TESTING OFF) add_subdirectory(third_party/cryptopp) if(CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "x86-64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") From 96a8a6ea85b424ce9855d05a5f6d14fe7f65bbd0 Mon Sep 17 00:00:00 2001 From: wheremyfoodat Date: Tue, 14 Mar 2023 01:02:11 +0200 Subject: [PATCH 3/3] Update CMakeLists.txt --- third_party/cryptopp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/cryptopp/CMakeLists.txt b/third_party/cryptopp/CMakeLists.txt index ae85dd98..7c43d487 100644 --- a/third_party/cryptopp/CMakeLists.txt +++ b/third_party/cryptopp/CMakeLists.txt @@ -353,7 +353,7 @@ endif () if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Intel" OR CMAKE_CXX_COMPILER MATCHES "xlC") - if (CRYPTOPP_AMD64 OR CRYPTOPP_I386) + if (CRYPTOPP_AMD64 OR CRYPTOPP_I386 AND FALSE) CheckCompileLinkOption("-msse2" CRYPTOPP_IA32_SSE2 "${TEST_PROG_DIR}/test_x86_sse2.cxx") CheckCompileLinkOption("-mssse3" CRYPTOPP_IA32_SSSE3