From 48ccf52109053244c0ea4598688663e748f997ea Mon Sep 17 00:00:00 2001 From: Shannon Weyrick Date: Wed, 1 Sep 2021 17:54:54 -0400 Subject: [PATCH 1/3] address corrade ci failure --- cmake/FindCorrade.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/FindCorrade.cmake b/cmake/FindCorrade.cmake index 946976aa9..eaa61352f 100644 --- a/cmake/FindCorrade.cmake +++ b/cmake/FindCorrade.cmake @@ -345,7 +345,7 @@ endforeach () # CMake module dir find_path(_CORRADE_MODULE_DIR NAMES UseCorrade.cmake CorradeLibSuffix.cmake - PATH_SUFFIXES share/cmake/Corrade) + PATH_SUFFIXES share/cmake/Corrade lib/cmake/Corrade) mark_as_advanced(_CORRADE_MODULE_DIR) set(CORRADE_USE_MODULE ${_CORRADE_MODULE_DIR}/UseCorrade.cmake) From 8cd9c0657a8a7bc9f26416e130320ab45d44c683 Mon Sep 17 00:00:00 2001 From: Shannon Weyrick Date: Wed, 1 Sep 2021 18:13:18 -0400 Subject: [PATCH 2/3] Revert "address corrade ci failure" This reverts commit 48ccf52109053244c0ea4598688663e748f997ea. --- cmake/FindCorrade.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/FindCorrade.cmake b/cmake/FindCorrade.cmake index eaa61352f..946976aa9 100644 --- a/cmake/FindCorrade.cmake +++ b/cmake/FindCorrade.cmake @@ -345,7 +345,7 @@ endforeach () # CMake module dir find_path(_CORRADE_MODULE_DIR NAMES UseCorrade.cmake CorradeLibSuffix.cmake - PATH_SUFFIXES share/cmake/Corrade lib/cmake/Corrade) + PATH_SUFFIXES share/cmake/Corrade) mark_as_advanced(_CORRADE_MODULE_DIR) set(CORRADE_USE_MODULE ${_CORRADE_MODULE_DIR}/UseCorrade.cmake) From 35f9e2fa96c75753c0522fa4308c53d6c59f0c67 Mon Sep 17 00:00:00 2001 From: Shannon Weyrick Date: Wed, 1 Sep 2021 18:27:52 -0400 Subject: [PATCH 3/3] pin corrade recipe version --- conanfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.txt b/conanfile.txt index 82eed2326..da89cfc2a 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -4,7 +4,7 @@ sigslot/1.2.0 docopt.cpp/0.6.3 nlohmann_json/3.9.1 cpp-httplib/0.8.0 -corrade/2020.06 +corrade/2020.06@#fc2babbc2677cc577d8954ced24d4443 pcapplusplus/ns1-dev json-schema-validator/2.1.0 openssl/1.1.1k